summaryrefslogtreecommitdiff
path: root/cui/source/factory/dlgfact.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-09-10 10:16:51 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-09-10 15:20:46 +0200
commit8d831cc01daaed6937fc126dc5671ae58e8c027e (patch)
tree81b8660cd1cf62a4b0161d9a6ce38ba5a9399c33 /cui/source/factory/dlgfact.hxx
parentf21e8a94b0c6ca7fdea157f858b079aca30e274e (diff)
weld SvxCaptionTabDialog
Change-Id: If678c5f4834144f1c710465701dc4d13714a6b44 Reviewed-on: https://gerrit.libreoffice.org/60247 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/factory/dlgfact.hxx')
-rw-r--r--cui/source/factory/dlgfact.hxx14
1 files changed, 11 insertions, 3 deletions
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index c7595fdf0566..c3340103e61c 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -323,7 +323,15 @@ public:
class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
{
- DECL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl,SvxCaptionTabDialog)
+protected:
+ std::shared_ptr<SvxCaptionTabDialog> m_xDlg;
+public:
+ explicit AbstractSvxCaptionDialog_Impl(std::unique_ptr<SvxCaptionTabDialog> p)
+ : m_xDlg(std::move(p))
+ {
+ }
+ virtual short Execute() override;
+ virtual bool StartExecuteAsync(AsyncContext &rCtx) override;
virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) override;
virtual void SetCurPageId( const OString& rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
@@ -647,9 +655,9 @@ public:
virtual VclPtr<SfxAbstractTabDialog> CreateTabItemDialog(vcl::Window* pParent,
const SfxItemSet& rSet) override;
virtual VclPtr<AbstractSvxCaptionDialog>
- CreateCaptionDialog( vcl::Window* pParent,
+ CreateCaptionDialog(weld::Window* pParent,
const SdrView* pView,
- SvxAnchorIds nAnchorTypes = SvxAnchorIds::NONE ) override;
+ SvxAnchorIds nAnchorTypes = SvxAnchorIds::NONE) override;
virtual VclPtr<AbstractSvxDistributeDialog>
CreateSvxDistributeDialog(const SfxItemSet& rAttr) override;
virtual VclPtr<SfxAbstractInsertObjectDialog>