diff options
| -rw-r--r-- | desktop/source/deployment/manager/dp_manager.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 4 | ||||
| -rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 508d6bb45707..63720c5de74c 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -1037,7 +1037,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_( if (INetContentTypes::parse( data.mediaType, type, subType, ¶ms )) { INetContentTypeParameter const * param = params.find( - ByteString("platform") ); + rtl::OString("platform") ); if (param != 0 && !platform_fits( param->m_sValue )) throw lang::IllegalArgumentException( getResourceString(RID_STR_NO_SUCH_PACKAGE) + id, diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 3ad8b8bab4f3..1757c6b81b3b 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -1650,8 +1650,8 @@ void ScXMLExport::CopySourceStream( sal_Int32 nStartOffset, sal_Int32 nEndOffset if ( getExportFlags() & EXPORT_PRETTY ) { - ByteString aOutStr("\n "); - uno::Sequence<sal_Int8> aOutSeq( (sal_Int8*)aOutStr.GetBuffer(), aOutStr.Len() ); + const rtl::OString aOutStr("\n "); + uno::Sequence<sal_Int8> aOutSeq( (sal_Int8*)aOutStr.getStr(), aOutStr.getLength() ); xDestStream->writeBytes( aOutSeq ); } diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 3fc611c9658b..3d615199d431 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -548,11 +548,11 @@ String SvXMLGraphicHelper::ImplGetGraphicMimeType( const String& rFileName ) con if( ( rFileName.Len() >= 4 ) && ( rFileName.GetChar( rFileName.Len() - 4 ) == '.' ) ) { - const ByteString aExt(rtl::OUStringToOString(rFileName.Copy(rFileName.Len() - 3), + const rtl::OString aExt(rtl::OUStringToOString(rFileName.Copy(rFileName.Len() - 3), RTL_TEXTENCODING_ASCII_US)); for( long i = 0, nCount = SAL_N_ELEMENTS( aMapper ); ( i < nCount ) && !aMimeType.Len(); i++ ) - if( aExt == aMapper[ i ].pExt ) + if( aExt.getStr() == aMapper[ i ].pExt ) aMimeType = String( aMapper[ i ].pMimeType, RTL_TEXTENCODING_ASCII_US ); } |