diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-11-13 10:58:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-13 13:50:38 +0000 |
| commit | 9881f48337ad1151a9ddf664ba78dd7f747582cf (patch) | |
| tree | 57b2572d3a48510872b4f56a3a82d6e9fda75386 /filter | |
| parent | 65a831a8b4dc6795c9c3cce4c74ec352d416d176 (diff) | |
xub_StrLen->sal_Int32
Change-Id: Ia7b61f28555af5f3bbfa9a8e82d54b9a18de15df
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 3 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index d6edcb772a28..06575d09b1d7 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1365,8 +1365,7 @@ sal_Bool EscherPropertyContainer::CreateEmbeddedBitmapProperties( sal_Int32 nIndex = aBmpUrl.indexOf( aVndUrl, 0 ); if( nIndex != -1 ) { - // note: += ist not defined for xub_StrLen -> conversion to int and back to xub_StrLen - nIndex = nIndex + aVndUrl.getLength(); + nIndex += aVndUrl.getLength(); if( aBmpUrl.getLength() > nIndex ) { OString aUniqueId(OUStringToOString(aBmpUrl.copy(nIndex, aBmpUrl.getLength() - nIndex), RTL_TEXTENCODING_UTF8)); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index a8515bbb2401..ade3f1fc11ea 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5154,7 +5154,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con } pPtr++; } - xub_StrLen nLen = sal::static_int_cast< xub_StrLen >( pPtr - pBuf ); + sal_Int32 nLen = pPtr - pBuf; if ( nLen ) aString = OUString( pBuf, nLen, RTL_TEXTENCODING_MS_1252 ); delete[] pBuf; @@ -6704,12 +6704,11 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport // idea. if (nVal == 0) { - sal_Unicode n; - xub_StrLen nLen; OUString aStr; bool inquote = sal_False; - for (nLen = 0, n = 0; nLen < 64; nLen++) + for (int nLen = 0; nLen < 64; ++nLen) { + sal_Unicode n(0); rIn >> n; // Collect quoted characters into aStr |