[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - svx/source

[Caolán McNamara (via logerrit)]

 svx/source/fmcomp/gridcell.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 7b2021a01303ef9efad652ddedea20758ce1f719
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Sep 29 09:53:28 2021 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Sep 30 11:08:30 2021 +0200

    Related: tdf#144139 use the classic size calculation
    
    Change-Id: Iac3f9fb9fd6f92f8b17b1f2822dbc9743528cea9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122801
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index ca14d5f0fea3..fd2b83fe9040 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1719,10 +1719,16 @@ void DbCheckBox::PaintCell(OutputDevice& rDev, const 
tools::Rectangle& rRect)
             TriState eState = 
static_cast<CheckBoxControl*>(m_pWindow.get())->GetState();
 
             MapMode aResMapMode(MapUnit::Map100thMM);
+            Size aImageSize = rDev.LogicToPixel(Size(300, 300), aResMapMode);
             Size aBrd1Size = rDev.LogicToPixel(Size(20, 20), aResMapMode);
             Size aBrd2Size = rDev.LogicToPixel(Size(30, 30), aResMapMode);
             int nCheckWidth = rDev.LogicToPixel(Size(20, 20), 
aResMapMode).Width();
-            tools::Rectangle aStateRect(rRect);
+
+            tools::Rectangle aStateRect;
+            aStateRect.SetLeft(rRect.Left() + ((rRect.GetWidth() - 
aImageSize.Width()) / 2));
+            aStateRect.SetTop(rRect.Top() + ((rRect.GetHeight() - 
aImageSize.Height()) / 2));
+            aStateRect.SetRight(aStateRect.Left() + aImageSize.Width() - 1);
+            aStateRect.SetBottom(aStateRect.Top() + aImageSize.Height() - 1);
 
             rDev.Push();
             rDev.SetMapMode();