diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-31 12:38:56 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-01 11:00:12 +0100 |
| commit | c86728655415ea507cb5f8d7f0588014db2d6098 (patch) | |
| tree | 61765a8d10547cbbd183b6317c8f0601839cd785 /include | |
| parent | 52bbb04f1e39b2d778275c91f77b6c0714ecd0d0 (diff) | |
replace VclAbstractDialog2 with VclAbstractDialog
and drop Dialog::GetResult as a consequence
Change-Id: Id80a9dc1eab1a23daf4489719b3bafec976bb048
Reviewed-on: https://gerrit.libreoffice.org/62700
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/svx/svxdlg.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/abstdlg.hxx | 9 | ||||
| -rw-r--r-- | include/vcl/dialog.hxx | 3 |
3 files changed, 1 insertions, 13 deletions
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 5e34bf61d165..97030fefefa1 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -359,7 +359,7 @@ public: const OUString& rOldText) = 0; virtual VclPtr<AbstractGalleryIdDialog> CreateGalleryIdDialog(weld::Window* pParent, GalleryTheme* pThm) = 0; - virtual VclPtr<VclAbstractDialog2> CreateGalleryThemePropertiesDialog(vcl::Window* pParent, + virtual VclPtr<VclAbstractDialog> CreateGalleryThemePropertiesDialog(vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet ) = 0; virtual VclPtr<AbstractURLDlg> CreateURLDialog( vcl::Window* pParent, diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx index f05fe4c7de2b..53e553af4011 100644 --- a/include/vcl/abstdlg.hxx +++ b/include/vcl/abstdlg.hxx @@ -79,15 +79,6 @@ public: virtual OString GetScreenshotId() const { return OString(); }; }; -class VCL_DLLPUBLIC VclAbstractDialog2 : public virtual VclReferenceBase -{ -protected: - virtual ~VclAbstractDialog2() override; -public: - virtual void StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) = 0; - virtual sal_Int32 GetResult() = 0; -}; - class VCL_DLLPUBLIC VclAbstractTerminatedDialog : public VclAbstractDialog { protected: diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 8d4c2c6e0ee2..c5a3997566ff 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -138,9 +138,6 @@ public: virtual FactoryFunction GetUITestFactory() const override; - // Dialog::Execute replacement API -public: - long GetResult() const; private: bool ImplStartExecuteModal(); static void ImplEndExecuteModal(); |