diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-15 15:27:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-18 10:05:31 +0200 |
| commit | 0693d69d6080b6976133e0e68db2637d0030370d (patch) | |
| tree | baaca2a2f85a7b33d0e9bfc89fd805527542b513 /sc/source/ui/miscdlgs | |
| parent | 5889fd4416cd9569c44e2d250ce5d027974bd243 (diff) | |
weld ScCharDlg
Change-Id: Ie0fe76ef5c5c706007c2285b3a309d92ff4bc2b0
Reviewed-on: https://gerrit.libreoffice.org/60528
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/miscdlgs')
| -rw-r--r-- | sc/source/ui/miscdlgs/textdlgs.cxx | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index 504d480cec36..56d804a57c6e 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -31,23 +31,19 @@ #include <svl/intitem.hxx> #include <svx/flagsdef.hxx> -ScCharDlg::ScCharDlg( vcl::Window* pParent, const SfxItemSet* pAttr, - const SfxObjectShell* pDocShell ) - : SfxTabDialog(pParent, "CharDialog", - "modules/scalc/ui/chardialog.ui", pAttr) +ScCharDlg::ScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) + : SfxTabDialogController(pParent, "modules/scalc/ui/chardialog.ui", "CharDialog", pAttr) , rDocShell(*pDocShell) - , m_nNamePageId(0) - , m_nEffectsPageId(0) { - m_nNamePageId = AddTabPage("font", RID_SVXPAGE_CHAR_NAME); - m_nEffectsPageId = AddTabPage("fonteffects", RID_SVXPAGE_CHAR_EFFECTS); + AddTabPage("font", RID_SVXPAGE_CHAR_NAME); + AddTabPage("fonteffects", RID_SVXPAGE_CHAR_EFFECTS); AddTabPage("position", RID_SVXPAGE_CHAR_POSITION); } -void ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) +void ScCharDlg::PageCreated(const OString& rId, SfxTabPage &rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - if (nId == m_nNamePageId) + if (rId == "font") { SvxFontListItem aItem(*static_cast<const SvxFontListItem*>( ( rDocShell.GetItem( SID_ATTR_CHAR_FONTLIST) ) ) ); @@ -55,7 +51,7 @@ void ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) aSet.Put (SvxFontListItem( aItem.GetFontList(), SID_ATTR_CHAR_FONTLIST)); rPage.PageCreated(aSet); } - else if (nId == m_nEffectsPageId) + else if (rId == "fonteffects") { aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP)); rPage.PageCreated(aSet); |