commit 99860a1fbf7017cc5efdebdf5901ef57e7c021f0
author Caolán McNamara <caolanm@redhat.com> Fri Dec 09 21:26:00 2022 +0000
committer Caolán McNamara <caolanm@redhat.com> Sat Dec 10 10:06:26 2022 +0000
tree 1481d8542b5fa324a13deea36c74b222d4624416
parent c86f1315ea3203e8557843d02c222969524a9ca7

Related: tdf#152266 open 'event' page by default for SID_CONFIGEVENT

Change-Id: I7a3f6def8bda00588ef2846e5d3b5ed5d1da04de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143899
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

cui/source/customize/cfg.cxx

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 0531a9ff..2099a1b 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -222,13 +222,17 @@ SvxConfigDialog::SvxConfigDialog(weld::Window * pParent, const SfxItemSet* pInSe
        OUString text = static_cast<const SfxStringItem*>(pItem)->GetValue();
        if (text.startsWith( ITEM_TOOLBAR_URL ) )
            SetCurPageId("toolbars");
        else if (text.startsWith( ITEM_EVENT_URL) )
            SetCurPageId("events");
    }
#if HAVE_FEATURE_SCRIPTING
    // for the "assign" button in the Basic Macros chooser automatically switch
    // to the keyboard tab in which this macro will be pre-selected for assigning
    // to a keystroke
    if (pInSet->GetItemIfSet(SID_MACROINFO))
    else if (pInSet->GetItemIfSet(SID_MACROINFO))
    {
        // for the "assign" button in the Basic Macros chooser automatically switch
        // to the keyboard tab in which this macro will be pre-selected for assigning
        // to a keystroke
        SetCurPageId("keyboard");
    }
#endif
}

cui/source/inc/cfg.hxx

diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 10ce7d8..0ee8e1b 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -53,6 +53,7 @@ inline constexpr OUStringLiteral ITEM_DESCRIPTOR_UINAME = u"UIName";

inline constexpr OUStringLiteral ITEM_MENUBAR_URL = u"private:resource/menubar/menubar";
inline constexpr OUStringLiteral ITEM_TOOLBAR_URL = u"private:resource/toolbar/";
inline constexpr OUStringLiteral ITEM_EVENT_URL = u"private:resource/event/";

inline constexpr OUStringLiteral CUSTOM_TOOLBAR_STR = u"custom_toolbar_";

sfx2/source/appl/appserv.cxx

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 17e6772..d20d8c5 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -403,14 +403,25 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )

            SfxItemSetFixed<SID_CONFIG, SID_CONFIG, SID_MACROINFO, SID_MACROINFO> aSet( GetPool() );

            // SID_CONFIG property will determine the default page shown
            if ( pStringItem )
            {
                aSet.Put( SfxStringItem(
                    SID_CONFIG, pStringItem->GetValue() ) );
            }
            else if (rReq.GetSlot() == SID_CONFIGEVENT)
            {
                aSet.Put( SfxStringItem(
                    SID_CONFIG, "private:resource/event/" ) );
            }
            else if (rReq.GetSlot() == SID_TOOLBOXOPTIONS)
            {
                aSet.Put( SfxStringItem(
                    SID_CONFIG, "private:resource/toolbar/" ) );
            }

#if HAVE_FEATURE_SCRIPTING
            // Preselect a macro:
            // Preselect a macro in the 'keyboard' page
            if (auto const item = rReq.GetArg<SfxMacroInfoItem>(SID_MACROINFO)) {
                aSet.Put(*item);
            }