diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-27 07:00:28 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-27 23:00:05 -0600 |
| commit | ae0fa7cc62e1f57d22e68b2ef45086aeb1dfe41c (patch) | |
| tree | e3047e9be982840f258498d2195074508b3893e1 /svtools | |
| parent | OUString has a matchIgnoreAsciiCase but no compareTo version of it (diff) | |
| download | core-ae0fa7cc62e1f57d22e68b2ef45086aeb1dfe41c.tar.gz core-ae0fa7cc62e1f57d22e68b2ef45086aeb1dfe41c.zip | |
String=>OUString in svl's inettype and fall-out
Change-Id: I7d64d117183738b86d1869ed629d73675de9c679
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/DocumentInfoPreview.cxx | 13 | ||||
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index b538cbad4a08..379355b28d65 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -91,11 +91,14 @@ void ODocumentInfoPreview::fill( insertNonempty( DI_SIZE, CreateExactSizeText(utl::UCBContentHelper::GetSize(rURL))); INetContentType eTypeID = INetContentTypes::GetContentTypeFromURL(rURL); - insertNonempty( - DI_MIMETYPE, - (eTypeID == CONTENT_TYPE_APP_OCTSTREAM - ? SvFileInformationManager::GetDescription(INetURLObject(rURL)) - : INetContentTypes::GetPresentation(eTypeID, m_aLocale))); + if(eTypeID == CONTENT_TYPE_APP_OCTSTREAM) + { + insertNonempty( DI_MIMETYPE, SvFileInformationManager::GetDescription(INetURLObject(rURL))); + } + else + { + insertNonempty( DI_MIMETYPE, INetContentTypes::GetPresentation(eTypeID, m_aLocale)); + } } // User-defined (custom) properties: diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 5fae26d89198..68232e5db2a4 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -2247,19 +2247,16 @@ bool HTMLParser::ParseMetaOptions( rtl_TextEncoding HTMLParser::GetEncodingByMIME( const String& rMime ) { - String sType; - String sSubType; + OUString sType; + OUString sSubType; INetContentTypeParameterList aParameters; if (INetContentTypes::parse(rMime, sType, sSubType, &aParameters)) { - const INetContentTypeParameter * pCharset - = aParameters.find("charset"); + const INetContentTypeParameter * pCharset = aParameters.find("charset"); if (pCharset != 0) { - rtl::OString sValue(rtl::OUStringToOString(pCharset->m_sValue, - RTL_TEXTENCODING_ASCII_US)); - return GetExtendedCompatibilityTextEncoding( - rtl_getTextEncodingFromMimeCharset( sValue.getStr() ) ); + OString sValue(rtl::OUStringToOString(pCharset->m_sValue, RTL_TEXTENCODING_ASCII_US)); + return GetExtendedCompatibilityTextEncoding( rtl_getTextEncodingFromMimeCharset( sValue.getStr() ) ); } } return RTL_TEXTENCODING_DONTKNOW; |