diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-20 23:05:48 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-21 09:17:11 +0000 |
| commit | e4d90aef949abf172c45e15241159371504d6090 (patch) | |
| tree | 543f8b93b944de2800a70aa3fa0b7e672213544d | |
| parent | 37676d162c29331c9f6235cf51406db8aaf8dfba (diff) | |
ditch last ENABLE_STRING_STREAM_OPERATORS
| -rw-r--r-- | editeng/source/editeng/editobj.cxx | 1 | ||||
| -rw-r--r-- | tools/inc/tools/stream.hxx | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index bc2a02e78ed6..6b4c4c5eaee6 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -34,7 +34,6 @@ #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> -#define ENABLE_STRING_STREAM_OPERATORS #include <tools/stream.hxx> #include <editobj2.hxx> diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index c320bc2ae892..0ad95857ad7a 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -346,9 +346,6 @@ public: SvStream& operator>>( unsigned char& rChar ); SvStream& operator>>( float& rFloat ); SvStream& operator>>( double& rDouble ); -#ifdef ENABLE_STRING_STREAM_OPERATORS - SvStream& operator>>( UniString& rString ) { return ReadByteString(rString); } -#endif SvStream& operator>>( SvStream& rStream ); SvStream& operator<<( sal_uInt16 nUInt16 ); @@ -364,9 +361,6 @@ public: SvStream& operator<<( const double& rDouble ); SvStream& operator<<( const char* pBuf ); SvStream& operator<<( const unsigned char* pBuf ); -#ifdef ENABLE_STRING_STREAM_OPERATORS - SvStream& operator<<( const UniString& rString ) { return WriteByteString(rString); } -#endif SvStream& operator<<( SvStream& rStream ); SvStream& ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ); |