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 /cui/source/tabpages | |
| 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 'cui/source/tabpages')
| -rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/chardlg.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/numpages.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index b754fd31c378..2a08fa616064 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -729,7 +729,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl, Button*, void) ImpUserData* pUserData = static_cast<ImpUserData*>(m_pCheckLB->FirstSelected()->GetUserData()); aMapDlg.SetCharFont(*pUserData->pFont); aMapDlg.SetChar( (*pUserData->pString)[0] ); - if (RET_OK == aMapDlg.execute()) + if (RET_OK == aMapDlg.run()) { const vcl::Font& aFont(aMapDlg.GetCharFont()); *pUserData->pFont = aFont; @@ -2077,7 +2077,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void ) } aMap.SetChar( cDlg ); aMap.DisableFontSelection(); - if (aMap.execute() == RET_OK) + if (aMap.run() == RET_OK) { sal_UCS4 cNewChar = aMap.GetChar(); switch( nMode ) diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index cb4562e22b3b..acb3bfb8e9c3 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1167,7 +1167,7 @@ IMPL_LINK(SvxCharNamePage, FontFeatureButtonClicked, weld::Button&, rButton, voi if (!sFontName.isEmpty() && pNameBox) { cui::FontFeaturesDialog aDialog(GetDialogFrameWeld(), sFontName); - if (aDialog.execute() == RET_OK) + if (aDialog.run() == RET_OK) { pNameBox->set_active_text(aDialog.getResultFontName()); UpdatePreview_Impl(); @@ -3093,7 +3093,7 @@ void SvxCharTwoLinesPage::SelectCharacter(weld::TreeView* pBox) SvxCharacterMap aDlg(GetFrameWeld(), nullptr, false); aDlg.DisableFontSelection(); - if (aDlg.execute() == RET_OK) + if (aDlg.run() == RET_OK) { sal_Unicode cChar = static_cast<sal_Unicode>(aDlg.GetChar()); SetBracket( cChar, bStart ); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 59e5862a98e5..fc586579bbaf 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1983,7 +1983,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl, weld::Button&, void) aMap.SetCharFont(aActBulletFont); if (bSameBullet) aMap.SetChar(cBullet); - if (aMap.execute() == RET_OK) + if (aMap.run() == RET_OK) { // change Font Numrules aActBulletFont = aMap.GetCharFont(); |