Kaydet (Commit) 9260badb authored tarafından Kohei Yoshida's avatar Kohei Yoshida

More SfxItemPoolUser up to the base class.

Change-Id: I44819d66273e22db9f82d095061e3df627b64dae
üst 741e8b7b
......@@ -24,6 +24,7 @@
#include <tools/debug.hxx>
#include <rsc/rscsfx.hxx>
#include <svl/itemset.hxx>
#include "svl/itempool.hxx"
#include <editeng/eeitem.hxx>
#include <editeng/editdata.hxx>
#include "editeng/editengdllapi.h"
......@@ -44,7 +45,7 @@ class FieldUpdater;
}
class EDITENG_DLLPUBLIC EditTextObject
class EDITENG_DLLPUBLIC EditTextObject : public SfxItemPoolUser
{
private:
sal_uInt16 nWhich;
......@@ -121,6 +122,8 @@ public:
// #i102062#
bool isWrongListEqual(const EditTextObject& rCompare) const;
virtual void ObjectInDestruction(const SfxItemPool& rSfxItemPool) = 0;
};
#endif // _EDITOBJ_HXX
......
......@@ -497,8 +497,7 @@ EditEngineItemPool* getEditEngineItemPool(SfxItemPool* pPool)
}
BinTextObject::BinTextObject( SfxItemPool* pP ) :
EditTextObject( EE_FORMAT_BIN ),
SfxItemPoolUser()
EditTextObject( EE_FORMAT_BIN )
{
nVersion = 0;
nMetric = 0xFFFF;
......@@ -536,8 +535,7 @@ BinTextObject::BinTextObject( SfxItemPool* pP ) :
}
BinTextObject::BinTextObject( const BinTextObject& r ) :
EditTextObject( r ),
SfxItemPoolUser()
EditTextObject( r )
{
nVersion = r.nVersion;
nMetric = r.nMetric;
......
......@@ -150,7 +150,7 @@ public:
bool isWrongListEqual(const ContentInfo& rCompare) const;
};
class BinTextObject : public EditTextObject, public SfxItemPoolUser
class BinTextObject : public EditTextObject
{
using EditTextObject::operator==;
using EditTextObject::isWrongListEqual;
......
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