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 /starmath | |
| 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 'starmath')
| -rw-r--r-- | starmath/inc/dialog.hxx | 2 | ||||
| -rw-r--r-- | starmath/source/dialog.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 7c3f70c2d8e1..4bcd3d99b395 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -450,7 +450,7 @@ public: SmSymDefineDialog(weld::Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr); virtual ~SmSymDefineDialog() override; - short execute(); + virtual short run() override; void SelectOldSymbolSet(const OUString &rSymbolSetName) { diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 676ed1d74b6f..82bc4c911217 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1221,7 +1221,7 @@ IMPL_LINK_NOARG(SmSymbolDialog, EditClickHdl, weld::Button&, void) sal_uInt16 nSymPos = m_xSymbolSetDisplay->GetSelectSymbol(); // adapt dialog to data of the SymbolSet manager, which might have changed - if (aDialog.execute() == RET_OK && rSymbolMgr.IsModified()) + if (aDialog.run() == RET_OK && rSymbolMgr.IsModified()) { rSymbolMgr.Save(); FillSymbolSets(); @@ -1759,9 +1759,9 @@ SmSymDefineDialog::~SmSymDefineDialog() { } -short SmSymDefineDialog::execute() +short SmSymDefineDialog::run() { - short nResult = m_xDialog->run(); + short nResult = GenericDialogController::run(); // apply changes if dialog was closed by clicking OK if (m_aSymbolMgrCopy.IsModified() && nResult == RET_OK) |