diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2016-08-14 18:15:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-15 06:54:11 +0000 |
| commit | 3093732c17d14b0e6eb67868c514448f13bc66d0 (patch) | |
| tree | c6d61c88e1ded2579469f569b6d5b4d261b9dc8f | |
| parent | f8f68042597cd38b8dab7413baadb093c4a01a00 (diff) | |
basic: SbxBase should be abstract
Change-Id: Ief4297e5c64cfb29645463aca3cc677dc06fc95a
Reviewed-on: https://gerrit.libreoffice.org/28112
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | basic/source/sbx/sbxbase.cxx | 14 | ||||
| -rw-r--r-- | include/basic/sbxcore.hxx | 13 |
2 files changed, 6 insertions, 21 deletions
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 615708328180..f1f95181096c 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -78,10 +78,6 @@ SbxClassType SbxBase::GetClass() const return SbxClassType::DontCare; } -void SbxBase::Clear() -{ -} - bool SbxBase::IsFixed() const { return IsSet( SbxFlagBits::Fixed ); @@ -268,16 +264,6 @@ bool SbxBase::Store( SvStream& rStrm ) return true; } -bool SbxBase::LoadData( SvStream&, sal_uInt16 ) -{ - return false; -} - -bool SbxBase::StoreData( SvStream& ) const -{ - return false; -} - bool SbxBase::LoadCompleted() { return true; diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx index ef07a74e75bc..25c78151da53 100644 --- a/include/basic/sbxcore.hxx +++ b/include/basic/sbxcore.hxx @@ -38,14 +38,13 @@ class SvStream; virtual sal_uInt16 GetVersion() const override { return nVer; } \ virtual sal_uInt16 GetSbxId() const override { return nSbxId; } -class SbxBase; class SbxFactory; class SbxObject; class BASIC_DLLPUBLIC SbxBase : virtual public SvRefBase { - virtual bool LoadData( SvStream&, sal_uInt16 ); - virtual bool StoreData( SvStream& ) const; + virtual bool LoadData( SvStream&, sal_uInt16 ) = 0; + virtual bool StoreData( SvStream& ) const = 0; protected: SbxFlagBits nFlags; // Flag-Bits @@ -54,9 +53,9 @@ protected: SbxBase& operator=( const SbxBase& ); virtual ~SbxBase(); - virtual sal_uInt32 GetCreator() const { return 0; } - virtual sal_uInt16 GetVersion() const { return 0; } - virtual sal_uInt16 GetSbxId() const { return 0; } + virtual sal_uInt32 GetCreator() const = 0 ; + virtual sal_uInt16 GetVersion() const = 0; + virtual sal_uInt16 GetSbxId() const = 0; public: inline void SetFlags( SbxFlagBits n ); @@ -77,7 +76,7 @@ public: virtual SbxDataType GetType() const; virtual SbxClassType GetClass() const; - virtual void Clear(); + virtual void Clear() = 0; static SbxBase* Load( SvStream& ); bool Store( SvStream& ); |