diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-09-07 10:54:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-08 11:27:18 +0200 |
| commit | 1af5f6e8d1bdec9bd2f14d0f5f8fad9c0fdead2b (patch) | |
| tree | 84773114c08ca86424af4f8a17ec69d295908e01 /include/sfx2 | |
| parent | bb2258f7e4bcf078810cf1e40fdec2f17576c3b2 (diff) | |
set parent for file dialog helper
Change-Id: I3994ee48dcb5b2732cb27cb9ccb54926abf0828a
Reviewed-on: https://gerrit.libreoffice.org/42048
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 'include/sfx2')
| -rw-r--r-- | include/sfx2/docinsert.hxx | 3 | ||||
| -rw-r--r-- | include/sfx2/filedlghelper.hxx | 55 | ||||
| -rw-r--r-- | include/sfx2/opengrf.hxx | 4 |
3 files changed, 32 insertions, 30 deletions
diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx index a7b7302a795f..5ab0d9b73bd0 100644 --- a/include/sfx2/docinsert.hxx +++ b/include/sfx2/docinsert.hxx @@ -39,6 +39,7 @@ namespace sfx2 { class SFX2_DLLPUBLIC DocumentInserter { private: + VclPtr<vcl::Window> m_xParent; OUString m_sDocFactory; OUString m_sFilter; Link<sfx2::FileDialogHelper*,void> m_aDialogClosedLink; @@ -60,7 +61,7 @@ public: Compare, Merge }; - DocumentInserter(const OUString& rFactory, const Mode mode = Mode::Insert); + DocumentInserter(vcl::Window* pParent, const OUString& rFactory, const Mode mode = Mode::Insert); ~DocumentInserter(); void StartExecuteModal( const Link<sfx2::FileDialogHelper*,void>& _rDialogClosedLink ); diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index acdf03f0b4b3..6c6a4f090c3f 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -101,33 +101,34 @@ private: public: - FileDialogHelper( sal_Int16 nDialogType, - FileDialogFlags nFlags = FileDialogFlags::NONE, - const vcl::Window* _pPreferredParent = nullptr ); - - FileDialogHelper( sal_Int16 nDialogType, - FileDialogFlags nFlags, - const OUString& rFactory, - SfxFilterFlags nMust = SfxFilterFlags::NONE, - SfxFilterFlags nDont = SfxFilterFlags::NONE ); - - FileDialogHelper( sal_Int16 nDialogType, - FileDialogFlags nFlags, - const OUString& rFactory, - sal_Int16 nDialog, - SfxFilterFlags nMust, - SfxFilterFlags nDont, - const OUString& rStandardDir, - const css::uno::Sequence< OUString >& rBlackList, - const vcl::Window* _pPreferredParent = nullptr); - - FileDialogHelper( sal_Int16 nDialogType, - FileDialogFlags nFlags, - const OUString& aFilterUIName, - const OUString& aExtName, - const OUString& rStandardDir, - const css::uno::Sequence< OUString >& rBlackList, - const vcl::Window* _pPreferredParent = nullptr ); + FileDialogHelper(sal_Int16 nDialogType, + FileDialogFlags nFlags, + const vcl::Window* _pPreferredParent); + + FileDialogHelper(sal_Int16 nDialogType, + FileDialogFlags nFlags, + const OUString& rFactory, + SfxFilterFlags nMust, + SfxFilterFlags nDont, + const vcl::Window* _pPreferredParent); + + FileDialogHelper(sal_Int16 nDialogType, + FileDialogFlags nFlags, + const OUString& rFactory, + sal_Int16 nDialog, + SfxFilterFlags nMust, + SfxFilterFlags nDont, + const OUString& rStandardDir, + const css::uno::Sequence< OUString >& rBlackList, + const vcl::Window* _pPreferredParent); + + FileDialogHelper(sal_Int16 nDialogType, + FileDialogFlags nFlags, + const OUString& aFilterUIName, + const OUString& aExtName, + const OUString& rStandardDir, + const css::uno::Sequence< OUString >& rBlackList, + const vcl::Window* _pPreferredParent); virtual ~FileDialogHelper(); diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx index 542e573304cf..498ccdb7f9a8 100644 --- a/include/sfx2/opengrf.hxx +++ b/include/sfx2/opengrf.hxx @@ -28,8 +28,8 @@ struct SvxOpenGrf_Impl; class SFX2_DLLPUBLIC SvxOpenGraphicDialog { public: - SvxOpenGraphicDialog ( const OUString& rTitle ); - ~SvxOpenGraphicDialog (); + SvxOpenGraphicDialog(const OUString& rTitle, const vcl::Window* pPreferredParent); + ~SvxOpenGraphicDialog(); ErrCode Execute(); |