summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-11-06 07:45:00 +0200
committerNoel Grandin <noel@peralex.com>2014-11-06 13:51:10 +0200
commit05050cdb23de586870bf479a9df5ced06828d498 (patch)
treea34c3bba9a921a5e9abf23d5757c15dfaea0ceac /sdext
parent8f266781a6bd6a629bce65c0f613683047c9a794 (diff)
use the new OUString::fromUtf8 method
Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfentries.cxx2
-rw-r--r--sdext/source/pdfimport/sax/emitcontext.cxx2
-rw-r--r--sdext/source/pdfimport/tree/style.cxx2
-rw-r--r--sdext/source/pdfimport/wrapper/wrapper.cxx10
4 files changed, 7 insertions, 9 deletions
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 7607058ddd9a..5fef51293c14 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -185,7 +185,7 @@ OUString PDFName::getFilteredName() const
else
aFilter.append( pStr[i] );
}
- return OStringToOUString( aFilter.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
+ return OUString::fromUtf8( aFilter.makeStringAndClear() );
}
PDFString::~PDFString()
diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx
index 0a856ea29de1..c4b91a83a88b 100644
--- a/sdext/source/pdfimport/sax/emitcontext.cxx
+++ b/sdext/source/pdfimport/sax/emitcontext.cxx
@@ -52,7 +52,7 @@ SaxEmitter::SaxEmitter( const uno::Reference< xml::sax::XDocumentHandler >& xDoc
static const char* pDir = getenv( "DBG_PDFIMPORT_DIR" );
if( pDir )
{
- OUString aStr( OStringToOUString( pDir, RTL_TEXTENCODING_UTF8 ) );
+ OUString aStr( OUString::fromUtf8( pDir ) );
OUString aFileURL;
osl_getFileURLFromSystemPath( aStr.pData, &aFileURL.pData );
OUStringBuffer aBuf( 256 );
diff --git a/sdext/source/pdfimport/tree/style.cxx b/sdext/source/pdfimport/tree/style.cxx
index 4e91dcf26a8c..e5fdf4501c2d 100644
--- a/sdext/source/pdfimport/tree/style.cxx
+++ b/sdext/source/pdfimport/tree/style.cxx
@@ -76,7 +76,7 @@ sal_Int32 StyleContainer::impl_getStyleId( const Style& rStyle, bool bSubStyle )
sal_Int32 StyleContainer::getStandardStyleId( const OString& rName )
{
PropertyMap aProps;
- aProps[ "style:family" ] = OStringToOUString( rName, RTL_TEXTENCODING_UTF8 );
+ aProps[ "style:family" ] = OUString::fromUtf8( rName );
aProps[ "style:name" ] = "standard";
Style aStyle( "style:style", aProps );
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 79d64fdf1bbf..c6e09609f6ee 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -382,7 +382,7 @@ void Parser::readChar()
// chars gobble up rest of line
m_nCharIndex = -1;
- m_pSink->drawGlyphs(OStringToOUString(aChars, RTL_TEXTENCODING_UTF8),
+ m_pSink->drawGlyphs(OUString::fromUtf8(aChars),
aRect, aUnoMatrix, fontSize);
}
@@ -600,8 +600,7 @@ void Parser::readFont()
}
// yet unknown font - get info and add to map
- FontAttributes aResult( OStringToOUString( aFontName,
- RTL_TEXTENCODING_UTF8 ),
+ FontAttributes aResult( OUString::fromUtf8( aFontName ),
nIsBold != 0,
nIsItalic != 0,
nIsUnderline != 0,
@@ -783,9 +782,8 @@ void Parser::readLink()
readDouble(aBounds.Y2);
m_pSink->hyperLink( aBounds,
- OStringToOUString( lcl_unescapeLineFeeds(
- m_aLine.copy(m_nCharIndex) ),
- RTL_TEXTENCODING_UTF8 ) );
+ OUString::fromUtf8( lcl_unescapeLineFeeds(
+ m_aLine.copy(m_nCharIndex) ) ) );
// name gobbles up rest of line
m_nCharIndex = -1;
}