diff options
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/docfile.hxx | 27 | ||||
| -rw-r--r-- | include/sfx2/docinsert.hxx | 2 |
2 files changed, 8 insertions, 21 deletions
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index ab2ea96aba28..2019b5738c01 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -69,35 +69,22 @@ class SFX2_DLLPUBLIC SfxMedium final : public SvRefBase public: SfxMedium(); - /** - * @param pSet Takes ownership - */ SfxMedium( const OUString &rName, StreamMode nOpenMode, std::shared_ptr<const SfxFilter> pFilter = nullptr, - std::unique_ptr<SfxItemSet> pSet = nullptr ); - /** - * @param pSet Takes ownership - */ + const std::shared_ptr<SfxItemSet>& pSet = nullptr ); SfxMedium( const OUString &rName, const OUString &rReferer, StreamMode nOpenMode, std::shared_ptr<const SfxFilter> pFilter = nullptr, - std::unique_ptr<SfxItemSet> pSet = nullptr ); - - /** - * @param pSet does NOT take ownership - */ + const std::shared_ptr<SfxItemSet>& pSet = nullptr ); SfxMedium( const css::uno::Reference< css::embed::XStorage >& xStorage, - const OUString& rBaseURL, - const SfxItemSet* pSet=nullptr ); - /** - * @param pSet does NOT take ownership - */ + const OUString& rBaseURL, + const std::shared_ptr<SfxItemSet>& pSet = nullptr ); SfxMedium( const css::uno::Reference< css::embed::XStorage >& xStorage, - const OUString& rBaseURL, - const OUString& rTypeName, - const SfxItemSet* pSet=nullptr ); + const OUString& rBaseURL, + const OUString& rTypeName, + const std::shared_ptr<SfxItemSet>& pSet = nullptr ); SfxMedium( const css::uno::Sequence< css::beans::PropertyValue >& aArgs ); virtual ~SfxMedium() override; diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx index 0148b854fed2..ae819299079c 100644 --- a/include/sfx2/docinsert.hxx +++ b/include/sfx2/docinsert.hxx @@ -50,7 +50,7 @@ private: std::unique_ptr<sfx2::FileDialogHelper> m_pFileDlg; - std::unique_ptr<SfxItemSet> m_xItemSet; + std::shared_ptr<SfxItemSet> m_xItemSet; std::vector<OUString> m_pURLList; DECL_LINK(DialogClosedHdl, sfx2::FileDialogHelper*, void); |