diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-03-29 01:24:43 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-03-29 02:03:07 +0100 |
commit | 15006df5bdce7d06ee5c3ecd2f1618ce3dc6124c (patch) | |
tree | 9ff11c498e2f912a30bbc8f87983b247c929c519 | |
parent | 1258b576aef2ff3cdd4f44e1c03edb8c862a79f6 (diff) |
tools: remove unused SvStream::IsA() and associated ID_*STREAM macros
Change-Id: I6ed0991fb5bd1d5085ee1b93323b57b1afc69860
-rw-r--r-- | include/svl/instrm.hxx | 2 | ||||
-rw-r--r-- | include/svl/outstrm.hxx | 2 | ||||
-rw-r--r-- | include/tools/pstm.hxx | 1 | ||||
-rw-r--r-- | include/tools/stream.hxx | 10 | ||||
-rw-r--r-- | svl/source/misc/strmadpt.cxx | 12 | ||||
-rw-r--r-- | tools/source/ref/pstm.cxx | 11 | ||||
-rw-r--r-- | tools/source/stream/stream.cxx | 10 | ||||
-rw-r--r-- | tools/source/stream/strmunx.cxx | 5 | ||||
-rw-r--r-- | tools/source/stream/strmwnt.cxx | 5 |
9 files changed, 0 insertions, 58 deletions
diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx index 441238f1382e..9571e54a57fa 100644 --- a/include/svl/instrm.hxx +++ b/include/svl/instrm.hxx @@ -61,8 +61,6 @@ public: virtual ~SvInputStream(); - virtual sal_uInt16 IsA() const SAL_OVERRIDE; - virtual void AddMark(sal_uLong nPos); virtual void RemoveMark(sal_uLong nPos); diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx index a0bea052689b..f41b9ac015c2 100644 --- a/include/svl/outstrm.hxx +++ b/include/svl/outstrm.hxx @@ -50,8 +50,6 @@ public: rTheStream); virtual ~SvOutputStream(); - - virtual sal_uInt16 IsA() const SAL_OVERRIDE; }; #endif // INCLUDED_SVL_OUTSTRM_HXX diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx index cf42246cd9e9..f11a021afa3a 100644 --- a/include/tools/pstm.hxx +++ b/include/tools/pstm.hxx @@ -215,7 +215,6 @@ public: void SetStream( SvStream * pStream ); SvStream * GetStream() const { return pStm; } - virtual sal_uInt16 IsA() const SAL_OVERRIDE; SvPersistBase * GetObject( sal_uIntPtr nIdx ) const; sal_uIntPtr GetIndex( SvPersistBase * ) const; diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 7732d6dcb291..81b897dbbae9 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -79,13 +79,6 @@ typedef sal_uInt16 StreamMode; #define COMPRESSMODE_ZBITMAP (sal_uInt16)0x0001 #define COMPRESSMODE_NATIVE (sal_uInt16)0x0010 -#define ID_STREAM 1 -#define ID_FILESTREAM 2 -#define ID_MEMORYSTREAM 3 -#define ID_SHAREDMEMORYSTREAM 4 -#define ID_STORAGESTREAM 5 -#define ID_PERSISTSTREAM 6 - class SvStream; typedef SvStream& (*SvStrPtr)( SvStream& ); @@ -455,7 +448,6 @@ public: bool IsWritable() const { return bIsWritable; } StreamMode GetStreamMode() const { return eStreamMode; } - virtual sal_uInt16 IsA() const; long GetVersion() { return nVersion; } void SetVersion( long n ) { nVersion = n; } @@ -678,7 +670,6 @@ public: void Close(); bool IsOpen() const { return bIsOpen; } bool IsLocked() const { return ( nLockCounter!=0 ); } - virtual sal_uInt16 IsA() const SAL_OVERRIDE; const OUString& GetFileName() const { return aFilename; } }; @@ -737,7 +728,6 @@ public: sal_Size GetEndOfData() const { return nEndOfData; } const void* GetData() { Flush(); return pBuf; } operator const void*() { Flush(); return pBuf; } - virtual sal_uInt16 IsA() const SAL_OVERRIDE; void* SwitchBuffer( sal_Size nInitSize=512, sal_Size nResize=64 ); void* SetBuffer( void* pBuf, sal_Size nSize, diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index 7746ec659ddb..03beb02370b2 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -647,12 +647,6 @@ SvInputStream::~SvInputStream() } // virtual -sal_uInt16 SvInputStream::IsA() const -{ - return 0; -} - -// virtual void SvInputStream::AddMark(sal_uLong nPos) { if (open() && m_pPipe) @@ -763,12 +757,6 @@ SvOutputStream::~SvOutputStream() } } -// virtual -sal_uInt16 SvOutputStream::IsA() const -{ - return 0; -} - // SvDataPipe_Impl diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index eeab479bfa80..1c518983c0ef 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -182,17 +182,6 @@ void SvPersistStream::SetStream( SvStream * pStream ) } } -/** Returns the identifier of this stream class. - - @return ID_PERSISTSTREAM - - @see SvStream::IsA -*/ -sal_uInt16 SvPersistStream::IsA() const -{ - return ID_PERSISTSTREAM; -} - void SvPersistStream::ResetError() { SvStream::ResetError(); diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index dcfc40c6672f..086f79725c33 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -431,11 +431,6 @@ SvStream::~SvStream() delete[] pRWBuf; } -sal_uInt16 SvStream::IsA() const -{ - return (sal_uInt16)ID_STREAM; -} - void SvStream::ClearError() { bIsEof = false; @@ -1726,11 +1721,6 @@ SvMemoryStream::~SvMemoryStream() } } -sal_uInt16 SvMemoryStream::IsA() const -{ - return (sal_uInt16)ID_MEMORYSTREAM; -} - const void* SvMemoryStream::GetBuffer() { Flush(); diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index 9a937fec96f7..010bcc6660c6 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -306,11 +306,6 @@ SvFileStream::~SvFileStream() delete pInstanceData; } -sal_uInt16 SvFileStream::IsA() const -{ - return ID_FILESTREAM; -} - sal_Size SvFileStream::GetData( void* pData, sal_Size nSize ) { #ifdef DBG_UTIL diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx index 29e0923043ab..d5f519fcef05 100644 --- a/tools/source/stream/strmwnt.cxx +++ b/tools/source/stream/strmwnt.cxx @@ -133,11 +133,6 @@ SvFileStream::~SvFileStream() delete pInstanceData; } -sal_uInt16 SvFileStream::IsA() const -{ - return ID_FILESTREAM; -} - /// Does not check for EOF, makes isEof callable sal_Size SvFileStream::GetData( void* pData, sal_Size nSize ) { |