diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-11-27 20:37:42 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-28 09:55:03 +0000 |
commit | 6f33482f8f4329b6c9874397bdb67c1b958b69c2 (patch) | |
tree | ba19bc4bff6ddbd87354f90a61615cf5f4892c5a /svx | |
parent | c95a10ca2079cdc33d09189aef0a8788eab274ff (diff) |
ByteString->rtl::OUStringToOString
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/sendreportunx.cxx | 20 | ||||
-rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/ParseContext.cxx | 4 | ||||
-rw-r--r-- | svx/source/gallery2/gallery1.cxx | 11 | ||||
-rw-r--r-- | svx/source/gallery2/galobj.cxx | 2 | ||||
-rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 3 |
6 files changed, 21 insertions, 21 deletions
diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx index b345ae6a2043..8586d497ca75 100644 --- a/svx/source/dialog/sendreportunx.cxx +++ b/svx/source/dialog/sendreportunx.cxx @@ -197,9 +197,9 @@ namespace svx{ { fprintf( fp, "[Options]\n" ); fprintf( fp, "UseProxy=%s\n", 2 == maParams.miHTTPConnectionType ? "true" : "false" ); - fprintf( fp, "ProxyServer=%s\n", ByteString( maParams.maHTTPProxyServer, RTL_TEXTENCODING_UTF8 ).GetBuffer() ); - fprintf( fp, "ProxyPort=%s\n", ByteString( maParams.maHTTPProxyPort, RTL_TEXTENCODING_UTF8 ).GetBuffer() ); - fprintf( fp, "ReturnAddress=%s\n", ByteString( GetEMailAddress(), RTL_TEXTENCODING_UTF8 ).GetBuffer() ); + fprintf( fp, "ProxyServer=%s\n", rtl::OUStringToOString( maParams.maHTTPProxyServer, RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf( fp, "ProxyPort=%s\n", rtl::OUStringToOString( maParams.maHTTPProxyPort, RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf( fp, "ReturnAddress=%s\n", rtl::OUStringToOString( GetEMailAddress(), RTL_TEXTENCODING_UTF8 ).getStr() ); fprintf( fp, "AllowContact=%s\n", IsContactAllowed() ? "true" : "false" ); fclose( fp ); } @@ -209,14 +209,14 @@ namespace svx{ bool ErrorRepSendDialog::SendReport() { - ByteString strSubject( GetDocType(), RTL_TEXTENCODING_UTF8 ); + rtl::OString strSubject(rtl::OUStringToOString(GetDocType(), RTL_TEXTENCODING_UTF8)); #if defined( LINUX ) || defined (MACOSX ) - setenv( "ERRORREPORT_SUBJECT", strSubject.GetBuffer(), 1 ); + setenv( "ERRORREPORT_SUBJECT", strSubject.getStr(), 1 ); #else - static ::rtl::OString strEnvSubject = "ERRORREPORT_SUBJECT"; + static ::rtl::OString strEnvSubject = "ERRORREPORT_SUBJECT"; strEnvSubject += "="; - strEnvSubject += strSubject.GetBuffer(); + strEnvSubject += strSubject; putenv( (char *)strEnvSubject.getStr() ); #endif @@ -225,10 +225,10 @@ namespace svx{ if ( fp ) { - ByteString strUTF8( GetUsing(), RTL_TEXTENCODING_UTF8 ); + rtl::OString strUTF8(rtl::OUStringToOString(GetUsing(), RTL_TEXTENCODING_UTF8)); - size_t nWritten = fwrite(strUTF8.GetBuffer(), 1, strUTF8.Len(), fp); - OSL_VERIFY(nWritten == strUTF8.Len()); + size_t nWritten = fwrite(strUTF8.getStr(), 1, strUTF8.getLength(), fp); + OSL_VERIFY(nWritten == static_cast<size_t>(strUTF8.getLength())); fclose( fp ); #if defined( LINUX ) || defined (MACOSX) setenv("ERRORREPORT_BODYFILE", szBodyFile, 1); diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 44ebfa22ffe1..1d039012a17a 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1797,7 +1797,7 @@ void DbPatternField::implAdjustGenericFieldSetting( const Reference< XPropertySe _rxModel->getPropertyValue( FM_PROP_EDITMASK ) >>= aEditMask; _rxModel->getPropertyValue( FM_PROP_STRICTFORMAT ) >>= bStrict; - ByteString aAsciiEditMask( aEditMask.getStr(), RTL_TEXTENCODING_ASCII_US ); + rtl::OString aAsciiEditMask(rtl::OUStringToOString(aEditMask, RTL_TEXTENCODING_ASCII_US)); static_cast< PatternField* >( m_pWindow )->SetMask( aAsciiEditMask, aLitMask ); static_cast< PatternField* >( m_pPainter )->SetMask( aAsciiEditMask, aLitMask ); diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 37eb161c10a0..f1c50decc842 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -128,9 +128,9 @@ OSystemParseContext::~OSystemParseContext() OSL_ENSURE( nIndex < m_aLocalizedKeywords.size(), "OSystemParseContext::getIntlKeywordAscii: invalid index!" ); - ByteString sKeyword; + rtl::OString sKeyword; if ( nIndex < m_aLocalizedKeywords.size() ) - sKeyword = ByteString( m_aLocalizedKeywords[nIndex], RTL_TEXTENCODING_UTF8 ); + sKeyword = rtl::OUStringToOString(m_aLocalizedKeywords[nIndex], RTL_TEXTENCODING_UTF8); return sKeyword; } diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index d4c596b3d50f..773a03e43a06 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -132,16 +132,15 @@ void GalleryThemeEntry::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ) SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ) { - rOut.WriteByteString(ByteString(rEntry.aThemeName, RTL_TEXTENCODING_UTF8)); + rOut.WriteByteString(rtl::OUStringToOString(rEntry.aThemeName, RTL_TEXTENCODING_UTF8)); - rOut.WriteByteString(ByteString(rEntry.aUIName, RTL_TEXTENCODING_UTF8)); + rOut.WriteByteString(rtl::OUStringToOString(rEntry.aUIName, RTL_TEXTENCODING_UTF8)); - rOut.WriteByteString(ByteString(String(rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8)); + rOut.WriteByteString(rtl::OUStringToOString(String(rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8)); - rOut.WriteByteString(ByteString(rEntry.aImportName, RTL_TEXTENCODING_UTF8)); + rOut.WriteByteString(rtl::OUStringToOString(rEntry.aImportName, RTL_TEXTENCODING_UTF8)); - ByteString aDummy; - rOut.WriteByteString(aDummy); + rOut.WriteByteString(rtl::OUString()); return rOut; } diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 7f84fc088229..1f03f1397b43 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -168,7 +168,7 @@ void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const String aURLWithoutDestDir = String(aURL.GetMainURL( INetURLObject::NO_DECODE )); aURLWithoutDestDir.SearchAndReplace(rDestDir, String()); - rOut.WriteByteString(ByteString(aURLWithoutDestDir, RTL_TEXTENCODING_UTF8)); + rOut.WriteByteString(rtl::OUStringToOString(aURLWithoutDestDir, RTL_TEXTENCODING_UTF8)); } // ------------------------------------------------------------------------ diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index e96375908d21..3fc611c9658b 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -548,7 +548,8 @@ String SvXMLGraphicHelper::ImplGetGraphicMimeType( const String& rFileName ) con if( ( rFileName.Len() >= 4 ) && ( rFileName.GetChar( rFileName.Len() - 4 ) == '.' ) ) { - const ByteString aExt( rFileName.Copy( rFileName.Len() - 3 ), RTL_TEXTENCODING_ASCII_US ); + const ByteString 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 ) |