tdf#133159 store current config before changing sheet

Change-Id: I0c50c2fd145e80996d8aeddeabdb3ae5c4d83bbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112924
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2021-03-23 09:45:40 +01:00
parent ad37c9a2a8
commit 6472f84447
2 changed files with 14 additions and 2 deletions
+1 -1
View File
@@ -155,7 +155,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
+13 -1
View File
@@ -336,7 +336,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:
@@ -1631,8 +1637,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;