diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-28 06:48:43 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-28 10:56:59 +0000 |
| commit | f7aaf5c42ebe980a86abc799bffc7d504c9a1be4 (patch) | |
| tree | 03f1e6389cbbba39a4476a3db19d2f1526dfb814 | |
| parent | 34d71c5a08639f6255704be0d4a7df2b6cf6c13f (diff) | |
convert some low hanging fruit
| -rw-r--r-- | sw/inc/charfmt.hxx | 2 | ||||
| -rw-r--r-- | tools/inc/tools/stream.hxx | 2 | ||||
| -rw-r--r-- | tools/source/stream/stream.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx index f40029d7290b..4b564d7c98f8 100644 --- a/sw/inc/charfmt.hxx +++ b/sw/inc/charfmt.hxx @@ -39,7 +39,7 @@ class SW_DLLPUBLIC SwCharFmt : public SwFmt SwCharFmt *pDerivedFrom ) : SwFmt( rPool, pFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT ) {} - SwCharFmt( SwAttrPool& rPool, const String &rFmtName, + SwCharFmt( SwAttrPool& rPool, const rtl::OUString &rFmtName, SwCharFmt *pDerivedFrom ) : SwFmt( rPool, rFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT ) {} diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index 0f2456b4acb9..a8bde29558d4 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -407,7 +407,7 @@ public: sal_Bool ReadUniStringLine( String& rStr ); /// Read a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE, /// otherwise read a 16bit length prefixed sequence of bytes and convert from eSrcCharSet - String ReadUniOrByteString(rtl_TextEncoding eSrcCharSet); + rtl::OUString ReadUniOrByteString(rtl_TextEncoding eSrcCharSet); /// Write a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE, /// otherwise convert to eSrcCharSet and write a 16bit length prefixed sequence of bytes SvStream& WriteUniOrByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ); diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index b1c939a40c91..ab3703b6e381 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1379,7 +1379,7 @@ SvStream& SvStream::operator<< ( SvStream& rStream ) // ----------------------------------------------------------------------- -String SvStream::ReadUniOrByteString( rtl_TextEncoding eSrcCharSet ) +rtl::OUString SvStream::ReadUniOrByteString( rtl_TextEncoding eSrcCharSet ) { // read UTF-16 string directly from stream ? if (eSrcCharSet == RTL_TEXTENCODING_UNICODE) |