diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-21 12:15:26 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-26 08:42:29 +0200 |
commit | f61dbc302975aaa253b00ea6b141bb12474b3c95 (patch) | |
tree | 7150ea10f0111c4e6677030ac568c7be03424e08 /include/sot | |
parent | b44cbb26efe1d0b0950b1e1613e131b506dc3876 (diff) |
followup code removal after changing virtual methods to non-virtual
This cleanups up indentation and removes dead classes.
This is a followup patch to commit
272b1dd55797aacf511fb4342b0054e3697243f6
"new loplugin: change virtual methods to non-virtual"
Change-Id: I1c2139589cf8cb23bb9808defe22c51039d38de1
Diffstat (limited to 'include/sot')
-rw-r--r-- | include/sot/factory.hxx | 2 | ||||
-rw-r--r-- | include/sot/object.hxx | 6 | ||||
-rw-r--r-- | include/sot/storage.hxx | 58 |
3 files changed, 33 insertions, 33 deletions
diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx index e08847b93f30..078a32be6ffc 100644 --- a/include/sot/factory.hxx +++ b/include/sot/factory.hxx @@ -58,7 +58,7 @@ public: const OUString & rClassName, CreateInstanceType ); void PutSuperClass( const SotFactory * ); - void * CreateInstance( SotObject ** ppObj = NULL ) const; + void * CreateInstance( SotObject ** ppObj = NULL ) const; bool Is( const SotFactory * pSuperClass ) const; const SotFactory * GetSuper( sal_uInt16 nPos ) const diff --git a/include/sot/object.hxx b/include/sot/object.hxx index 19428d6183bd..f23f1835825d 100644 --- a/include/sot/object.hxx +++ b/include/sot/object.hxx @@ -110,13 +110,13 @@ private: static SotFactory ** GetFactoryAdress() { return &(SOTDATA()->pSotObjectFactory); } public: - static void * CreateInstance( SotObject ** = NULL ); + static void * CreateInstance( SotObject ** = NULL ); static SotFactory * ClassFactory(); virtual const SotFactory * GetSvFactory() const; - virtual void * Cast( const SotFactory * ); + virtual void * Cast( const SotFactory * ); // only for the macros in So3 not to get out of hand - IUnknown * GetInterface( const SvGlobalName & ); + IUnknown * GetInterface( const SvGlobalName & ); bool Owner() const { return bOwner; } diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index 10940c4bd7f5..830faf8a36fc 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -65,18 +65,18 @@ private: static SotFactory ** GetFactoryAdress() { return &(SOTDATA()->pSotStorageStreamFactory); } public: - static void * CreateInstance( SotObject ** = NULL ); + static void * CreateInstance( SotObject ** = NULL ); static SotFactory * ClassFactory(); virtual const SotFactory * GetSvFactory() const SAL_OVERRIDE; - virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; + virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; virtual void ResetError() SAL_OVERRIDE; virtual void SetSize( sal_uInt64 nNewSize ) SAL_OVERRIDE; - sal_uInt32 GetSize() const; + sal_uInt32 GetSize() const; bool CopyTo( SotStorageStream * pDestStm ); - bool Commit(); - bool Revert(); + bool Commit(); + bool Revert(); bool SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue ); virtual sal_uInt64 remainingSize() SAL_OVERRIDE; }; @@ -127,19 +127,19 @@ private: static SotFactory ** GetFactoryAdress() { return &(SOTDATA()->pSotStorageFactory); } public: - static void * CreateInstance( SotObject ** = NULL ); + static void * CreateInstance( SotObject ** = NULL ); static SotFactory * ClassFactory(); virtual const SotFactory * GetSvFactory() const SAL_OVERRIDE; - virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; + virtual void * Cast( const SotFactory * ) SAL_OVERRIDE; SvMemoryStream * CreateMemoryStream(); static bool IsStorageFile( const OUString & rFileName ); static bool IsStorageFile( SvStream* pStream ); - const OUString& GetName() const; + const OUString& GetName() const; - bool Validate(); + bool Validate(); const OString& GetKey() const { return m_aKey;} @@ -152,36 +152,36 @@ public: return m_nVersion; } - sal_uLong GetErrorCode() const { return m_nError; } - sal_uLong GetError() const { return ERRCODE_TOERROR(m_nError); } + sal_uLong GetErrorCode() const { return m_nError; } + sal_uLong GetError() const { return ERRCODE_TOERROR(m_nError); } void SetError( sal_uLong nErrorCode ) { if( m_nError == SVSTREAM_OK ) m_nError = nErrorCode; } - void ResetError(); + void ResetError(); bool IsRoot() const { return m_bIsRoot; } void SignAsRoot( bool b = true ) { m_bIsRoot = b; } void SetDeleteStream( bool bDelete ) { m_bDelStm = bDelete; } // own data sector - void SetClass( const SvGlobalName & rClass, + void SetClass( const SvGlobalName & rClass, sal_uLong bOriginalClipFormat, const OUString & rUserTypeName ); - void SetConvertClass( const SvGlobalName & rConvertClass, + void SetConvertClass( const SvGlobalName & rConvertClass, sal_uLong bOriginalClipFormat, const OUString & rUserTypeName ); - SvGlobalName GetClassName(); // type of data in the storage - sal_uLong GetFormat(); - OUString GetUserName(); - bool ShouldConvert(); + SvGlobalName GetClassName(); // type of data in the storage + sal_uLong GetFormat(); + OUString GetUserName(); + bool ShouldConvert(); // list of all elements - void FillInfoList( SvStorageInfoList * ) const; - bool CopyTo( SotStorage * pDestStg ); - bool Commit(); - bool Revert(); + void FillInfoList( SvStorageInfoList * ) const; + bool CopyTo( SotStorage * pDestStg ); + bool Commit(); + bool Revert(); // create stream with connection to Storage, // more or less a Parent-Child relationship @@ -192,17 +192,17 @@ public: StreamMode = STREAM_STD_READWRITE, bool transacted = true ); // query whether Storage or Stream - bool IsStream( const OUString & rEleName ) const; - bool IsStorage( const OUString & rEleName ) const; - bool IsContained( const OUString & rEleName ) const; + bool IsStream( const OUString & rEleName ) const; + bool IsStorage( const OUString & rEleName ) const; + bool IsContained( const OUString & rEleName ) const; // remove element - bool Remove( const OUString & rEleName ); + bool Remove( const OUString & rEleName ); // change element's name - bool Rename( const OUString & rEleName, + bool Rename( const OUString & rEleName, const OUString & rNewName ); - bool CopyTo( const OUString & rEleName, SotStorage * pDest, + bool CopyTo( const OUString & rEleName, SotStorage * pDest, const OUString & rNewName ); - bool MoveTo( const OUString & rEleName, SotStorage * pDest, + bool MoveTo( const OUString & rEleName, SotStorage * pDest, const OUString & rNewName ); bool IsOLEStorage() const; |