summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/pch/precompiled_sfx.hxx1
-rw-r--r--sfx2/source/appl/app.cxx8
-rw-r--r--sfx2/source/appl/appcfg.cxx15
-rw-r--r--sfx2/source/appl/appserv.cxx9
-rw-r--r--sfx2/source/appl/sfxhelp.cxx1
-rw-r--r--sfx2/source/inc/appdata.hxx1
6 files changed, 19 insertions, 16 deletions
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index b60b8ec2945e..fc1d910d520e 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -335,7 +335,6 @@
#include <svl/visitem.hxx>
#include <svl/whiter.hxx>
#include <svtools/ehdl.hxx>
-#include <svtools/helpopt.hxx>
#include <svtools/imagemgr.hxx>
#include <svtools/miscopt.hxx>
#include <svtools/sfxecode.hxx>
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index e410902ccdb7..0dd179a065cd 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -53,7 +53,7 @@
#include <shellimpl.hxx>
#include <sidebar/ControllerFactory.hxx>
-#include <svtools/helpopt.hxx>
+#include <officecfg/Office/Common.hxx>
#include <unotools/viewoptions.hxx>
#include <rtl/instance.hxx>
#include <rtl/strbuf.hxx>
@@ -129,11 +129,13 @@ SfxApplication* SfxApplication::GetOrCreate()
::framework::SetIsDockingWindowVisible( IsDockingWindowVisible );
#if HAVE_FEATURE_XMLHELP
Application::SetHelp( pSfxHelp );
- if (!utl::ConfigManager::IsFuzzing() && SvtHelpOptions().IsHelpTips())
+ bool bHelpTip = officecfg::Office::Common::Help::Tip::get();
+ bool bExtendedHelpTip = officecfg::Office::Common::Help::ExtendedTip::get();
+ if (!utl::ConfigManager::IsFuzzing() && bHelpTip)
Help::EnableQuickHelp();
else
Help::DisableQuickHelp();
- if (!utl::ConfigManager::IsFuzzing() && SvtHelpOptions().IsHelpTips() && SvtHelpOptions().IsExtendedHelp())
+ if (!utl::ConfigManager::IsFuzzing() && bHelpTip && bExtendedHelpTip)
Help::EnableBalloonHelp();
else
Help::DisableBalloonHelp();
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 4a5913bbe4b7..2b95176869d5 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -39,7 +39,6 @@
#include <officecfg/Office/Common.hxx>
#include <officecfg/Office/Recovery.hxx>
#include <unotools/saveopt.hxx>
-#include <svtools/helpopt.hxx>
#include <unotools/securityoptions.hxx>
#include <unotools/pathoptions.hxx>
#include <svtools/miscopt.hxx>
@@ -117,7 +116,6 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
const WhichRangesContainer& pRanges = rSet.GetRanges();
SvtSaveOptions aSaveOptions;
- SvtHelpOptions aHelpOptions;
SvtSecurityOptions aSecurityOptions;
SvtMiscOptions aMiscOptions;
@@ -224,12 +222,12 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
break;
case SID_HELPBALLOONS :
if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_HELPBALLOONS ),
- aHelpOptions.IsExtendedHelp() ) ) )
+ officecfg::Office::Common::Help::ExtendedTip::get() ) ) )
bRet = true;
break;
case SID_HELPTIPS :
if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_HELPTIPS ),
- aHelpOptions.IsHelpTips() ) ) )
+ officecfg::Office::Common::Help::Tip::get() ) ) )
bRet = true;
break;
case SID_HELP_STYLESHEET :
@@ -410,7 +408,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
SfxItemPool &rPool = GetPool();
SvtSaveOptions aSaveOptions;
- SvtHelpOptions aHelpOptions;
SvtSecurityOptions aSecurityOptions;
SvtMiscOptions aMiscOptions;
std::shared_ptr< comphelper::ConfigurationChanges > batch(
@@ -526,14 +523,18 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
if ( SfxItemState::SET == rSet.GetItemState(rPool.GetWhich(SID_HELPBALLOONS), true, &pItem))
{
DBG_ASSERT(dynamic_cast< const SfxBoolItem *>( pItem ) != nullptr, "BoolItem expected");
- aHelpOptions.SetExtendedHelp(static_cast<const SfxBoolItem *>(pItem)->GetValue());
+ officecfg::Office::Common::Help::ExtendedTip::set(
+ static_cast<const SfxBoolItem *>(pItem)->GetValue(),
+ batch);
}
// HelpTips
if ( SfxItemState::SET == rSet.GetItemState(rPool.GetWhich(SID_HELPTIPS), true, &pItem))
{
DBG_ASSERT(dynamic_cast< const SfxBoolItem *>( pItem ) != nullptr, "BoolItem expected");
- aHelpOptions.SetHelpTips( static_cast<const SfxBoolItem *>(pItem)->GetValue());
+ officecfg::Office::Common::Help::Tip::set(
+ static_cast<const SfxBoolItem *>(pItem)->GetValue(),
+ batch);
}
if ( SfxItemState::SET == rSet.GetItemState(rPool.GetWhich(SID_HELP_STYLESHEET ), true, &pItem))
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index e61cd7f510df..b0e08c424563 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -67,7 +67,6 @@
#include <vcl/toolbox.hxx>
#include <unotools/moduleoptions.hxx>
-#include <svtools/helpopt.hxx>
#include <rtl/bootstrap.hxx>
#include <com/sun/star/frame/ModuleManager.hpp>
@@ -578,7 +577,9 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
Help::EnableQuickHelp();
else
Help::DisableQuickHelp();
- SvtHelpOptions().SetHelpTips( bOn );
+ auto xChanges = comphelper::ConfigurationChanges::create();
+ officecfg::Office::Common::Help::Tip::set(bOn, xChanges);
+ xChanges->commit();
Invalidate(SID_HELPTIPS);
bDone = true;
@@ -605,7 +606,9 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
Help::EnableBalloonHelp();
else
Help::DisableBalloonHelp();
- SvtHelpOptions().SetExtendedHelp( bOn );
+ auto xChanges = comphelper::ConfigurationChanges::create();
+ officecfg::Office::Common::Help::ExtendedTip::set(bOn, xChanges);
+ xChanges->commit();
Invalidate(SID_HELPBALLOONS);
bDone = true;
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index df0543b15a21..b158062683e7 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -44,7 +44,6 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/frame/ModuleManager.hpp>
#include <unotools/configmgr.hxx>
-#include <svtools/helpopt.hxx>
#include <unotools/moduleoptions.hxx>
#include <tools/urlobj.hxx>
#include <ucbhelper/content.hxx>
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 0861ad69758f..8bea6e44b6a2 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -46,7 +46,6 @@ class SfxDdeTriggerTopic_Impl;
class SfxDocumentTemplates;
class SfxFrame;
class SvtSaveOptions;
-class SvtHelpOptions;
class SfxViewFrame;
class SfxSlotPool;
class SfxDispatcher;
generated by cgit (git 2.34.1) at 2024-12-28 05:23:34 +0000