sd/source/ui/view/drviews5.cxx | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 496be6be71ca9ce107213da793f3502a3bfda022
Author: Hubert Figuière <h...@collabora.com>
AuthorDate: Mon May 20 11:15:35 2024 -0400
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu May 23 12:48:07 2024 +0200
cool#9019: draw/impress: disable the Grid for now
So that the grid isn't shown in the thumbnail.
This will need to be reverted later for cool#7406
Change-Id: I01fbc7ebc9e33a27fb866b7ea6dbaaac68ae8f9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167872
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
(cherry picked from commit 41130a39ad68310a0136605cbced1f191396c456)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167826
Tested-by: Jenkins
(cherry picked from commit 09f23b8c6cd369b5d0594119f3df62941346a610)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167933
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index c6774537cfea..160b5c5edf27 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -312,7 +312,15 @@ void DrawViewShell::WriteFrameViewData()
mpFrameView->SetGridCoarse( mpDrawView->GetGridCoarse() );
mpFrameView->SetGridFine( mpDrawView->GetGridFine() );
mpFrameView->SetSnapGridWidth(mpDrawView->GetSnapGridWidthX(),
mpDrawView->GetSnapGridWidthY());
- mpFrameView->SetGridVisible( mpDrawView->IsGridVisible() );
+
+ // In LOK, Grid isn't implemented, and it appears in the slide thumbnails
+ // Remove this when Grid is implemented and/or thumbnails are fixed to no
longer
+ // show the grid.
+ if (comphelper::LibreOfficeKit::isActive())
+ mpFrameView->SetGridVisible( false );
+ else
+ mpFrameView->SetGridVisible( mpDrawView->IsGridVisible() );
+
mpFrameView->SetGridFront( mpDrawView->IsGridFront() );
mpFrameView->SetSnapAngle( mpDrawView->GetSnapAngle() );
mpFrameView->SetGridSnap( mpDrawView->IsGridSnap() );
