diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-23 12:28:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-24 13:17:39 +0200 |
| commit | cde00e11db2f273f4027780a4f66e40ec7c598e1 (patch) | |
| tree | 56b7eb2e7e47ae0ecaee80b6c8b5867312dd22da /sfx2 | |
| parent | e271fce82e16359394fdeb818c2ec25a07532a8d (diff) | |
use officecfg to retrieve offlinehelppopup
Change-Id: I2441dc1c508ceb4805a98b7e45863bbda4af0b18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119415
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index e96c3f7f4a0d..df0543b15a21 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -1136,8 +1136,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow) if ( !impl_hasHelpInstalled() ) { - SvtHelpOptions aHelpOptions; - bool bShowOfflineHelpPopUp = aHelpOptions.IsOfflineHelpPopUp(); + bool bShowOfflineHelpPopUp = officecfg::Office::Common::Help::BuiltInHelpNotInstalledPopUp::get(); pWindow = GetBestParent(pWindow); @@ -1150,7 +1149,9 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow) HelpManualMessage aQueryBox(pWeldWindow); short OnlineHelpBox = aQueryBox.run(); bShowOfflineHelpPopUp = OnlineHelpBox != RET_OK; - aHelpOptions.SetOfflineHelpPopUp(aQueryBox.GetOfflineHelpPopUp()); + auto xChanges = comphelper::ConfigurationChanges::create(); + officecfg::Office::Common::Help::BuiltInHelpNotInstalledPopUp::set(aQueryBox.GetOfflineHelpPopUp(), xChanges); + xChanges->commit(); aBusy.decBusy(); } if(!bShowOfflineHelpPopUp) @@ -1292,8 +1293,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, weld::Widget* pWidget, const OUSt if ( !impl_hasHelpInstalled() ) { - SvtHelpOptions aHelpOptions; - bool bShowOfflineHelpPopUp = aHelpOptions.IsOfflineHelpPopUp(); + bool bShowOfflineHelpPopUp = officecfg::Office::Common::Help::BuiltInHelpNotInstalledPopUp::get(); TopLevelWindowLocker aBusy; @@ -1303,7 +1303,9 @@ bool SfxHelp::Start_Impl(const OUString& rURL, weld::Widget* pWidget, const OUSt HelpManualMessage aQueryBox(pWidget); short OnlineHelpBox = aQueryBox.run(); bShowOfflineHelpPopUp = OnlineHelpBox != RET_OK; - aHelpOptions.SetOfflineHelpPopUp(aQueryBox.GetOfflineHelpPopUp()); + auto xChanges = comphelper::ConfigurationChanges::create(); + officecfg::Office::Common::Help::BuiltInHelpNotInstalledPopUp::set(aQueryBox.GetOfflineHelpPopUp(), xChanges); + xChanges->commit(); aBusy.decBusy(); } if(!bShowOfflineHelpPopUp) |