sw/qa/extras/tiledrendering/tiledrendering.cxx | 2 +-
sw/source/uibase/ribbar/drawbase.cxx | 8 ++++----
vcl/source/outdev/rect.cxx | 5 +++++
3 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 8842af5204cf71e8c5dca8d95ffcd58e92d91a07
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Tue Dec 3 21:06:33 2019 +0000
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Sat May 9 15:47:40 2020 +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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
(cherry picked from commit 71f03dceb9b7bb56a798add82842a727c3187d33)
Reviewed-on: https://gerrit.libreoffice.org/84392
Tested-by: Jenkins
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index f7a1acb5e4d1..b1536f3796e7 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -509,7 +509,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 6e695bf93045..5c9d714ce175 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);
}
commit 409c819108fd1df9ef9ca7c26131021836a177f3
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Thu Nov 7 14:11:35 2019 +0000
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Sat May 9 15:45:13 2020 +0100
Drawing calc grid misses pixels on bottom and right; fix.
Don't attempt to offset empty rectangles causing serious problems.
Change-Id: I6fcac11f5f5e03f7edc0662cf4e06e7f8a109f00
Reviewed-on: https://gerrit.libreoffice.org/82220
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx
index ecbeb12fbfee..4cced0f9b7e9 100644
--- a/vcl/source/outdev/rect.cxx
+++ b/vcl/source/outdev/rect.cxx
@@ -232,6 +232,11 @@ void OutputDevice::DrawGrid( const tools::Rectangle&
rRect, const Size& rDist, D
if( mbOutputClipped )
return;
+ // FIXME: seems we have an off-by-one around the border
+ // here with the cairo / svp backend at least.
+ aDstRect.AdjustRight(1);
+ aDstRect.AdjustBottom(1);
+
const long nDistX = std::max( rDist.Width(), 1L );
const long nDistY = std::max( rDist.Height(), 1L );
long nX = ( rRect.Left() >= aDstRect.Left() ) ? rRect.Left() : (
rRect.Left() + ( ( aDstRect.Left() - rRect.Left() ) / nDistX ) * nDistX );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
