summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2019-03-12 11:09:29 -0400
committerAndras Timar <andras.timar@collabora.com>2019-03-12 16:43:02 +0100
commit0c80a474fa9853c173cdff57a200aec78eea5d73 (patch)
tree5f1ba11b1e70c3910041c2b880b7231eb3858831 /vcl/source
parent86d07d01697ff000fdffbfacb7dab6509a7d5279 (diff)
Move the Help URL to a different config path
This partially reverts e5a0bafa330c58d6c9352d3acbe4e97fafa1ad56 and simplifies the Help URL configuration. Change-Id: Icc7c31b8955f3df978b57dbd8aa8816a9e1f98ad Reviewed-on: https://gerrit.libreoffice.org/69106 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/app/settings.cxx20
-rw-r--r--vcl/source/control/button.cxx3
2 files changed, 3 insertions, 20 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 0490654461ae..e2841b8b4ed2 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -228,7 +228,6 @@ struct ImplHelpData
sal_uLong mnTipDelay;
sal_uLong mnTipTimeout;
sal_uLong mnBalloonDelay;
- OUString msHelpURL;
};
struct ImplAllSettingsData
@@ -2591,7 +2590,6 @@ ImplHelpData::ImplHelpData( const ImplHelpData& rData )
mnTipDelay = rData.mnTipDelay;
mnTipTimeout = rData.mnTipTimeout;
mnBalloonDelay = rData.mnBalloonDelay;
- msHelpURL = rData.msHelpURL;
}
HelpSettings::HelpSettings()
@@ -2610,8 +2608,7 @@ bool HelpSettings::operator ==( const HelpSettings& rSet ) const
return (mxData->mnTipDelay == rSet.mxData->mnTipDelay ) &&
(mxData->mnTipTimeout == rSet.mxData->mnTipTimeout ) &&
- (mxData->mnBalloonDelay == rSet.mxData->mnBalloonDelay ) &&
- (mxData->msHelpURL == rSet.mxData->msHelpURL);
+ (mxData->mnBalloonDelay == rSet.mxData->mnBalloonDelay );
}
sal_uLong
@@ -2642,21 +2639,6 @@ HelpSettings::GetBalloonDelay() const
return mxData->mnBalloonDelay;
}
-OUString
-HelpSettings::GetHelpURL() const
-{
- return mxData->msHelpURL;
-}
-
-void HelpSettings::SetHelpURL(const OUString& rsHelpURL)
-{
- // copy if other references exist
- if ( ! mxData.unique() ) {
- mxData = std::make_shared<ImplHelpData>(*mxData);
- }
- mxData->msHelpURL = rsHelpURL;
-}
-
bool
HelpSettings::operator !=( const HelpSettings& rSet ) const
{
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 6e44e13bc67b..ecffa1cf5722 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -46,6 +46,7 @@
#include <comphelper/dispatchcommand.hxx>
#include <comphelper/lok.hxx>
+#include <officecfg/Office/Common.hxx>
using namespace css;
@@ -1816,7 +1817,7 @@ void HelpButton::StateChanged( StateChangedType nStateChange )
{
// Hide when we have no help URL.
if (comphelper::LibreOfficeKit::isActive() &&
- Application::GetSettings().GetHelpSettings().GetHelpURL().isEmpty())
+ officecfg::Office::Common::Help::HelpRootURL::get().isEmpty())
Hide();
else
PushButton::StateChanged(nStateChange);