[Libreoffice-commits] core.git: cui/source include/svtools include/unotools sfx2/inc sfx2/source svtools/Library_svt.mk svtools/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sun Jul 25 07:07:12 UTC 2021
cui/source/options/optgdlg.cxx | 19 --
cui/source/options/treeopt.cxx | 11 -
include/svtools/helpopt.hxx | 43 -----
include/unotools/itemholderbase.hxx | 1
sfx2/inc/pch/precompiled_sfx.hxx | 1
sfx2/source/appl/app.cxx | 8 -
sfx2/source/appl/appcfg.cxx | 15 +-
sfx2/source/appl/appserv.cxx | 9 -
sfx2/source/appl/sfxhelp.cxx | 1
sfx2/source/inc/appdata.hxx | 1
svtools/Library_svt.mk | 1
svtools/source/config/helpopt.cxx | 248 ----------------------------------
svtools/source/config/itemholder2.cxx | 5
13 files changed, 30 insertions(+), 333 deletions(-)
New commits:
commit 9117fb44bc7bd6b8764911c731c84a9e5dcc37f0
Author: Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Jul 24 22:18:46 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Jul 25 09:06:38 2021 +0200
use officecfg for help options
Change-Id: I2d19541cff07bf8159715d8f32d771cbf201ece4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119475
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 9194219d2056..f1f46e144701 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -45,7 +45,6 @@
#include <editeng/editids.hrc>
#include <svx/svxids.hrc>
#include <svl/intitem.hxx>
-#include <svtools/helpopt.hxx>
#include <unotools/searchopt.hxx>
#include <sal/log.hxx>
#include <officecfg/Office/Common.hxx>
@@ -217,16 +216,11 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
bool bModified = false;
std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
- SvtHelpOptions aHelpOptions;
if ( m_xPopUpNoHelpCB->get_state_changed_from_saved() )
- {
- auto xChanges = comphelper::ConfigurationChanges::create();
- officecfg::Office::Common::Help::BuiltInHelpNotInstalledPopUp::set(m_xPopUpNoHelpCB->get_active(), xChanges);
- xChanges->commit();
- }
+ officecfg::Office::Common::Help::BuiltInHelpNotInstalledPopUp::set(m_xPopUpNoHelpCB->get_active(), batch);
if ( m_xExtHelpCB->get_state_changed_from_saved() )
- aHelpOptions.SetExtendedHelp( m_xExtHelpCB->get_active() );
+ officecfg::Office::Common::Help::ExtendedTip::set(m_xExtHelpCB->get_active(), batch);
if ( m_xShowTipOfTheDay->get_state_changed_from_saved() )
{
@@ -236,10 +230,7 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
if ( m_xFileDlgCB->get_state_changed_from_saved() )
{
- std::shared_ptr< comphelper::ConfigurationChanges > xChanges(
- comphelper::ConfigurationChanges::create());
- officecfg::Office::Common::Misc::UseSystemFileDialog::set( !m_xFileDlgCB->get_active(), xChanges );
- xChanges->commit();
+ officecfg::Office::Common::Misc::UseSystemFileDialog::set( !m_xFileDlgCB->get_active(), batch );
bModified = true;
}
@@ -287,8 +278,8 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
{
- SvtHelpOptions aHelpOptions;
- m_xExtHelpCB->set_active( aHelpOptions.IsHelpTips() && aHelpOptions.IsExtendedHelp() );
+ m_xExtHelpCB->set_active( officecfg::Office::Common::Help::Tip::get() &&
+ officecfg::Office::Common::Help::ExtendedTip::get() );
m_xExtHelpCB->save_state();
m_xPopUpNoHelpCB->set_active( officecfg::Office::Common::Help::BuiltInHelpNotInstalledPopUp::get() );
m_xPopUpNoHelpCB->save_state();
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 698196afe099..0d617a8d3552 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -90,7 +90,6 @@
#include <svl/flagitem.hxx>
#include <svl/intitem.hxx>
#include <svl/languageoptions.hxx>
-#include <svtools/helpopt.hxx>
#include <svx/databaseregistrationui.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/urlobj.hxx>
@@ -1223,10 +1222,12 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
}
// evaluate help options
- if ( SvtHelpOptions().IsHelpTips() != Help::IsQuickHelpEnabled() )
- SvtHelpOptions().IsHelpTips() ? Help::EnableQuickHelp() : Help::DisableQuickHelp();
- if ( SvtHelpOptions().IsExtendedHelp() != Help::IsBalloonHelpEnabled() )
- SvtHelpOptions().IsExtendedHelp() ? Help::EnableBalloonHelp() : Help::DisableBalloonHelp();
+ bool bHelpTips = officecfg::Office::Common::Help::Tip::get();
+ if ( bHelpTips != Help::IsQuickHelpEnabled() )
+ bHelpTips ? Help::EnableQuickHelp() : Help::DisableQuickHelp();
+ bool bExtendedHelp = officecfg::Office::Common::Help::ExtendedTip::get();
+ if ( bExtendedHelp != Help::IsBalloonHelpEnabled() )
+ bExtendedHelp ? Help::EnableBalloonHelp() : Help::DisableBalloonHelp();
batch->commit();
}
diff --git a/include/svtools/helpopt.hxx b/include/svtools/helpopt.hxx
deleted file mode 100644
index 803fce3ff0f0..000000000000
--- a/include/svtools/helpopt.hxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#pragma once
-
-#include <svtools/svtdllapi.h>
-
-#include <rtl/ustring.hxx>
-#include <unotools/options.hxx>
-#include <memory>
-
-class SvtHelpOptions_Impl;
-
-class SVT_DLLPUBLIC SvtHelpOptions final : public utl::detail::Options
-{
- std::shared_ptr<SvtHelpOptions_Impl> pImpl;
-
-public:
- SvtHelpOptions();
- virtual ~SvtHelpOptions() override;
-
- void SetExtendedHelp( bool b );
- bool IsExtendedHelp() const;
- void SetHelpTips( bool b );
- bool IsHelpTips() const;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/itemholderbase.hxx b/include/unotools/itemholderbase.hxx
index 1c496667681e..3546e5fd1478 100644
--- a/include/unotools/itemholderbase.hxx
+++ b/include/unotools/itemholderbase.hxx
@@ -44,7 +44,6 @@ enum class EItem
EventConfig ,
- HelpOptions , // 2
HistoryOptions ,
LinguConfig ,
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;
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index ee4361331125..6a23e69b3842 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/config/colorcfg \
svtools/source/config/extcolorcfg \
svtools/source/config/fontsubstconfig \
- svtools/source/config/helpopt \
svtools/source/config/htmlcfg \
svtools/source/config/itemholder2 \
svtools/source/config/menuoptions \
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
deleted file mode 100644
index 88c9d9865905..000000000000
--- a/svtools/source/config/helpopt.cxx
+++ /dev/null
@@ -1,248 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sal/config.h>
-
-#include <svtools/helpopt.hxx>
-#include <unotools/configitem.hxx>
-#include <tools/debug.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <comphelper/sequence.hxx>
-#include <vcl/help.hxx>
-#include <osl/mutex.hxx>
-#include <sal/log.hxx>
-
-#include "itemholder2.hxx"
-
-using namespace utl;
-using namespace com::sun::star::uno;
-using namespace com::sun::star;
-
-namespace {
- //global
- std::weak_ptr<SvtHelpOptions_Impl> g_pHelpOptions;
-
-enum class HelpProperty
-{
- ExtendedHelp = 0,
- HelpTips = 1,
- Locale = 2
-};
-
-}
-
-class SvtHelpOptions_Impl : public utl::ConfigItem
-{
- bool bExtendedHelp;
- bool bHelpTips;
- OUString aLocale;
- OUString sHelpStyleSheet;
-
- static Sequence< OUString > const & GetPropertyNames();
-
- virtual void ImplCommit() final override;
-
-public:
- SvtHelpOptions_Impl();
- ~SvtHelpOptions_Impl() override;
-
- virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
- void Load( const css::uno::Sequence< OUString>& aPropertyNames);
-
- void SetExtendedHelp( bool b ) { bExtendedHelp= b; SetModified(); }
- bool IsExtendedHelp() const { return bExtendedHelp; }
- void SetHelpTips( bool b ) { bHelpTips = b; SetModified(); }
- bool IsHelpTips() const { return bHelpTips; }
-
- static ::osl::Mutex & getInitMutex();
-};
-
-Sequence< OUString > const & SvtHelpOptions_Impl::GetPropertyNames()
-{
- static Sequence<OUString> const aNames
- {
- "ExtendedTip",
- "Tip",
- "Locale"
- };
-
- return aNames;
-}
-
-::osl::Mutex & SvtHelpOptions_Impl::getInitMutex()
-{
- static ::osl::Mutex ourMutex;
-
- return ourMutex;
-}
-
-SvtHelpOptions_Impl::SvtHelpOptions_Impl()
- : ConfigItem( "Office.Common/Help" )
- , bExtendedHelp( false )
- , bHelpTips( true )
-{
- Sequence< OUString > aNames = GetPropertyNames();
- Load( aNames );
- EnableNotification( aNames );
-}
-
-SvtHelpOptions_Impl::~SvtHelpOptions_Impl()
-{
- if ( IsModified() )
- Commit();
-}
-
-void SvtHelpOptions_Impl::Load(const uno::Sequence< OUString>& rPropertyNames)
-{
- const uno::Sequence< OUString> aInternalPropertyNames( GetPropertyNames());
- Sequence< Any > aValues = GetProperties( rPropertyNames );
- const Any* pValues = aValues.getConstArray();
- DBG_ASSERT( aValues.getLength() == rPropertyNames.getLength(), "GetProperties failed" );
- if ( aValues.getLength() != rPropertyNames.getLength() )
- return;
-
- for ( int nProp = 0; nProp < rPropertyNames.getLength(); nProp++ )
- {
- assert(pValues[nProp].hasValue() && "property value missing");
- if ( pValues[nProp].hasValue() )
- {
- bool bTmp;
- OUString aTmpStr;
- sal_Int32 nTmpInt = 0;
- if ( pValues[nProp] >>= bTmp )
- {
- switch ( static_cast< HelpProperty >(
- comphelper::findValue(aInternalPropertyNames, rPropertyNames[nProp]) ) )
- {
- case HelpProperty::ExtendedHelp:
- bExtendedHelp = bTmp;
- break;
- case HelpProperty::HelpTips:
- bHelpTips = bTmp;
- break;
- default:
- SAL_WARN( "svtools.config", "Wrong Member!" );
- break;
- }
- }
- else if ( pValues[nProp] >>= aTmpStr )
- {
- switch ( static_cast< HelpProperty >(nProp) )
- {
- case HelpProperty::Locale:
- aLocale = aTmpStr;
- break;
-
- default:
- SAL_WARN( "svtools.config", "Wrong Member!" );
- break;
- }
- }
- else if ( pValues[nProp] >>= nTmpInt )
- {
- SAL_WARN( "svtools.config", "Wrong Member!" );
- }
- else
- {
- SAL_WARN( "svtools.config", "Wrong Type!" );
- }
- }
- }
- if ( IsHelpTips() != Help::IsQuickHelpEnabled() )
- IsHelpTips() ? Help::EnableQuickHelp() : Help::DisableQuickHelp();
- if ( IsExtendedHelp() != Help::IsBalloonHelpEnabled() )
- IsExtendedHelp() ? Help::EnableBalloonHelp() : Help::DisableBalloonHelp();
-}
-
-void SvtHelpOptions_Impl::ImplCommit()
-{
- Sequence< OUString > aNames = GetPropertyNames();
- Sequence< Any > aValues( aNames.getLength() );
- Any* pValues = aValues.getArray();
- for ( int nProp = 0; nProp < aNames.getLength(); nProp++ )
- {
- switch ( static_cast< HelpProperty >(nProp) )
- {
- case HelpProperty::ExtendedHelp:
- pValues[nProp] <<= bExtendedHelp;
- break;
-
- case HelpProperty::HelpTips:
- pValues[nProp] <<= bHelpTips;
- break;
-
- case HelpProperty::Locale:
- pValues[nProp] <<= aLocale;
- break;
-
- }
- }
-
- PutProperties( aNames, aValues );
-}
-
-void SvtHelpOptions_Impl::Notify( const Sequence<OUString>& aPropertyNames )
-{
- Load( aPropertyNames );
-}
-
-SvtHelpOptions::SvtHelpOptions()
-{
- // Global access, must be guarded (multithreading)
- ::osl::MutexGuard aGuard( SvtHelpOptions_Impl::getInitMutex() );
-
- pImpl = g_pHelpOptions.lock();
- if ( !pImpl )
- {
- pImpl = std::make_shared<SvtHelpOptions_Impl>();
- g_pHelpOptions = pImpl;
- svtools::ItemHolder2::holdConfigItem(EItem::HelpOptions);
- }
-}
-
-SvtHelpOptions::~SvtHelpOptions()
-{
- // Global access, must be guarded (multithreading)
- ::osl::MutexGuard aGuard( SvtHelpOptions_Impl::getInitMutex() );
-
- pImpl.reset();
-}
-
-void SvtHelpOptions::SetExtendedHelp( bool b )
-{
- pImpl->SetExtendedHelp( b );
-}
-
-bool SvtHelpOptions::IsExtendedHelp() const
-{
- return pImpl->IsExtendedHelp();
-}
-
-void SvtHelpOptions::SetHelpTips( bool b )
-{
- pImpl->SetHelpTips( b );
-}
-
-bool SvtHelpOptions::IsHelpTips() const
-{
- return pImpl->IsHelpTips();
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index cb02d6de5e5c..adb68024b020 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -28,7 +28,6 @@
#include <svtools/accessibilityoptions.hxx>
#include <svtools/menuoptions.hxx>
#include <svtools/colorcfg.hxx>
-#include <svtools/helpopt.hxx>
#include <svtools/printoptions.hxx>
#include <unotools/options.hxx>
#include <svtools/miscopt.hxx>
@@ -129,10 +128,6 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem)
rItem.pItem.reset( new ::svtools::ColorConfig() );
break;
- case EItem::HelpOptions :
- rItem.pItem.reset( new SvtHelpOptions() );
- break;
-
case EItem::MenuOptions :
rItem.pItem.reset( new SvtMenuOptions() );
break;
More information about the Libreoffice-commits
mailing list