sd/source/ui/framework/module/SlideSorterModule.cxx | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 423d240dc680817efae645d8305402f922bb452d
Author: Sarper Akdemir <sarper.akde...@allotropia.de>
AuthorDate: Wed May 8 14:47:40 2024 +0200
Commit: Sarper Akdemir <sar...@libreoffice.org>
CommitDate: Fri May 10 10:02:26 2024 +0200
sd: properly read values of optional config items for SlideSorterBar
Guessing this has regressed with
9fc28d7ef5def30a23960cf15334af1aec27460f
Read the values from std::optional<bool> properly.
The default values are taken from the configuration
officecfg/registry/data/org/openoffice/Office/Impress.xcu
Change-Id: I93d5537a9e06dc6985a2ec375353d9869b92e08c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167353
Reviewed-by: Sarper Akdemir <sar...@libreoffice.org>
Tested-by: Jenkins
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx
b/sd/source/ui/framework/module/SlideSorterModule.cxx
index 7d8304bec454..6b6987df2968 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -81,17 +81,19 @@ SlideSorterModule::SlideSorterModule (
UpdateViewTabBar(nullptr);
- if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::ImpressView::get().has_value()
&& (!getenv("LO_TESTNAME") || !comphelper::LibreOfficeKit::isActive()))
+ if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::ImpressView::get().value_or(true)
+ && (!getenv("LO_TESTNAME") || !comphelper::LibreOfficeKit::isActive()))
AddActiveMainView(FrameworkHelper::msImpressViewURL);
- if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::OutlineView::get())
+ if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::OutlineView::get().value_or(true))
AddActiveMainView(FrameworkHelper::msOutlineViewURL);
- if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::NotesView::get())
+ if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::NotesView::get().value_or(true))
AddActiveMainView(FrameworkHelper::msNotesViewURL);
- if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::HandoutView::get())
+ if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::HandoutView::get().value_or(false))
AddActiveMainView(FrameworkHelper::msHandoutViewURL);
- if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::SlideSorterView::get().has_value()
&& !comphelper::LibreOfficeKit::isActive())
+ if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::SlideSorterView::get().value_or(false)
+ && !comphelper::LibreOfficeKit::isActive())
AddActiveMainView(FrameworkHelper::msSlideSorterURL);
- if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::DrawView::get())
+ if
(officecfg::Office::Impress::MultiPaneGUI::SlideSorterBar::Visible::DrawView::get().value_or(true))
AddActiveMainView(FrameworkHelper::msDrawViewURL);
mxConfigurationController->addConfigurationChangeListener(
