diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-10-23 10:38:03 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-24 11:55:01 +0200 |
commit | f8e06f7b77a6286d2c41bbc76f06a768c76cd87a (patch) | |
tree | 0aa5836b7dcdba477f0dfca47b24a5f9aa8bd952 /sc/source/ui/attrdlg | |
parent | b85ff98383942360901b8242cf77366782400426 (diff) |
weld AdvancedSettingsDialog
make run virtual and fold executes into it, so GenericUnoDialog
can call run on tabdialogs to do the right thing, and allows
Start_Impl to be private again
Change-Id: Ic457edfbdc7457f4c49d4e8ad679903f38ad9b42
Reviewed-on: https://gerrit.libreoffice.org/62227
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/attrdlg')
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 677a5dd2f518..81896109b16b 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -137,7 +137,7 @@ short AbstractScInsertContentsDlg_Impl::Execute() short AbstractScInsertTableDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractScSelEntryDlg_Impl::Execute() @@ -169,7 +169,7 @@ IMPL_ABSTDLG_BASE(AbstractScDPDateGroupDlg_Impl); short AbstractScDPShowDetailDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } IMPL_ABSTDLG_BASE(AbstractScNewScenarioDlg_Impl); @@ -691,7 +691,7 @@ bool AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const short ScAbstractTabController_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } bool ScAbstractTabController_Impl::StartExecuteAsync(AsyncContext &rCtx) |