sd/source/ui/framework/module/SlideSorterModule.cxx | 29 +++++++++++---------
sd/source/ui/unoidl/unomodel.cxx | 8 ++---
2 files changed, 20 insertions(+), 17 deletions(-)
New commits:
commit 9fc28d7ef5def30a23960cf15334af1aec27460f
Author: Gabor Kelemen <kelem...@ubuntu.com>
AuthorDate: Fri Dec 29 00:47:56 2023 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Wed Jan 3 00:01:55 2024 +0100
Use officecfg instead of SvtSlideSorterBarOptions class
Change-Id: Ie2965f343e6df31502596c35e1d17c22bbccb142
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161451
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx
b/sd/source/ui/framework/module/SlideSorterModule.cxx
index 1b6bbb7f9fae..7d8304bec454 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -19,8 +19,10 @@
#include "SlideSorterModule.hxx"
+#include <comphelper/lok.hxx>
#include <framework/FrameworkHelper.hxx>
#include <framework/ConfigurationController.hxx>
+#include <officecfg/Office/Impress.hxx>
#include <DrawController.hxx>
#include <com/sun/star/drawing/framework/XTabBar.hpp>
#include <com/sun/star/drawing/framework/TabBarButton.hpp>
@@ -29,7 +31,6 @@
#include <strings.hrc>
#include <sdresid.hxx>
-#include <svtools/slidesorterbaropt.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -80,17 +81,17 @@ SlideSorterModule::SlideSorterModule (
UpdateViewTabBar(nullptr);
- if (SvtSlideSorterBarOptions().GetVisibleImpressView())
+ if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::ImpressView::get().has_value()
&& (!getenv("LO_TESTNAME") || !comphelper::LibreOfficeKit::isActive()))
AddActiveMainView(FrameworkHelper::msImpressViewURL);
- if (SvtSlideSorterBarOptions().GetVisibleOutlineView())
+ if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::OutlineView::get())
AddActiveMainView(FrameworkHelper::msOutlineViewURL);
- if (SvtSlideSorterBarOptions().GetVisibleNotesView())
+ if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::NotesView::get())
AddActiveMainView(FrameworkHelper::msNotesViewURL);
- if (SvtSlideSorterBarOptions().GetVisibleHandoutView())
+ if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::HandoutView::get())
AddActiveMainView(FrameworkHelper::msHandoutViewURL);
- if (SvtSlideSorterBarOptions().GetVisibleSlideSorterView())
+ if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::SlideSorterView::get().has_value()
&& !comphelper::LibreOfficeKit::isActive())
AddActiveMainView(FrameworkHelper::msSlideSorterURL);
- if (SvtSlideSorterBarOptions().GetVisibleDrawView())
+ if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::DrawView::get())
AddActiveMainView(FrameworkHelper::msDrawViewURL);
mxConfigurationController->addConfigurationChangeListener(
@@ -105,12 +106,14 @@ SlideSorterModule::~SlideSorterModule()
void SlideSorterModule::SaveResourceState()
{
-
SvtSlideSorterBarOptions().SetVisibleImpressView(IsResourceActive(FrameworkHelper::msImpressViewURL));
-
SvtSlideSorterBarOptions().SetVisibleOutlineView(IsResourceActive(FrameworkHelper::msOutlineViewURL));
-
SvtSlideSorterBarOptions().SetVisibleNotesView(IsResourceActive(FrameworkHelper::msNotesViewURL));
-
SvtSlideSorterBarOptions().SetVisibleHandoutView(IsResourceActive(FrameworkHelper::msHandoutViewURL));
-
SvtSlideSorterBarOptions().SetVisibleSlideSorterView(IsResourceActive(FrameworkHelper::msSlideSorterURL));
-
SvtSlideSorterBarOptions().SetVisibleDrawView(IsResourceActive(FrameworkHelper::msDrawViewURL));
+ auto xChanges = comphelper::ConfigurationChanges::create();
+
officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::ImpressView::set(IsResourceActive(FrameworkHelper::msImpressViewURL),xChanges);
+
officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::OutlineView::set(IsResourceActive(FrameworkHelper::msOutlineViewURL),xChanges);
+
officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::NotesView::set(IsResourceActive(FrameworkHelper::msNotesViewURL),xChanges);
+
officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::HandoutView::set(IsResourceActive(FrameworkHelper::msHandoutViewURL),xChanges);
+
officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::SlideSorterView::set(IsResourceActive(FrameworkHelper::msSlideSorterURL),xChanges);
+
officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::DrawView::set(IsResourceActive(FrameworkHelper::msDrawViewURL),xChanges);
+ xChanges->commit();
}
void SAL_CALL SlideSorterModule::notifyConfigurationChange (
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 52c95e556561..075ee6e383a7 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -33,6 +33,7 @@
#include <com/sun/star/embed/Aspects.hpp>
#include <officecfg/Office/Common.hxx>
+#include <officecfg/Office/Impress.hxx>
#include <comphelper/indexedpropertyvalues.hxx>
#include <comphelper/lok.hxx>
#include <comphelper/propertyvalue.hxx>
@@ -71,7 +72,6 @@
#include <svx/svdpool.hxx>
#include <svx/svdpagv.hxx>
#include <svtools/unoimap.hxx>
-#include <svtools/slidesorterbaropt.hxx>
#include <svx/unoshape.hxx>
#include <editeng/unonrule.hxx>
#include <editeng/eeitem.hxx>
@@ -2631,10 +2631,10 @@ void
SdXImpressDocument::initializeForTiledRendering(const css::uno::Sequence<cs
// format
auto xChanges = comphelper::ConfigurationChanges::create();
officecfg::Office::Common::Save::Document::WarnAlienFormat::set(false,
xChanges);
- xChanges->commit();
- if (!getenv("LO_TESTNAME"))
- SvtSlideSorterBarOptions().SetVisibleImpressView(true);
+ if (!getenv("LO_TESTNAME") || !comphelper::LibreOfficeKit::isActive())
+
officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::ImpressView::set(true,xChanges);
+ xChanges->commit();
}
void SdXImpressDocument::postKeyEvent(int nType, int nCharCode, int nKeyCode)
