diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-06 17:17:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-08 09:31:02 +0200 |
| commit | 6a6774cc4b22aceaca4441318420bb9dfb1cacab (patch) | |
| tree | ab2dd62d7a69f1127fed8192268e16fbdaacd9fa /include/sfx2 | |
| parent | 1444bd72006fec7ebcd3c5df2399da26ad3b1466 (diff) | |
loplugin:useuniqueptr in SfxApplication::LoadTemplate and SfxMedium
pass SfxItemSet around by std::unique_ptr
Change-Id: I54da96d8df224f7c4f2fb9ebf06ed32d479298e7
Reviewed-on: https://gerrit.libreoffice.org/58649
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/app.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/docfile.hxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index a3299e9cde73..c5ed9b880bd0 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -151,7 +151,7 @@ public: /** * @param pArgs Takes ownership */ - ErrCode LoadTemplate( SfxObjectShellLock& xDoc, const OUString& rFileName, SfxItemSet* pArgs ); + ErrCode LoadTemplate( SfxObjectShellLock& xDoc, const OUString& rFileName, std::unique_ptr<SfxItemSet> pArgs ); vcl::Window* GetTopWindow() const; // members diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index d136aa85e6e0..0fa8fbbae69c 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -43,6 +43,7 @@ #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> #include <svl/lstner.hxx> +#include <svl/itemset.hxx> #include <tools/link.hxx> #include <tools/stream.hxx> #include <ucbhelper/content.hxx> @@ -55,7 +56,6 @@ class INetURLObject; class SfxObjectShell; class SfxFrame; class Timer; -class SfxItemSet; class DateTime; class SFX2_DLLPUBLIC SfxMedium : public SvRefBase @@ -78,7 +78,7 @@ public: SfxMedium( const OUString &rName, StreamMode nOpenMode, std::shared_ptr<const SfxFilter> pFilter = nullptr, - SfxItemSet *pSet = nullptr ); + std::unique_ptr<SfxItemSet> pSet = nullptr ); /** * @param pSet Takes ownership */ @@ -86,7 +86,7 @@ public: const OUString &rReferer, StreamMode nOpenMode, std::shared_ptr<const SfxFilter> pFilter = nullptr, - SfxItemSet *pSet = nullptr ); + std::unique_ptr<SfxItemSet> pSet = nullptr ); /** * @param pSet does NOT take ownership |