diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-25 13:04:43 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-26 10:59:26 +0200 |
| commit | 8d09602d3382596facd716d8261a83d6883aa734 (patch) | |
| tree | a1f94264843c7ae414c7c33cfac21278058fb103 /sfx2 | |
| parent | 9739749ba8da87001b73027136f120ef532f0b2b (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 'sfx2')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 8a561d3b471f..a8234eaa99bf 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1427,11 +1427,11 @@ SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl(SfxHelpWindow_Impl* _pParent) m_pTabCtrl->SetActivatePageHdl( LINK( this, SfxHelpIndexWindow_Impl, ActivatePageHdl ) ); - sal_Int32 nPageId = m_pTabCtrl->GetPageId("index"); + OString sPageId("index"); SvtViewOptions aViewOpt( EViewType::TabDialog, CONFIGNAME_INDEXWIN ); if ( aViewOpt.Exists() ) - nPageId = aViewOpt.GetPageID(); - m_pTabCtrl->SetCurPageId( static_cast<sal_uInt16>(nPageId) ); + sPageId = aViewOpt.GetPageID(); + m_pTabCtrl->SetCurPageId(m_pTabCtrl->GetPageId(sPageId)); ActivatePageHdl( m_pTabCtrl ); m_pActiveLB->SetSelectHdl( LINK( this, SfxHelpIndexWindow_Impl, SelectHdl ) ); @@ -1460,7 +1460,7 @@ void SfxHelpIndexWindow_Impl::dispose() delete static_cast<OUString*>(m_pActiveLB->GetEntryData(i)); SvtViewOptions aViewOpt( EViewType::TabDialog, CONFIGNAME_INDEXWIN ); - aViewOpt.SetPageID( static_cast<sal_Int32>(m_pTabCtrl->GetCurPageId()) ); + aViewOpt.SetPageID(m_pTabCtrl->GetPageName(m_pTabCtrl->GetCurPageId())); disposeBuilder(); m_pActiveLB.clear(); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index f31e12784316..afc827db416d 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -591,7 +591,7 @@ void SfxTabDialog::Start_Impl() SetWindowState(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); // initial TabPage from Program/Help/config - nActPage = static_cast<sal_uInt16>(aDlgOpt.GetPageID()); + nActPage = m_pTabCtrl->GetPageId(aDlgOpt.GetPageID()); if ( USHRT_MAX != m_nAppPageId ) nActPage = m_nAppPageId; @@ -775,7 +775,7 @@ void SfxTabDialog::SavePosAndId() SvtViewOptions aDlgOpt(EViewType::TabDialog, OStringToOUString(GetHelpId(),RTL_TEXTENCODING_UTF8)); aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WindowStateMask::Pos),RTL_TEXTENCODING_ASCII_US)); // to-do replace with name of page when all pages are converted to .ui - aDlgOpt.SetPageID( m_pTabCtrl->GetCurPageId() ); + aDlgOpt.SetPageID(m_pTabCtrl->GetPageName(m_pTabCtrl->GetCurPageId())); } |