diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-18 13:20:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-21 21:40:03 +0200 |
| commit | 52eb2804bb4403e74483ee49bfcb4539065d7143 (patch) | |
| tree | 772c2adba0f2049e3a7b981e7a918148749ccb22 /sfx2 | |
| parent | 2632adfbc2a664ab99de7e24d6fcd6841a10b6f1 (diff) | |
weld ScSortDlg, ScTabPageSortOptions and ScTabPageSortFields
Change-Id: I103e5e3670f8c95c1f480ce0c36e08c3de74e900
Reviewed-on: https://gerrit.libreoffice.org/54541
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/dialog/tabdlg.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index ae8023773e14..31be0ca30543 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -1999,17 +1999,22 @@ void SfxTabDialogController::Start_Impl() assert(m_pImpl->aData.size() == static_cast<size_t>(m_xTabCtrl->get_n_pages()) && "not all pages registered"); - // load old settings, when exists - SvtViewOptions aDlgOpt(EViewType::TabDialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); - if (aDlgOpt.Exists()) - m_xTabCtrl->set_current_page(aDlgOpt.GetPageID()); + // load old settings, when exists, setting SetCurPageId will override the settings, + // something that the sort dialog in calc depends on + if (m_sAppPageId.isEmpty()) + { + SvtViewOptions aDlgOpt(EViewType::TabDialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); + if (aDlgOpt.Exists()) + m_xTabCtrl->set_current_page(aDlgOpt.GetPageID()); + } ActivatePageHdl(m_xTabCtrl->get_current_page_ident()); } void SfxTabDialogController::SetCurPageId(const OString& rIdent) { - m_xTabCtrl->set_current_page(rIdent); + m_sAppPageId = rIdent; + m_xTabCtrl->set_current_page(m_sAppPageId); } OString SfxTabDialogController::GetCurPageId() const |