commit 3c8c4d4976e977ab110b0b59941cce7b36603e55
author Caolán McNamara <caolanm@redhat.com> Mon Mar 22 16:58:59 2021 +0000
committer Adolfo Jayme Barrientos <fitojb@ubuntu.com> Wed Mar 24 12:53:55 2021 +0100
tree 2609ae5a72803f6d14e0b2a9b0d2b2c6ad725cf7
parent b850105570d0e99644ff1ad5d6d0f09734db7952

tdf#133159 store current config before changing sheet

Change-Id: I0c50c2fd145e80996d8aeddeabdb3ae5c4d83bbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112805
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

sc/source/ui/inc/content.hxx

diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx
index 53f234f..1c0d2c2 100644
--- a/sc/source/ui/inc/content.hxx
+++ b/sc/source/ui/inc/content.hxx
@@ -165,7 +165,7 @@ public:
    /** Applies the navigator settings to the listbox. */
    void ApplyNavigatorSettings(bool bRestoreScrollPos = false, int nScrollPos = 0);
    /** Stores the current listbox state in the navigator settings. */
    void StoreNavigatorSettings() const;
    void StoreNavigatorSettings();
};

#endif // INCLUDED_SC_SOURCE_UI_INC_CONTENT_HXX

sc/source/ui/navipi/content.cxx

diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 423bef3..9383f34 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -333,7 +333,13 @@ IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl, weld::TreeView&, bool)
        switch( nType )
        {
            case ScContentId::TABLE:
            {
                // tdf#133159 store current config before changing sheet
                // plausible that this should be done for all cases, but this
                // is the known case that needs it
                StoreNavigatorSettings();
                pParentWindow->SetCurrentTableStr( aText );
            }
            break;

            case ScContentId::RANGENAME:
@@ -1628,8 +1634,14 @@ void ScContentTree::ApplyNavigatorSettings(bool bRestorePos, int nScrollPos)
    }
}

void ScContentTree::StoreNavigatorSettings() const
void ScContentTree::StoreNavigatorSettings()
{
    if (m_nAsyncMouseReleaseId)
    {
        Application::RemoveUserEvent(m_nAsyncMouseReleaseId);
        m_nAsyncMouseReleaseId = nullptr;
    }

    ScNavigatorSettings* pSettings = ScNavigatorDlg::GetNavigatorSettings();
    if( !pSettings )
        return;