summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-06-23 00:04:29 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-06-23 09:07:43 +0100
commit13b964631437cc2699148010283dcd4020d3dd47 (patch)
tree03ba61e8b3291b1826704289ce09a63d81627f66
parent41333e6a172e8efb607b9ddb7b6a85476a9f9eae (diff)
remove parse ByteString variant
-rw-r--r--sfx2/source/doc/docfile.cxx5
-rw-r--r--sfx2/source/doc/objmisc.cxx5
2 files changed, 4 insertions, 6 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 2a1bc48c0b5e..cc4b50659177 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3483,11 +3483,10 @@ void SfxMedium::CreateTempFileNoCopy()
::rtl::OUString aField;
aAny >>= aField;
- ::rtl::OString sContent = ::rtl::OUStringToOString( aField, RTL_TEXTENCODING_ASCII_US );
- ByteString sType, sSubType;
+ String sType, sSubType;
INetContentTypeParameterList aParameters;
- if( INetContentTypes::parse( sContent, sType, sSubType, &aParameters ) )
+ if (INetContentTypes::parse(aField, sType, sSubType, &aParameters))
{
const INetContentTypeParameter * pCharset = aParameters.find("charset");
if (pCharset != 0)
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index b43001e03c69..769328e14635 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1781,11 +1781,10 @@ void SfxHeaderAttributes_Impl::SetAttribute( const SvKeyValue& rKV )
}
else if( rKV.GetKey().CompareIgnoreCaseToAscii( "content-type" ) == COMPARE_EQUAL )
{
- ::rtl::OString sContent = ::rtl::OUStringToOString( aValue, RTL_TEXTENCODING_ASCII_US );
- ByteString sType, sSubType;
+ String sType, sSubType;
INetContentTypeParameterList aParameters;
- if( INetContentTypes::parse( sContent, sType, sSubType, &aParameters ) )
+ if (INetContentTypes::parse(aValue, sType, sSubType, &aParameters))
{
const INetContentTypeParameter * pCharset = aParameters.find("charset");
if (pCharset != 0)