diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-05 09:14:46 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-06 22:08:37 +0000 |
| commit | ad9c65d0faac1df806dd19aab0452a84c8d4677c (patch) | |
| tree | b534029e0cc9c8e372f6c1e597285461877ede47 /filter | |
| parent | fff5bc8b3547f77e5294976d6f5a6387c23e8eff (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/inc/filter/msfilter/escherex.hxx | 2 | ||||
| -rw-r--r-- | filter/source/graphicfilter/epict/epict.cxx | 15 |
2 files changed, 7 insertions, 10 deletions
diff --git a/filter/inc/filter/msfilter/escherex.hxx b/filter/inc/filter/msfilter/escherex.hxx index edef7228edcc..5a0316758f04 100644 --- a/filter/inc/filter/msfilter/escherex.hxx +++ b/filter/inc/filter/msfilter/escherex.hxx @@ -1098,7 +1098,7 @@ public: sal_Bool bWritePictureOffset, sal_uInt32 nResize = 0); sal_uInt32 GetBlibID( SvStream& rPicOutStream, - const ByteString& rGraphicId, + const rtl::OString& rGraphicId, const Rectangle& rBoundRect, const com::sun::star::awt::Rectangle* pVisArea = NULL, const GraphicAttr* pGrafikAttr = NULL diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index aa00f1f02898..9f0b7c93eda0 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -326,18 +326,15 @@ void PictWriter::WriteRGBColor(const Color & rColor) *pPict << nR << nG << nB; } - void PictWriter::WriteString( const String & rString ) { - sal_uInt16 i,nLen; - - ByteString aByteString( rString, gsl_getSystemTextEncoding() ); - nLen = aByteString.Len(); + rtl::OString aString(rtl::OUStringToOString(rString, osl_getThreadTextEncoding())); + sal_Int32 nLen = aString.getLength(); if ( nLen > 255 ) nLen = 255; *pPict << ( (sal_uInt8)nLen ); - for ( i = 0; i < nLen; i++ ) - *pPict << aByteString.GetChar( i ); + for (sal_Int32 i = 0; i < nLen; ++i) + *pPict << aString[i]; } Rectangle PictWriter::MapRectangle( const Rectangle& rRect ) @@ -716,8 +713,8 @@ void PictWriter::WriteOpcode_FontName(const Font & rFont) if (bDstFontNameValid==sal_False || nDstFontNameId!=nFontId || aDstFontName!=rFont.GetName()) { - ByteString aByteString( rFont.GetName(), gsl_getSystemTextEncoding() ); - sal_uInt16 nFontNameLen = aByteString.Len(); + rtl::OString aString(rtl::OUStringToOString(rFont.GetName(), osl_getThreadTextEncoding())); + sal_uInt16 nFontNameLen = aString.getLength(); if ( nFontNameLen ) { nDataLen = 3 + nFontNameLen; |