diff --git a/bin/find-mergedlib-can-be-private-symbols.functions.results b/bin/find-mergedlib-can-be-private-symbols.functions.results index 3ceead740e10..24eeb5a85d5e 100644 --- a/bin/find-mergedlib-can-be-private-symbols.functions.results +++ b/bin/find-mergedlib-can-be-private-symbols.functions.results @@ -1292,7 +1292,6 @@ Help::EndExtHelp() Help::GetHelpText(rtl::OUString const&, vcl::Window const*) Help::GetHelpText(rtl::OUString const&, weld::Widget const*) Help::Help() -Help::IsContextHelpEnabled() Help::IsExtHelpEnabled() Help::SearchKeyword(rtl::OUString const&) Help::Start(rtl::OUString const&, vcl::Window const*) diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 3a8d9e9849ff..0a7f653b0180 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -102,7 +102,6 @@ class SFX2_DLLPUBLIC SfxSingleTabDialogController : public SfxOkDialogController private: std::unique_ptr m_xOutputSet; const SfxItemSet* m_pInputSet; - bool m_bHideHelpBtn; public: SfxSingleTabDialogController(weld::Widget* pParent, const SfxItemSet* pOptionsSet, diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx index b4bacc9a476f..4265e258292d 100644 --- a/include/vcl/help.hxx +++ b/include/vcl/help.hxx @@ -71,7 +71,6 @@ public: static void EnableContextHelp(); static void DisableContextHelp(); - static bool IsContextHelpEnabled(); static void EnableExtHelp(); static void DisableExtHelp(); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 01a9937d3706..0a1ab15b2a51 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include using namespace ::com::sun::star::uno; @@ -232,7 +231,6 @@ SfxSingleTabDialogController::SfxSingleTabDialogController(weld::Widget *pParent const OUString& rUIXMLDescription, const OUString& rID) : SfxOkDialogController(pParent, rUIXMLDescription, rID) , m_pInputSet(pSet) - , m_bHideHelpBtn(comphelper::LibreOfficeKit::isActive() && officecfg::Office::Common::Help::HelpRootURL::get().isEmpty()) , m_xContainer(m_xDialog->weld_content_area()) , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr)) , m_xHelpBtn(m_xBuilder->weld_button(u"help"_ustr)) @@ -244,7 +242,6 @@ SfxSingleTabDialogController::SfxSingleTabDialogController(weld::Widget *pParent const OUString& rContainerId, const OUString& rUIXMLDescription, const OUString& rID) : SfxOkDialogController(pParent, rUIXMLDescription, rID) , m_pInputSet(pSet) - , m_bHideHelpBtn(comphelper::LibreOfficeKit::isActive() && officecfg::Office::Common::Help::HelpRootURL::get().isEmpty()) , m_xContainer(m_xBuilder->weld_container(rContainerId)) , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr)) , m_xHelpBtn(m_xBuilder->weld_button(u"help"_ustr)) @@ -277,9 +274,6 @@ void SfxSingleTabDialogController::SetTabPage(std::unique_ptr xTabPa m_xSfxPage->SetUserData(sUserData); m_xSfxPage->Reset(GetInputItemSet()); - if (!m_bHideHelpBtn) - m_xHelpBtn->set_visible(Help::IsContextHelpEnabled()); - // Set TabPage text in the Dialog if there is any OUString sTitle(m_xSfxPage->GetPageTitle()); if (!sTitle.isEmpty()) diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index de5ef8bb0c15..de54818d05a0 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -79,11 +79,6 @@ void Help::DisableContextHelp() ImplGetSVHelpData().mbContextHelp = false; } -bool Help::IsContextHelpEnabled() -{ - return ImplGetSVHelpData().mbContextHelp; -} - void Help::EnableExtHelp() { ImplGetSVHelpData().mbExtHelp = true;