summaryrefslogtreecommitdiff
path: root/starmath/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-10-23 10:38:03 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-10-24 11:55:01 +0200
commitf8e06f7b77a6286d2c41bbc76f06a768c76cd87a (patch)
tree0aa5836b7dcdba477f0dfca47b24a5f9aa8bd952 /starmath/source
parentb85ff98383942360901b8242cf77366782400426 (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/source')
-rw-r--r--starmath/source/dialog.cxx6
1 files changed, 3 insertions, 3 deletions
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)