diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2015-12-17 23:08:08 -0500 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2015-12-18 23:42:45 +0000 |
| commit | a103c3456a2bd12c5c94124abeda06978caea609 (patch) | |
| tree | 027f2e29a7c4589f565ae81f8caf8060a37db720 /include | |
| parent | dc89367a5622748dd7c37b89ac300a663b8b98e9 (diff) | |
Use std::unique_ptr for SdrLayerAdmin data member.
Change-Id: Ib49f52c94ae96b8bddec6718585d5d7d6e3d148d
Reviewed-on: https://gerrit.libreoffice.org/20806
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdpage.hxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index c8d537035e72..347beb3351da 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -28,7 +28,6 @@ #include <tools/contnr.hxx> #include <cppuhelper/weakref.hxx> #include <svx/svdtypes.hxx> -#include <svx/svdlayer.hxx> #include <svx/sdrpageuser.hxx> #include <svx/sdr/contact/viewobjectcontactredirector.hxx> #include <svx/sdrmasterpagedescriptor.hxx> @@ -417,9 +416,8 @@ friend class reportdesign::OSection; sal_Int32 nBordRgt; // Seitenrand rechts sal_Int32 nBordLwr; // Seitenrand unten -protected: - SdrLayerAdmin* pLayerAdmin; private: + std::unique_ptr<SdrLayerAdmin> mpLayerAdmin; SdrPageProperties* mpSdrPageProperties; css::uno::Reference< css::uno::XInterface > mxUnoPage; @@ -506,8 +504,8 @@ protected: public: /// changing the layers does not set the modified-flag! - const SdrLayerAdmin& GetLayerAdmin() const { return *pLayerAdmin; } - SdrLayerAdmin& GetLayerAdmin() { return *pLayerAdmin; } + const SdrLayerAdmin& GetLayerAdmin() const; + SdrLayerAdmin& GetLayerAdmin(); virtual OUString GetLayoutName() const; |