diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-30 17:09:51 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-31 14:38:11 +0100 |
commit | 2bf2541c6b849a5153462327f8d167a386464dda (patch) | |
tree | 49ce25a29bcf0236206e73a529e18812186ea421 /reportdesign/inc | |
parent | e54f4cc24d29fe133a5eaae90515f74c64644159 (diff) |
loplugin:finalclasses in reportdesign
Change-Id: I6fab8ce7d1c9a5e52a981dc7530fafb2373e27f6
Reviewed-on: https://gerrit.libreoffice.org/44098
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign/inc')
-rw-r--r-- | reportdesign/inc/RptObject.hxx | 65 |
1 files changed, 30 insertions, 35 deletions
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index fd4cba36923f..5a8e53d912d2 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -122,30 +122,16 @@ public: // OCustomShape -class REPORTDESIGN_DLLPUBLIC OCustomShape: public SdrObjCustomShape , public OObjectBase +class REPORTDESIGN_DLLPUBLIC OCustomShape final : public SdrObjCustomShape , public OObjectBase { friend class OReportPage; friend class DlgEdFactory; - public: static OCustomShape* Create( const css::uno::Reference< css::report::XReportComponent>& _xComponent ) { return new OCustomShape( _xComponent ); } -protected: - OCustomShape(const css::uno::Reference< css::report::XReportComponent>& _xComponent); - OCustomShape(const OUString& _sComponentName); - - virtual void NbcMove( const Size& rSize ) override; - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; - virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override; - - virtual SdrPage* GetImplPage() const override; - -public: - virtual ~OCustomShape() override; virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override; @@ -156,39 +142,30 @@ public: private: virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override; + + OCustomShape(const css::uno::Reference< css::report::XReportComponent>& _xComponent); + OCustomShape(const OUString& _sComponentName); + + virtual void NbcMove( const Size& rSize ) override; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override; + + virtual SdrPage* GetImplPage() const override; }; // OOle2Obj -class REPORTDESIGN_DLLPUBLIC OOle2Obj: public SdrOle2Obj , public OObjectBase +class REPORTDESIGN_DLLPUBLIC OOle2Obj final : public SdrOle2Obj , public OObjectBase { friend class OReportPage; friend class DlgEdFactory; - - sal_uInt16 m_nType; - bool m_bOnlyOnce; - void impl_createDataProvider_nothrow( const css::uno::Reference< css::frame::XModel>& _xModel); - virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override; - public: static OOle2Obj* Create( const css::uno::Reference< css::report::XReportComponent>& _xComponent,sal_uInt16 _nType ) { return new OOle2Obj( _xComponent,_nType ); } -protected: - OOle2Obj(const css::uno::Reference< css::report::XReportComponent>& _xComponent,sal_uInt16 _nType); - OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType); - - - virtual void NbcMove( const Size& rSize ) override; - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; - virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override; - - virtual SdrPage* GetImplPage() const override; - -public: virtual ~OOle2Obj() override; @@ -204,6 +181,24 @@ public: OOle2Obj& operator=(const OOle2Obj& rObj); void initializeChart( const css::uno::Reference< css::frame::XModel>& _xModel); + +private: + OOle2Obj(const css::uno::Reference< css::report::XReportComponent>& _xComponent,sal_uInt16 _nType); + OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType); + + + virtual void NbcMove( const Size& rSize ) override; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; + virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override; + + virtual SdrPage* GetImplPage() const override; + + void impl_createDataProvider_nothrow( const css::uno::Reference< css::frame::XModel>& _xModel); + virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override; + + sal_uInt16 m_nType; + bool m_bOnlyOnce; }; |