diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-01-08 12:23:26 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-01-08 21:03:50 -0500 |
| commit | 9260badb6f3d78b4e2bfcf79394b52befad12482 (patch) | |
| tree | 14f3b3aa2110293d7e47da7b82ef88b9ca74033a /editeng | |
| parent | fdo#58074: store page number in SwPageNumberField (diff) | |
| download | core-9260badb6f3d78b4e2bfcf79394b52befad12482.tar.gz core-9260badb6f3d78b4e2bfcf79394b52befad12482.zip | |
More SfxItemPoolUser up to the base class.
Change-Id: I44819d66273e22db9f82d095061e3df627b64dae
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/inc/editeng/editobj.hxx | 5 | ||||
| -rw-r--r-- | editeng/source/editeng/editobj.cxx | 6 | ||||
| -rw-r--r-- | editeng/source/editeng/editobj2.hxx | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/editeng/inc/editeng/editobj.hxx b/editeng/inc/editeng/editobj.hxx index 12c089c884f8..9c0a438f1076 100644 --- a/editeng/inc/editeng/editobj.hxx +++ b/editeng/inc/editeng/editobj.hxx @@ -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 diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index cd1bc1089fa6..af2c4846b765 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -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; diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index ef355794361b..b8d6b1087d2d 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -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; |