remove another custom refcounting base class
Change-Id: Icd8a8d79da0ada68e9ee869c3c2a7b93db5b2733
This commit is contained in:
@@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\
|
||||
drawinglayer \
|
||||
editeng \
|
||||
sal \
|
||||
salhelper \
|
||||
i18nlangtag \
|
||||
sfx \
|
||||
sot \
|
||||
|
||||
@@ -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<
|
||||
|
||||
@@ -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 ),
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user