diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-24 16:22:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-07-27 08:18:16 +0200 |
| commit | 38ecca9b30e0fc5f7cc6264857f983e40dd58195 (patch) | |
| tree | 3ad61e6d5cddcf161d27cfe4c6ca85fcf1cab8f6 /include/basic | |
| parent | efac5fa06e2d00bd67c582d8a6b1f1fc69c9b9f5 (diff) | |
inline a bunch of use-once macros
no point in having a macro unless it's actually going to reduce the
number of lines of code
Change-Id: Ic8760d6506cf272d7bd088f7b3b4dcbf288099fc
Diffstat (limited to 'include/basic')
| -rw-r--r-- | include/basic/sbxcore.hxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx index 6ce2e2c493c1..45cf9361a137 100644 --- a/include/basic/sbxcore.hxx +++ b/include/basic/sbxcore.hxx @@ -39,14 +39,6 @@ class SvStream; virtual sal_uInt16 GetVersion() const SAL_OVERRIDE { return nVer; } \ virtual sal_uInt16 GetSbxId() const SAL_OVERRIDE { return nSbxId; } -// This version of the macro defines Load/StorePrivateData()-methods -#define SBX_DECL_PERSIST( nCre, nSbxId, nVer ) \ - virtual bool LoadPrivateData( SvStream&, sal_uInt16 ); \ - virtual bool StorePrivateData( SvStream& ) const; \ - virtual sal_uInt32 GetCreator() const { return nCre; } \ - virtual sal_uInt16 GetVersion() const { return nVer; } \ - virtual sal_uInt16 GetSbxId() const { return nSbxId; } - class SbxBase; class SbxFactory; class SbxObject; @@ -62,7 +54,13 @@ protected: SbxBase( const SbxBase& ); SbxBase& operator=( const SbxBase& ); virtual ~SbxBase(); - SBX_DECL_PERSIST(0,0,0); + + virtual bool LoadPrivateData( SvStream&, sal_uInt16 ); + virtual bool StorePrivateData( SvStream& ) const; + virtual sal_uInt32 GetCreator() const { return 0; } + virtual sal_uInt16 GetVersion() const { return 0; } + virtual sal_uInt16 GetSbxId() const { return 0; } + public: TYPEINFO(); inline void SetFlags( SbxFlagBits n ); |