diff options
| -rw-r--r-- | include/sfx2/notebookbar/SfxNotebookBar.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/notebookbar/SfxNotebookBar.cxx | 32 |
2 files changed, 0 insertions, 34 deletions
diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx b/include/sfx2/notebookbar/SfxNotebookBar.hxx index 96f5805f50e0..55a318e40bdd 100644 --- a/include/sfx2/notebookbar/SfxNotebookBar.hxx +++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx @@ -77,8 +77,6 @@ private: static std::map<const SfxViewShell*, std::shared_ptr<WeldedTabbedNotebookbar>> m_pNotebookBarWeldedWrapper; - static void ResetActiveToolbarModeToDefault(vcl::EnumContext::Application eApp); - DECL_DLLPRIVATE_STATIC_LINK(SfxNotebookBar, VclDisposeHdl, const SfxViewShell*, void); }; diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index 3b33ef7dd781..7a9fef48cfca 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -290,26 +290,6 @@ bool SfxNotebookBar::IsActive(bool bConsiderSingleToolbar) return false; } -void SfxNotebookBar::ResetActiveToolbarModeToDefault(vcl::EnumContext::Application eApp) -{ - const OUString appName( lcl_getAppName( eApp ) ); - - if ( appName.isEmpty() ) - return; - - const OUString aPath = "org.openoffice.Office.UI.ToolbarMode/Applications/" + appName; - - utl::OConfigurationTreeRoot aAppNode( - ::comphelper::getProcessComponentContext(), - aPath, - true); - if ( !aAppNode.isValid() ) - return; - - aAppNode.setNodeValue( "Active", Any( OUString( "Default" ) ) ); - aAppNode.commit(); -} - void SfxNotebookBar::ExecMethod(SfxBindings& rBindings, const OUString& rUIName) { // Save active UI file name @@ -379,18 +359,6 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow, { const SfxViewShell* pViewShell = SfxViewShell::Current(); - // Notebookbar was loaded too early what caused: - // * in LOK: Paste Special feature was incorrectly initialized - // Skip first request so Notebookbar will be initialized after document was loaded - static std::map<const void*, bool> bSkippedFirstInit; - if (comphelper::LibreOfficeKit::isActive() && eApp == vcl::EnumContext::Application::Writer - && bSkippedFirstInit.find(pViewShell) == bSkippedFirstInit.end()) - { - bSkippedFirstInit[pViewShell] = true; - ResetActiveToolbarModeToDefault(eApp); - return false; - } - RemoveListeners(pSysWindow); OUString aBuf = rUIFile + sFile; |