summaryrefslogtreecommitdiff
path: root/svx/source/form/datanavi.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-04-25 13:04:43 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-04-26 10:59:26 +0200
commit8d09602d3382596facd716d8261a83d6883aa734 (patch)
treea1f94264843c7ae414c7c33cfac21278058fb103 /svx/source/form/datanavi.cxx
parent9739749ba8da87001b73027136f120ef532f0b2b (diff)
identify tab pages by name for save/storing active tab
Change-Id: Id66f8ff62ed08724702572f457b9fc857d567e89 Reviewed-on: https://gerrit.libreoffice.org/53465 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/source/form/datanavi.cxx')
-rw-r--r--svx/source/form/datanavi.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index cdaabee98f10..3a7f2a2e7b40 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1377,11 +1377,11 @@ namespace svxform
// init tabcontrol
m_pTabCtrl->Show();
- sal_Int32 nPageId = m_pTabCtrl->GetPageId("instance");
+ OString sPageId("instance");
SvtViewOptions aViewOpt( EViewType::TabDialog, CFGNAME_DATANAVIGATOR );
if ( aViewOpt.Exists() )
{
- nPageId = aViewOpt.GetPageID();
+ sPageId = aViewOpt.GetPageID();
aViewOpt.GetUserItem(CFGNAME_SHOWDETAILS) >>= m_bShowDetails;
}
@@ -1390,7 +1390,7 @@ namespace svxform
pMenu->SetItemBits(nInstancesDetailsId, MenuItemBits::CHECKABLE );
pMenu->CheckItem(nInstancesDetailsId, m_bShowDetails );
- m_pTabCtrl->SetCurPageId( static_cast< sal_uInt16 >( nPageId ) );
+ m_pTabCtrl->SetCurPageId(m_pTabCtrl->GetPageId(sPageId));
ActivatePageHdl(m_pTabCtrl);
// get our frame
@@ -1416,7 +1416,7 @@ namespace svxform
void DataNavigatorWindow::dispose()
{
SvtViewOptions aViewOpt( EViewType::TabDialog, CFGNAME_DATANAVIGATOR );
- aViewOpt.SetPageID( static_cast< sal_Int32 >( m_pTabCtrl->GetCurPageId() ) );
+ aViewOpt.SetPageID(m_pTabCtrl->GetPageName(m_pTabCtrl->GetCurPageId()));
aViewOpt.SetUserItem(CFGNAME_SHOWDETAILS, Any(m_bShowDetails));
m_pInstPage.disposeAndClear();