diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-26 13:38:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-28 14:03:52 +0200 |
| commit | 1e6b6f038af656b475cb87844822287fd4e6c166 (patch) | |
| tree | ccb1cab384462825e233152520bd80c69cae1a7a /cui/source/dialogs/sdrcelldlg.cxx | |
| parent | 0b3ca6a1fa6bbbbd2eaaf97254fd1d45e2ac7b3a (diff) | |
weld SvxFormatCellsDialog
Change-Id: I236ddc4f58b882e648512a99306440fa88a3aeeb
Reviewed-on: https://gerrit.libreoffice.org/61017
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/dialogs/sdrcelldlg.cxx')
| -rw-r--r-- | cui/source/dialogs/sdrcelldlg.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index 47dd49cbc6a5..e20a3f488209 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -25,25 +25,24 @@ #include <border.hxx> #include <svx/dialogs.hrc> -SvxFormatCellsDialog::SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel ) - : SfxTabDialog(pParent, "FormatCellsDialog", "cui/ui/formatcellsdialog.ui", pAttr) +SvxFormatCellsDialog::SvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel) + : SfxTabDialogController(pParent, "cui/ui/formatcellsdialog.ui", "FormatCellsDialog", pAttr) , mrOutAttrs(*pAttr) , mpColorTab(rModel.GetColorList()) , mpGradientList(rModel.GetGradientList()) , mpHatchingList(rModel.GetHatchList()) , mpBitmapList(rModel.GetBitmapList()) , mpPatternList(rModel.GetPatternList()) - , m_nAreaPageId(0) { AddTabPage("name", RID_SVXPAGE_CHAR_NAME); AddTabPage("effects", RID_SVXPAGE_CHAR_EFFECTS); - m_nBorderPageId = AddTabPage("border", RID_SVXPAGE_BORDER ); - m_nAreaPageId = AddTabPage("area", RID_SVXPAGE_AREA); + AddTabPage("border", RID_SVXPAGE_BORDER ); + AddTabPage("area", RID_SVXPAGE_AREA); } -void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) +void SvxFormatCellsDialog::PageCreated(const OString& rId, SfxTabPage &rPage) { - if (nId == m_nAreaPageId) + if (rId == "area") { SvxAreaTabPage& rAreaPage = static_cast<SvxAreaTabPage&>(rPage); rAreaPage.SetColorList( mpColorTab ); @@ -53,13 +52,13 @@ void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) rAreaPage.SetPatternList( mpPatternList );; rAreaPage.ActivatePage( mrOutAttrs ); } - else if (nId == m_nBorderPageId) + else if (rId == "border") { SvxBorderTabPage& rBorderPage = static_cast<SvxBorderTabPage&>(rPage); rBorderPage.SetTableMode(); } else - SfxTabDialog::PageCreated( nId, rPage ); + SfxTabDialogController::PageCreated(rId, rPage); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |