core.git: Branch 'distro/collabora/co-24.04' - svx/source

[Marco Cecchetti (via logerrit)]

 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx |    4 +++-
 svx/source/svdraw/svdpntv.cxx                            |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 4f7e331af8c8109f71cef4e66fa913572e9ab2ed
Author:     Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Sat Apr 26 18:01:58 2025 +0200
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Wed Apr 30 07:38:59 2025 +0200

    cool#9200 form control: checkbox not shown when exporting to PDF/EPUB or 
printing
    
    Change-Id: I55f2285130914172a79c8c534f16ae6e2c3fa8ae
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184689
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx 
b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index e5292b1515d5..9b8e51029736 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -280,7 +280,9 @@ namespace sdr::contact {
         const basegfx::B2DHomMatrix& _rViewTransformation, const 
::basegfx::B2DHomMatrix& _rZoomLevelNormalization )
     {
         // In the LOK case, control geometry is handled by LokControlHandler
-        if (comphelper::LibreOfficeKit::isActive())
+        // except when the document is exported to PDF or printed,
+        // so we use isTiledPainting() in place of the more generic isActive()
+        if (comphelper::LibreOfficeKit::isTiledPainting())
             return;
 
         OSL_PRECOND( _rControl.is(), 
"UnoControlContactHelper::adjustControlGeometry_throw: illegal control!" );
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 1aa512072586..231905709347 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -635,7 +635,9 @@ void SdrPaintView::EndCompleteRedraw(SdrPaintWindow& 
rPaintWindow, bool bPaintFo
         // draw postprocessing, only for known devices
         // it is necessary to always paint FormLayer
         // In the LOK case control rendering is performed through 
LokControlHandler
-        if(!comphelper::LibreOfficeKit::isActive() && bPaintFormLayer)
+        // except when the document is exported to PDF or printed,
+        // so we use isTiledPainting() in place of the more generic isActive()
+        if(!comphelper::LibreOfficeKit::isTiledPainting() && bPaintFormLayer)
         {
             ImpFormLayerDrawing(rPaintWindow);
         }