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 /sw/source/ui/dialog/swdlgfact.cxx | |
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 'sw/source/ui/dialog/swdlgfact.cxx')
-rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 371c7e0be8e0..ed9cc2b47001 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -105,27 +105,27 @@ IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl); short AbstractSplitTableDialog_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractSwBreakDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractSwTableWidthDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractSwTableHeightDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractSwMergeTableDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractGenericDialog_Impl::Execute() @@ -140,17 +140,17 @@ bool AbstractGenericDialog_Impl::StartExecuteAsync(AsyncContext &rCtx) short AbstractSwSortDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractMultiTOXMarkDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractTabController_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); @@ -164,12 +164,12 @@ IMPL_ABSTDLG_BASE(AbstractSwInsertDBColAutoPilot_Impl); short AbstractDropDownFieldDialog_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractSwLabDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractSwSelGlossaryDlg_Impl::Execute() @@ -179,7 +179,7 @@ short AbstractSwSelGlossaryDlg_Impl::Execute() short AbstractSwAutoFormatDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } IMPL_ABSTDLG_BASE(AbstractSwFieldDlg_Impl); @@ -194,12 +194,12 @@ IMPL_ABSTDLG_BASE(AbstractGlossaryDlg_Impl); short AbstractFieldInputDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractInsFootNoteDlg_Impl::Execute() { - return m_xDlg->execute(); + return m_xDlg->run(); } short AbstractInsTableDlg_Impl::Execute() |