diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2015-12-18 19:42:09 -0500 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2015-12-19 02:26:36 +0000 |
| commit | 6b57529888f384307b88cf5ead5e3e477c6c03b1 (patch) | |
| tree | b4dd4c50339797a9128e37315daabc6825fd2a22 /include | |
| parent | c1aca008603d18dcd84a751df70fb8eefd9f0111 (diff) | |
Use std::unique_ptr for mpViewContact member instance of SdrPage.
And fix some const-incorrect-ness while at it.
Change-Id: I0314c8e5b73f1a7edce040b2a57fbc5d1081d70c
Reviewed-on: https://gerrit.libreoffice.org/20815
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/sdr/contact/objectcontactofobjlistpainter.hxx | 7 | ||||
| -rw-r--r-- | include/svx/svdpage.hxx | 30 |
2 files changed, 17 insertions, 20 deletions
diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx index d9ee440f0272..8a2d4da131ae 100644 --- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC ObjectContactPainter : public ObjectContact protected: // Hierarchy access methods virtual sal_uInt32 GetPaintObjectCount() const = 0; - virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const = 0; + virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) = 0; public: // basic constructor/destructor @@ -59,7 +59,7 @@ protected: // Hierarchy access methods virtual sal_uInt32 GetPaintObjectCount() const override; - virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const override; + virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) override; public: // basic constructor/destructor @@ -95,7 +95,7 @@ protected: // Hierarchy access methods virtual sal_uInt32 GetPaintObjectCount() const override; - virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const override; + virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) override; public: // basic constructor @@ -107,6 +107,7 @@ public: // set another page void SetStartPage(const SdrPage* pPage); const SdrPage* GetStartPage() const { return mxStartPage.get(); } + SdrPage* GetStartPage() { return mxStartPage.get(); } virtual OutputDevice* TryToGetOutputDevice() const override; }; diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 347beb3351da..7e1d15f92587 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -375,6 +375,14 @@ public: */ class SVX_DLLPUBLIC SdrPage : public SdrObjList, public tools::WeakBase< SdrPage > { + // #i9076# + friend class SdrModel; + friend class SvxUnoDrawPagesAccess; + + // this class uses its own UNO wrapper + // and thus has to set mxUnoPage (it also relies on mxUnoPage not being WeakRef) + friend class reportdesign::OSection; + SdrPage& operator=(const SdrPage& rSrcPage) = delete; // start PageUser section @@ -382,32 +390,20 @@ private: // #111111# PageUser section sdr::PageUserVector maPageUsers; + std::unique_ptr<sdr::contact::ViewContact> mpViewContact; + public: void AddPageUser(sdr::PageUser& rNewUser); void RemovePageUser(sdr::PageUser& rOldUser); - - // end PageUser section - - - // #110094# DrawContact section -private: - sdr::contact::ViewContact* mpViewContact; protected: sdr::contact::ViewContact* CreateObjectSpecificViewContact(); public: - sdr::contact::ViewContact& GetViewContact() const; + const sdr::contact::ViewContact& GetViewContact() const; + sdr::contact::ViewContact& GetViewContact(); // #110094# DrawContact support: Methods for handling Page changes - void ActionChanged() const; - - // #i9076# - friend class SdrModel; - friend class SvxUnoDrawPagesAccess; - -// this class uses its own UNO wrapper -// and thus has to set mxUnoPage (it also relies on mxUnoPage not being WeakRef) -friend class reportdesign::OSection; + void ActionChanged(); sal_Int32 nWdt; // Seitengroesse sal_Int32 nHgt; // Seitengroesse |