[Libreoffice-commits] core.git: svx/source

[Caolán McNamara (via logerrit)]

 svx/source/fmcomp/gridcell.cxx |   97 ++++++++++++++++++++++++++++++++++++++++-
 svx/source/inc/gridcell.hxx    |    1 
 2 files changed, 97 insertions(+), 1 deletion(-)

New commits:
commit fbfd91f2c5f4d66570c2d5a6f048b21f5d1671a4
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 28 17:01:08 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 29 10:57:13 2021 +0200

    Resolves: tdf#144139 checkboxs in print output shouldn't be themed
    
    Change-Id: Ibbde5d64595d2fec1fa63756d628cf295dcdbb78
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122783
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index e74ba2df0cb7..e19f3c486871 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1681,7 +1681,23 @@ void DbCheckBox::PaintFieldToCell(OutputDevice& rDev, const tools::Rectangle& rR
     CheckBoxControl* pControl = static_cast<CheckBoxControl*>(m_pPainter.get());
     lcl_setCheckBoxState( _rxField, pControl );
 
-    Size aBoxSize = pControl->GetBox().get_preferred_size();
+    Size aBoxSize;
+
+    switch (rDev.GetOutDevType())
+    {
+        case OUTDEV_WINDOW:
+        case OUTDEV_VIRDEV:
+            aBoxSize = pControl->GetBox().get_preferred_size();
+            break;
+        case OUTDEV_PRINTER:
+        case OUTDEV_PDF:
+        {
+            auto nSize = std::min(rRect.GetWidth(), rRect.GetHeight());
+            aBoxSize = Size(nSize, nSize);
+            break;
+        }
+    }
+
     tools::Rectangle aRect(Point(rRect.Left() + ((rRect.GetWidth() - aBoxSize.Width()) / 2),
                                  rRect.Top() + ((rRect.GetHeight() - aBoxSize.Height()) / 2)),
                            aBoxSize);
@@ -1689,6 +1705,85 @@ void DbCheckBox::PaintFieldToCell(OutputDevice& rDev, const tools::Rectangle& rR
     DbCellControl::PaintFieldToCell(rDev, aRect, _rxField, xFormatter);
 }
 
+void DbCheckBox::PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect)
+{
+    switch (rDev.GetOutDevType())
+    {
+        case OUTDEV_WINDOW:
+        case OUTDEV_VIRDEV:
+            DbCellControl::PaintCell(rDev, rRect);
+            break;
+        case OUTDEV_PRINTER:
+        case OUTDEV_PDF:
+        {
+            TriState eState = static_cast<CheckBoxControl*>(m_pWindow.get())->GetState();
+
+            MapMode aResMapMode(MapUnit::Map100thMM);
+            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);
+
+            rDev.Push();
+            rDev.SetMapMode();
+
+            rDev.SetLineColor();
+            rDev.SetFillColor(COL_BLACK);
+            rDev.DrawRect(aStateRect);
+            aStateRect.AdjustLeft(aBrd1Size.Width());
+            aStateRect.AdjustTop(aBrd1Size.Height());
+            aStateRect.AdjustRight(-aBrd1Size.Width());
+            aStateRect.AdjustBottom(-aBrd1Size.Height());
+            if (eState == TRISTATE_INDET)
+                rDev.SetFillColor(COL_LIGHTGRAY);
+            else
+                rDev.SetFillColor(COL_WHITE);
+            rDev.DrawRect(aStateRect);
+
+            if (eState == TRISTATE_TRUE)
+            {
+                aStateRect.AdjustLeft(aBrd2Size.Width());
+                aStateRect.AdjustTop(aBrd2Size.Height());
+                aStateRect.AdjustRight(-aBrd2Size.Width());
+                aStateRect.AdjustBottom(-aBrd2Size.Height());
+                Point aPos11(aStateRect.TopLeft());
+                Point aPos12(aStateRect.BottomRight());
+                Point aPos21(aStateRect.TopRight());
+                Point aPos22(aStateRect.BottomLeft());
+                Point aTempPos11(aPos11);
+                Point aTempPos12(aPos12);
+                Point aTempPos21(aPos21);
+                Point aTempPos22(aPos22);
+                rDev.SetLineColor(COL_BLACK);
+                int nDX = 0;
+                for (int i = 0; i < nCheckWidth; i++)
+                {
+                    if ( !(i % 2) )
+                    {
+                        aTempPos11.setX(aPos11.X() + nDX);
+                        aTempPos12.setX(aPos12.X() + nDX);
+                        aTempPos21.setX(aPos21.X() + nDX);
+                        aTempPos22.setX(aPos22.X() + nDX);
+                    }
+                    else
+                    {
+                        nDX++;
+                        aTempPos11.setX(aPos11.X() - nDX);
+                        aTempPos12.setX(aPos12.X() - nDX);
+                        aTempPos21.setX(aPos21.X() - nDX);
+                        aTempPos22.setX(aPos22.X() - nDX);
+                    }
+                    rDev.DrawLine(aTempPos11, aTempPos12);
+                    rDev.DrawLine(aTempPos21, aTempPos22);
+                }
+            }
+
+            rDev.Pop();
+            break;
+        }
+    }
+}
+
 void DbCheckBox::updateFromModel( Reference< XPropertySet > _rxModel )
 {
     OSL_ENSURE( _rxModel.is() && m_pWindow, "DbCheckBox::updateFromModel: invalid call!" );
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index be5161d1a2b3..ee2ddc061f28 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -441,6 +441,7 @@ public:
     virtual void PaintFieldToCell(OutputDevice& rDev, const tools::Rectangle& rRect,
                           const css::uno::Reference< css::sdb::XColumn >& _rxField,
                           const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override;
+    virtual void PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect) override;
     virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, const Color** ppColor = nullptr) override;
 
 private: