commit e3795de3c10d81f752826a406cea9fe090e4538e
author Michael Meeks <michael.meeks@collabora.com> Tue Dec 03 21:06:33 2019 +0000
committer Michael Meeks <michael.meeks@collabora.com> Thu Dec 05 12:08:57 2019 +0100
tree 60e31396a62e2235911522463278e4e4870bb63e
parent 282ccb6906f50d829ca6692acde27a301cc66a22

create default shapes with square outline.

This avoids complaints of non-circular circles when inserted, and
trades them for complaints about non-elliptical ellipses; degeneracy.

Change-Id: I8a870b75ba1b8b7b2a7f9cc3de213e215ed5b95a
Reviewed-on: https://gerrit.libreoffice.org/84377
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 71f03dceb9b7bb56a798add82842a727c3187d33)
Reviewed-on: https://gerrit.libreoffice.org/84392
Tested-by: Jenkins

sw/qa/extras/tiledrendering/tiledrendering.cxx

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 0e01db65..ba92741 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -506,7 +506,7 @@ void SwTiledRenderingTest::testInsertShape()
    IDocumentDrawModelAccess &rDrawModelAccess = pWrtShell->GetDoc()->getIDocumentDrawModelAccess();
    SdrPage* pPage = rDrawModelAccess.GetDrawModel()->GetPage(0);
    SdrObject* pObject = pPage->GetObj(0);
    CPPUNIT_ASSERT_EQUAL(tools::Rectangle(2736, 868, 7264, 3132), pObject->GetSnapRect());
    CPPUNIT_ASSERT_EQUAL(tools::Rectangle(3302, 302, 6698, 3698), pObject->GetSnapRect());

    // check that it is in the foreground layer
    CPPUNIT_ASSERT_EQUAL(rDrawModelAccess.GetHeavenId().get(), pObject->GetLayer().get());

sw/source/uibase/ribbar/drawbase.cxx

diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx
index 6e695bf..5c9d714 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -515,10 +515,10 @@ void SwDrawBase::CreateDefaultObject()
{
    Point aStartPos = GetDefaultCenterPos();
    Point aEndPos(aStartPos);
    aStartPos.AdjustX( -(8 * MM50) );
    aStartPos.AdjustY( -(4 * MM50) );
    aEndPos.AdjustX(8 * MM50 );
    aEndPos.AdjustY(4 * MM50 );
    aStartPos.AdjustX( -(6 * MM50) );
    aStartPos.AdjustY( -(6 * MM50) );
    aEndPos.AdjustX(6 * MM50 );
    aEndPos.AdjustY(6 * MM50 );
    tools::Rectangle aRect(aStartPos, aEndPos);
    m_pSh->CreateDefaultShape( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()), aRect, m_nSlotId);
}