diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/docinsert.hxx | 3 | ||||
| -rw-r--r-- | include/sfx2/filedlghelper.hxx | 55 | ||||
| -rw-r--r-- | include/sfx2/opengrf.hxx | 4 | ||||
| -rw-r--r-- | include/svx/graphichelper.hxx | 4 |
4 files changed, 34 insertions, 32 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(); diff --git a/include/svx/graphichelper.hxx b/include/svx/graphichelper.hxx index 9056d92dedde..72f13e70f56c 100644 --- a/include/svx/graphichelper.hxx +++ b/include/svx/graphichelper.hxx @@ -30,8 +30,8 @@ class SVX_DLLPUBLIC GraphicHelper public: static void GetPreferredExtension( OUString& rExtension, const Graphic& rGraphic ); - static OUString ExportGraphic( const Graphic& rGraphic, const OUString& rGraphicName ); - static void SaveShapeAsGraphic( const css::uno::Reference< css::drawing::XShape >& xShape ); + static OUString ExportGraphic(const vcl::Window* pWin, const Graphic& rGraphic, const OUString& rGraphicName); + static void SaveShapeAsGraphic(const vcl::Window* pWin, const css::uno::Reference< css::drawing::XShape >& xShape); static short HasToSaveTransformedImage(vcl::Window* pWin); }; |