Kaydet (Commit) 2b57de8b authored tarafından Noel Grandin's avatar Noel Grandin

remove another custom refcounting base class

Change-Id: Icd8a8d79da0ada68e9ee869c3c2a7b93db5b2733
üst 6d7353de
...@@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\ ...@@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\
drawinglayer \ drawinglayer \
editeng \ editeng \
sal \ sal \
salhelper \
i18nlangtag \ i18nlangtag \
sfx \ sfx \
sot \ sot \
......
...@@ -447,17 +447,7 @@ private: ...@@ -447,17 +447,7 @@ private:
private: private:
class TheModelRef; class TheModelRef;
friend class ChartController::TheModelRef; friend class ChartController::TheModelRef;
class RefCountable class TheModel : public salhelper::SimpleReferenceObject
{
public:
RefCountable();
virtual ~RefCountable();
void acquire();
void release();
private:
sal_Int32 m_nRefCount;
};
class TheModel : public RefCountable
{ {
public: public:
explicit TheModel( const ::com::sun::star::uno::Reference< explicit TheModel( const ::com::sun::star::uno::Reference<
......
...@@ -131,24 +131,6 @@ ChartController::~ChartController() ...@@ -131,24 +131,6 @@ ChartController::~ChartController()
stopDoubleClickWaiting(); 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 ) : ChartController::TheModel::TheModel( const uno::Reference< frame::XModel > & xModel ) :
m_xModel( xModel ), m_xModel( xModel ),
m_xCloseable( NULL ), m_xCloseable( NULL ),
......
...@@ -129,7 +129,6 @@ merge cairocanvas::DeviceHelper with cairocanvas::SpriteDeviceHelper ...@@ -129,7 +129,6 @@ merge cairocanvas::DeviceHelper with cairocanvas::SpriteDeviceHelper
merge cairocanvas::Sprite with cairocanvas::CanvasCustomSpriteSpriteBase_Base merge cairocanvas::Sprite with cairocanvas::CanvasCustomSpriteSpriteBase_Base
merge canvas::ISurfaceProxy with canvas::SurfaceProxy merge canvas::ISurfaceProxy with canvas::SurfaceProxy
merge canvas::ISurfaceProxyManager with canvas::SurfaceProxyManager merge canvas::ISurfaceProxyManager with canvas::SurfaceProxyManager
merge chart::ChartController::RefCountable with chart::ChartController::TheModel
merge chart::ConfigItemListener with chart::ConfigColorScheme merge chart::ConfigItemListener with chart::ConfigColorScheme
merge chart::ExplicitValueProvider with chart::ChartView merge chart::ExplicitValueProvider with chart::ChartView
merge chart::LegendEntryProvider with chart::VSeriesPlotter merge chart::LegendEntryProvider with chart::VSeriesPlotter
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment