diff options
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/docinsert.hxx | 5 | ||||
| -rw-r--r-- | include/sfx2/filedlghelper.hxx | 21 | ||||
| -rw-r--r-- | include/sfx2/linksrc.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/lnkbase.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/opengrf.hxx | 4 |
5 files changed, 13 insertions, 23 deletions
diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx index 5ab0d9b73bd0..bacf00ec47de 100644 --- a/include/sfx2/docinsert.hxx +++ b/include/sfx2/docinsert.hxx @@ -28,6 +28,7 @@ #include <vector> namespace sfx2 { class FileDialogHelper; } +namespace weld { class Window; } class SfxMedium; class SfxItemSet; enum class FileDialogFlags; @@ -39,7 +40,7 @@ namespace sfx2 { class SFX2_DLLPUBLIC DocumentInserter { private: - VclPtr<vcl::Window> m_xParent; + weld::Window* m_pParent; OUString m_sDocFactory; OUString m_sFilter; Link<sfx2::FileDialogHelper*,void> m_aDialogClosedLink; @@ -61,7 +62,7 @@ public: Compare, Merge }; - DocumentInserter(vcl::Window* pParent, const OUString& rFactory, const Mode mode = Mode::Insert); + DocumentInserter(weld::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 8a5b0015a705..02cc6f15c9a9 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -103,25 +103,14 @@ private: public: FileDialogHelper(sal_Int16 nDialogType, FileDialogFlags nFlags, - const vcl::Window* _pPreferredParent); - - FileDialogHelper(sal_Int16 nDialogType, - FileDialogFlags nFlags, - weld::Window* _pPreferredParent); - - FileDialogHelper(sal_Int16 nDialogType, - FileDialogFlags nFlags, - const OUString& rFactory, - SfxFilterFlags nMust, - SfxFilterFlags nDont, - const vcl::Window* _pPreferredParent); + weld::Window* pPreferredParent); FileDialogHelper(sal_Int16 nDialogType, FileDialogFlags nFlags, const OUString& rFactory, SfxFilterFlags nMust, SfxFilterFlags nDont, - weld::Window* _pPreferredParent); + weld::Window* pPreferredParent); FileDialogHelper(sal_Int16 nDialogType, FileDialogFlags nFlags, @@ -131,7 +120,7 @@ public: SfxFilterFlags nDont, const OUString& rStandardDir, const css::uno::Sequence< OUString >& rBlackList, - const vcl::Window* _pPreferredParent); + weld::Window* pPreferredParent); FileDialogHelper(sal_Int16 nDialogType, FileDialogFlags nFlags, @@ -139,7 +128,7 @@ public: const OUString& aExtName, const OUString& rStandardDir, const css::uno::Sequence< OUString >& rBlackList, - const vcl::Window* _pPreferredParent); + weld::Window* pPreferredParent); virtual ~FileDialogHelper(); @@ -254,7 +243,7 @@ public: #define SFX2_IMPL_DIALOG_OOO 2 #define SFX2_IMPL_DIALOG_REMOTE 3 -ErrCode FileOpenDialog_Impl( const vcl::Window* pParent, +ErrCode FileOpenDialog_Impl( weld::Window* pParent, sal_Int16 nDialogType, FileDialogFlags nFlags, std::vector<OUString>& rpURLList, diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx index 8eff0afd0376..3471dde4d10a 100644 --- a/include/sfx2/linksrc.hxx +++ b/include/sfx2/linksrc.hxx @@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; }}}} -namespace vcl { class Window; } +namespace weld { class Window; } namespace rtl { class OUString; } @@ -83,7 +83,7 @@ public: // sal_True => data complete loaded virtual bool IsDataComplete() const; - virtual void Edit( vcl::Window *, SvBaseLink *, const Link<const OUString&, void>& rEndEditHdl ); + virtual void Edit(weld::Window *, SvBaseLink *, const Link<const OUString&, void>& rEndEditHdl); void AddDataAdvise( SvBaseLink *, const rtl::OUString & rMimeType, diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index 6809a1d5ded6..09f14b3a1723 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -144,7 +144,7 @@ public: bool Update(); void Disconnect(); - virtual void Edit( vcl::Window*, const Link<SvBaseLink&,void>& rEndEditHdl ); + virtual void Edit(weld::Window*, const Link<SvBaseLink&,void>& rEndEditHdl); // should the link appear in the dialog? (to the left in the link in the...) bool IsVisible() const { return bVisible; } diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx index 775750c0895b..0178cc0bb745 100644 --- a/include/sfx2/opengrf.hxx +++ b/include/sfx2/opengrf.hxx @@ -31,8 +31,8 @@ struct SvxOpenGrf_Impl; class SFX2_DLLPUBLIC SvxOpenGraphicDialog { public: - SvxOpenGraphicDialog(const OUString& rTitle, const vcl::Window* pPreferredParent); - SvxOpenGraphicDialog(const OUString& rTitle, const vcl::Window* pPreferredParent, + SvxOpenGraphicDialog(const OUString& rTitle, weld::Window* pPreferredParent); + SvxOpenGraphicDialog(const OUString& rTitle, weld::Window* pPreferredParent, sal_Int16 nDialogType); ~SvxOpenGraphicDialog(); |