sw/source/uibase/config/usrpref.cxx | 2 +- sw/source/uibase/inc/usrpref.hxx | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)
New commits: commit 792fca692594a642762c8ea62581d43fb56300d4 Author: Tamás Zolnai <[email protected]> AuthorDate: Sat Dec 27 08:27:27 2025 +0100 Commit: Tamás Zolnai <[email protected]> CommitDate: Sat Dec 27 09:55:34 2025 +0100 tdf#169806: Fix saving baseline grid configuration option on Windows. Change-Id: I1be09b852ebcf464597b344c45e5cfd2c95eedf9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196242 Reviewed-by: Tamás Zolnai <[email protected]> Tested-by: Jenkins diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index f96b66cc27a0..8c0584857014 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -72,7 +72,7 @@ SwMasterUsrPref::SwMasterUsrPref(bool bWeb) : m_aCursorConfig(*this), m_pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : nullptr), m_aFmtAidsAutoComplConfig(*this), - m_aBaselineGridConfig(bWeb ? std::nullopt : std::make_optional<SwBaselineGridConfig>(*this)) + m_aBaselineGridConfig(bWeb ? nullptr : std::make_unique<SwBaselineGridConfig>(*this)) { if (comphelper::IsFuzzing()) { diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx index 08bb434dcaae..907a4fbdeee0 100644 --- a/sw/source/uibase/inc/usrpref.hxx +++ b/sw/source/uibase/inc/usrpref.hxx @@ -24,7 +24,6 @@ #include <fldupde.hxx> #include <viewopt.hxx> #include <tools/fldunit.hxx> -#include <optional> #include "SwBaselineGridConfig.hxx" class SwMasterUsrPref; @@ -178,7 +177,7 @@ class SwMasterUsrPref : public SwViewOption SwCursorConfig m_aCursorConfig; std::unique_ptr<SwWebColorConfig> m_pWebColorConfig; SwFmtAidsAutoComplConfig m_aFmtAidsAutoComplConfig; - std::optional<SwBaselineGridConfig> m_aBaselineGridConfig; // Not available in web mode + std::unique_ptr<SwBaselineGridConfig> m_aBaselineGridConfig; // Not available in web mode public: SwMasterUsrPref(bool bWeb); @@ -196,7 +195,7 @@ public: m_pWebColorConfig->SetModified(); m_aFmtAidsAutoComplConfig.SetModified(); - if(m_aBaselineGridConfig.has_value()) + if(m_aBaselineGridConfig) { m_aBaselineGridConfig->SetModified(); }
