diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-02 16:28:51 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-02 21:50:03 +0100 |
| commit | 810cfc0106ae0b1874681f7a8c79c36186aefcca (patch) | |
| tree | e3f395bf8ef7d1eacfcd19676e35701f3e579f4d /sw/source/ui/dialog | |
| parent | 38b87bbb24c1d1cc088d3d135e7e95b3ec75d386 (diff) | |
weld convert text-to-table/table-to-text dialog
Change-Id: I81137c0fe0b0e243ebc5b836ac09448d746b2214
Reviewed-on: https://gerrit.libreoffice.org/50644
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/dialog')
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 10 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 9 |
2 files changed, 14 insertions, 5 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index ecb89281d7fd..a2999ec607dd 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -98,7 +98,10 @@ short AbstractSwBreakDlg_Impl::Execute() return m_xDlg->run(); } IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); -IMPL_ABSTDLG_BASE(AbstractSwConvertTableDlg_Impl); +short AbstractSwConvertTableDlg_Impl::Execute() +{ + return m_xDlg->run(); +} IMPL_ABSTDLG_BASE(AbstractSwInsertDBColAutoPilot_Impl); IMPL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSwLabDlg_Impl); @@ -215,7 +218,7 @@ sal_uInt16 AbstractSwBreakDlg_Impl:: GetKind() void AbstractSwConvertTableDlg_Impl::GetValues( sal_Unicode& rDelim,SwInsertTableOptions& rInsTableFlags, SwTableAutoFormat const*& prTAFormat) { - pDlg->GetValues(rDelim,rInsTableFlags, prTAFormat); + m_xDlg->GetValues(rDelim,rInsTableFlags, prTAFormat); } void AbstractSwInsertDBColAutoPilot_Impl::DataToDoc( const uno::Sequence< uno::Any >& rSelection, @@ -702,8 +705,7 @@ VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateSwCharDlg(vcl: VclPtr<AbstractSwConvertTableDlg> SwAbstractDialogFactory_Impl::CreateSwConvertTableDlg(SwView& rView, bool bToTable) { - VclPtr<SwConvertTableDlg> pDlg = VclPtr<SwConvertTableDlg>::Create(rView, bToTable); - return VclPtr<AbstractSwConvertTableDlg_Impl>::Create(pDlg); + return VclPtr<AbstractSwConvertTableDlg_Impl>::Create(new SwConvertTableDlg(rView, bToTable)); } VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV) diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index becab7e73700..6c0418ecdf6d 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -149,7 +149,14 @@ private: class AbstractSwConvertTableDlg_Impl : public AbstractSwConvertTableDlg { - DECL_ABSTDLG_BASE( AbstractSwConvertTableDlg_Impl,SwConvertTableDlg) +protected: + std::unique_ptr<SwConvertTableDlg> m_xDlg; +public: + explicit AbstractSwConvertTableDlg_Impl(SwConvertTableDlg* p) + : m_xDlg(p) + { + } + virtual short Execute() override; virtual void GetValues( sal_Unicode& rDelim,SwInsertTableOptions& rInsTableFlags, SwTableAutoFormat const*& prTAFormat) override; }; |