diff options
author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-09-05 17:22:12 +0400 |
---|---|---|
committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-09-05 17:22:41 +0400 |
commit | 03730253464f4cd18e6acb90ed981a691ba97e81 (patch) | |
tree | 68d4ceb96fcc49f7b2e9d8342da8fb052abf6106 /sd/source/filter/ppt/propread.cxx | |
parent | 660fe83b4357c9fa070739b9c4da9d9002c9bd51 (diff) |
String->OUString
Change-Id: I0298ff90654a5778621730801d0952b2ed3ee5e8
Diffstat (limited to 'sd/source/filter/ppt/propread.cxx')
-rw-r--r-- | sd/source/filter/ppt/propread.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index 6798915c7d02..42fc3f816241 100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -63,15 +63,15 @@ void PropItem::Clear() // ----------------------------------------------------------------------- -static xub_StrLen lcl_getMaxSafeStrLen(sal_uInt32 nSize) +static sal_Int32 lcl_getMaxSafeStrLen(sal_uInt32 nSize) { nSize -= 1; //Drop NULL terminator //If it won't fit in a string, clip it to the max size that does - if (nSize > STRING_MAXLEN) - nSize = STRING_MAXLEN; + if (nSize > SAL_MAX_INT32) + nSize = SAL_MAX_INT32; - return static_cast< xub_StrLen >( nSize ); + return static_cast< sal_Int32 >( nSize ); } sal_Bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, sal_Bool bAlign ) @@ -522,7 +522,7 @@ Section& Section::operator=( const Section& rSection ) // ----------------------------------------------------------------------- -PropRead::PropRead( SvStorage& rStorage, const String& rName ) : +PropRead::PropRead( SvStorage& rStorage, const OUString& rName ) : mbStatus ( sal_False ), mnByteOrder ( 0xfffe ), mnFormat ( 0 ), |