diff options
| author | Frank Schönheit <fs@openoffice.org> | 2001-05-17 12:04:24 +0000 |
|---|---|---|
| committer | Frank Schönheit <fs@openoffice.org> | 2001-05-17 12:04:24 +0000 |
| commit | 212c9c9a108b8d84ddb1d94f2834cf8dad9be74a (patch) | |
| tree | 879adb18d195af0ab037c6c8b212f28da27a6556 /unotools | |
| parent | b57529d6ba33cf3b8eecb8ba251b5d1ebc6acdbb (diff) | |
#87163# renamed the rtl versions of toUpper/toLower (MSVC 6 gets confused sometimes)
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/inc/unotools/charclass.hxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/unotools/inc/unotools/charclass.hxx b/unotools/inc/unotools/charclass.hxx index dc7eafb58708..7d055c3a100e 100644 --- a/unotools/inc/unotools/charclass.hxx +++ b/unotools/inc/unotools/charclass.hxx @@ -2,9 +2,9 @@ * * $RCSfile: charclass.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: fs $ $Date: 2001-05-17 12:57:32 $ + * last change: $Author: fs $ $Date: 2001-05-17 13:04:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -223,8 +223,10 @@ public: String toLower( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const; String toTitle( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const; - ::rtl::OUString toUpper( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const; - ::rtl::OUString toLower( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const; + ::rtl::OUString toUpper_rtl( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const; + ::rtl::OUString toLower_rtl( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const; + // use the postfix because compilers could get confused by the both similar versions + // (me thinks they shouldn't, but in fact MSCV 6 does) sal_Int16 getType( const String& rStr, xub_StrLen nPos ) const; sal_Int16 getCharacterDirection( const String& rStr, xub_StrLen nPos ) const; @@ -272,8 +274,8 @@ public: inline String lower( const String& rStr ) const { return toLower( rStr, 0, rStr.Len() ); } - const ::rtl::OUString& toUpper( ::rtl::OUString& _rStr ) const { return _rStr = toUpper( _rStr, 0, _rStr.getLength() ); } - const ::rtl::OUString& toLower( ::rtl::OUString& _rStr ) const { return _rStr = toLower( _rStr, 0, _rStr.getLength() ); } + const ::rtl::OUString& toUpper_rtl( ::rtl::OUString& _rStr ) const { return _rStr = toUpper_rtl( _rStr, 0, _rStr.getLength() ); } + const ::rtl::OUString& toLower_rtl( ::rtl::OUString& _rStr ) const { return _rStr = toLower_rtl( _rStr, 0, _rStr.getLength() ); } }; |