[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/qa sw/source

[Michael Meeks (via logerrit)]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |    2 +-
 sw/source/uibase/ribbar/drawbase.cxx           |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 71f03dceb9b7bb56a798add82842a727c3187d33
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Dec 3 21:06:33 2019 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Wed Dec 4 10:12:23 2019 +0100

    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 at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 110a6ffff16f..4d8d61cd9fde 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -522,7 +522,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());
diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx
index 4aa0bdeedd64..4785e35cfdc7 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -514,10 +514,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);
 }