[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - include/sfx2 sfx2/source

[Szymon Kłos (via logerrit)]

 include/sfx2/notebookbar/SfxNotebookBar.hxx |    2 -
 sfx2/source/notebookbar/SfxNotebookBar.cxx  |   32 ----------------------------
 2 files changed, 34 deletions(-)

New commits:
commit f95b5d12c59e612ee4643b385389fc791e31f76d
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Jun 16 09:44:39 2023 +0200
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jun 16 20:24:06 2023 +0200

    tdf#155720 remove old skip notebookbar init workaround
    
    This was introduced due to not working Paste Special dialog
    in LOK case. Now everything seems to be ok. Single initialization
    should make loading process faster.
    
    Change-Id: Ic464908ef044cc446626fff0fb9b4f57e061aea3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153143
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

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 ec1f5bf33c0d..e8ea6c684794 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
@@ -375,18 +355,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;