diff options
| -rw-r--r-- | chart2/Library_chartcontroller.mk | 1 | ||||
| -rw-r--r-- | chart2/source/controller/inc/ChartController.hxx | 12 | ||||
| -rw-r--r-- | chart2/source/controller/main/ChartController.cxx | 18 | ||||
| -rw-r--r-- | compilerplugins/clang/mergeclasses.results | 1 |
4 files changed, 2 insertions, 30 deletions
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index 9f8b65f8045f..080eef3caa83 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\ drawinglayer \ editeng \ sal \ + salhelper \ i18nlangtag \ sfx \ sot \ diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index cdb23aa9133c..59a374100fb6 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -447,17 +447,7 @@ private: private: class TheModelRef; friend class ChartController::TheModelRef; - class RefCountable - { - public: - RefCountable(); - virtual ~RefCountable(); - void acquire(); - void release(); - private: - sal_Int32 m_nRefCount; - }; - class TheModel : public RefCountable + class TheModel : public salhelper::SimpleReferenceObject { public: explicit TheModel( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 045837e7ccfd..8b1654393023 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -131,24 +131,6 @@ ChartController::~ChartController() stopDoubleClickWaiting(); } -ChartController::RefCountable::RefCountable() : m_nRefCount(0) -{ -} - -ChartController::RefCountable::~RefCountable() -{ -} -void ChartController::RefCountable::acquire() -{ - m_nRefCount++; -} -void ChartController::RefCountable::release() -{ - m_nRefCount--; - if(!m_nRefCount) - delete this; -} - ChartController::TheModel::TheModel( const uno::Reference< frame::XModel > & xModel ) : m_xModel( xModel ), m_xCloseable( NULL ), diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index d377c46b2b0c..3da0ff92913c 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -129,7 +129,6 @@ merge cairocanvas::DeviceHelper with cairocanvas::SpriteDeviceHelper merge cairocanvas::Sprite with cairocanvas::CanvasCustomSpriteSpriteBase_Base merge canvas::ISurfaceProxy with canvas::SurfaceProxy merge canvas::ISurfaceProxyManager with canvas::SurfaceProxyManager -merge chart::ChartController::RefCountable with chart::ChartController::TheModel merge chart::ConfigItemListener with chart::ConfigColorScheme merge chart::ExplicitValueProvider with chart::ChartView merge chart::LegendEntryProvider with chart::VSeriesPlotter |