diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-05-29 10:02:58 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-29 14:56:04 +0200 |
commit | aa687b22991e6c674b1d8653d52fbe9a50080174 (patch) | |
tree | 9e048b07ba05362a99ea79cc79065afc4f45c734 /include | |
parent | b7b78dfc0719c3aa0e250b2992d3b04e135a26be (diff) |
weld SfxDocumentInfoDialog
Change-Id: I79d5d8973a19c0e639081ec61ac596620518d0b5
Reviewed-on: https://gerrit.libreoffice.org/73145
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/sfx2/dinfdlg.hxx | 8 | ||||
-rw-r--r-- | include/sfx2/objsh.hxx | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index e8408e794e09..744be743c7d5 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -242,15 +242,13 @@ public: // class SfxDocumentInfoDialog ------------------------------------------- -class SFX2_DLLPUBLIC SfxDocumentInfoDialog : public SfxTabDialog +class SFX2_DLLPUBLIC SfxDocumentInfoDialog : public SfxTabDialogController { -private: - sal_uInt16 m_nDocInfoId; protected: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) override; + virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; public: - SfxDocumentInfoDialog( vcl::Window* pParent, const SfxItemSet& ); + SfxDocumentInfoDialog(weld::Window* pParent, const SfxItemSet&); void AddFontTabPage(); }; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index d16eb2e1c95b..eaa93afd72da 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -358,7 +358,7 @@ public: void SignScriptingContent(weld::Window* pDialogParent); DECL_LINK(SignDocumentHandler, Button*, void); - virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( const SfxItemSet& ); + virtual std::unique_ptr<SfxDocumentInfoDialog> CreateDocumentInfoDialog(weld::Window* pParent, const SfxItemSet& rItemSet); ErrCode CallBasic( const OUString& rMacro, const OUString& rBasicName, SbxArray* pArgs, SbxValue* pRet = nullptr ); |