From bccf34c19ae022b67565e212fa4ec0d5213947de Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 2 Jul 2012 16:02:38 +0100 Subject: ditch String::CreateFromAscii Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691 --- vcl/source/app/dbggui.cxx | 2 +- vcl/source/control/button.cxx | 2 +- vcl/source/gdi/pdfwriter_impl.cxx | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'vcl') diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index fcf5a4c6e4ae..5603d4cefa34 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -584,7 +584,7 @@ long DbgWindow::PreNotify( NotifyEvent& rNEvt ) if ( rCommand.GetCommand() == COMMAND_CONTEXTMENU ) { PopupMenu aMenu; - aMenu.InsertItem( 1, String::CreateFromAscii( "copy to clipboard" ) ); + aMenu.InsertItem( 1, rtl::OUString("copy to clipboard") ); Point aPos; if ( rCommand.IsMouseEvent() ) diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 57f50f41314d..6d5a8f9d8e73 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -156,7 +156,7 @@ XubString Button::GetStandardText( StandardButtonType eButton ) // ok / cancel so add this only for Unix #ifdef UNX if( nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL ) - aText.Insert( String::CreateFromAscii("~"), 0 ); + aText.Insert( rtl::OUString("~"), 0 ); #endif } else diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 7dbf5706272b..8039ec0b7eac 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2261,8 +2261,8 @@ inline const ImplPdfBuiltinFontData* GetPdfFontData( const PhysicalFontFace* pFo static ImplDevFontAttributes GetDevFontAttributes( const PDFWriterImpl::BuiltinFont& rBuiltin ) { ImplDevFontAttributes aDFA; - aDFA.maName = String::CreateFromAscii( rBuiltin.m_pName ); - aDFA.maStyleName = String::CreateFromAscii( rBuiltin.m_pStyleName ); + aDFA.maName = rtl::OUString::createFromAscii( rBuiltin.m_pName ); + aDFA.maStyleName = rtl::OUString::createFromAscii( rBuiltin.m_pStyleName ); aDFA.meFamily = rBuiltin.m_eFamily; aDFA.mbSymbolFlag = (rBuiltin.m_eCharSet != RTL_TEXTENCODING_MS_1252 ); aDFA.mePitch = rBuiltin.m_ePitch; @@ -8260,7 +8260,7 @@ void PDFWriterImpl::drawStrikeoutChar( const Point& rPos, long nWidth, FontStrik //See qadevOOo/testdocs/StrikeThrough.odt for examples if you need //to tweak this - String aStrikeoutChar = String::CreateFromAscii( eStrikeout == STRIKEOUT_SLASH ? "/" : "X" ); + rtl::OUString aStrikeoutChar( eStrikeout == STRIKEOUT_SLASH ? "/" : "X" ); String aStrikeout = aStrikeoutChar; while( m_pReferenceDevice->GetTextWidth( aStrikeout ) < nWidth ) aStrikeout.Append( aStrikeout ); -- cgit