commit 97497ae3b402c83344c84ec70a34efbf57c7b62b
author Szymon Kłos <szymon.klos@collabora.com> Fri Jun 16 09:44:39 2023 +0200
committer Caolán McNamara <caolan.mcnamara@collabora.com> Fri Jun 16 20:19:33 2023 +0200
tree 02a74baedb33138d5f44a858872a53783ce9759e
parent df98b6015cd2ae4f1573e12cee1b1bc947adabf0

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/+/153169
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>

include/sfx2/notebookbar/SfxNotebookBar.hxx

diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx b/include/sfx2/notebookbar/SfxNotebookBar.hxx
index 96f5805..55a318e 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);
};

sfx2/source/notebookbar/SfxNotebookBar.cxx

diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 3b33ef7..7a9fef4 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;