diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-11 14:55:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-16 22:17:05 +0100 |
| commit | 338e562639f947f9aa5fcd7340fe87a57b0f3601 (patch) | |
| tree | e35d311d2aeb44e264697bc2228a341408fa8f9d /sc/source/ui/attrdlg/scdlgfact.cxx | |
| parent | dd552855ea0185954c3c622f54147eb1e6baf0d7 (diff) | |
weld ScAutoFormatDlg
Change-Id: I700034eefe9fb25ee331645283bd3611c88faf5b
Reviewed-on: https://gerrit.libreoffice.org/69052
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/attrdlg/scdlgfact.cxx')
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 86d8966b0409..88a153120400 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -71,7 +71,11 @@ #include <conditio.hxx> IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl); -IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl); + +short AbstractScAutoFormatDlg_Impl::Execute() +{ + return m_xDlg->run(); +} short AbstractScColRowLabelDlg_Impl::Execute() { @@ -269,15 +273,15 @@ void AbstractScImportAsciiDlg_Impl::SaveParameters() sal_uInt16 AbstractScAutoFormatDlg_Impl::GetIndex() const { - return pDlg->GetIndex(); + return m_xDlg->GetIndex(); } OUString AbstractScAutoFormatDlg_Impl::GetCurrFormatName() { - return pDlg->GetCurrFormatName(); + return m_xDlg->GetCurrFormatName(); } -bool AbstractScColRowLabelDlg_Impl::IsCol() +bool AbstractScColRowLabelDlg_Impl::IsCol() { return m_xDlg->IsCol(); } @@ -763,13 +767,12 @@ VclPtr<AbstractScTextImportOptionsDlg> ScAbstractDialogFactory_Impl::CreateScTex return VclPtr<AbstractScTextImportOptionsDlg_Impl>::Create(std::make_unique<ScTextImportOptionsDlg>(pParent)); } -VclPtr<AbstractScAutoFormatDlg> ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg(vcl::Window* pParent, +VclPtr<AbstractScAutoFormatDlg> ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg(weld::Window* pParent, ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScViewData *pViewData) { - VclPtr<ScAutoFormatDlg> pDlg = VclPtr<ScAutoFormatDlg>::Create(pParent, pAutoFormat, pSelFormatData, pViewData); - return VclPtr<AbstractScAutoFormatDlg_Impl>::Create(pDlg); + return VclPtr<AbstractScAutoFormatDlg_Impl>::Create(std::make_unique<ScAutoFormatDlg>(pParent, pAutoFormat, pSelFormatData, pViewData)); } VclPtr<AbstractScColRowLabelDlg> ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg(weld::Window* pParent, |