slideshow/test/demoshow.cxx | 2 +-
svx/source/dialog/svxruler.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0db25d61bc3c780be4baa00916696ca5976dea95
Author: Ricardo Montania <rica...@linuxafundo.com.br>
Date: Mon Feb 25 15:36:57 2013 -0300
String::CreateFromAscii removal
Change-Id: I86a33ef14b2bcdea1655db410f36d799689a1377
Reviewed-on: https://gerrit.libreoffice.org/2402
Reviewed-by: Michael Meeks <michael.me...@suse.com>
Tested-by: Michael Meeks <michael.me...@suse.com>
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index 86f861c..11ce065 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -491,7 +491,7 @@ sal_uInt16 DemoApp::Exception( sal_uInt16 nError )
switch( nError & EXC_MAJORTYPE )
{
case EXC_RSCNOTLOADED:
- Abort( String::CreateFromAscii( "Error: could not load language
resources.\nPlease check your installation.\n" ) );
+ Abort( "Error: could not load language resources.\nPlease check
your installation.\n" );
break;
}
return 0;
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index e9b3add..117642e 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -166,7 +166,7 @@ void RulerDebugWindow::AddDebugText(const sal_Char*
pDescription, const Stri
pParent = pParent->GetParent();
pDebugWindow = new RulerDebugWindow(pParent);
}
- String sContent(String::CreateFromAscii(pDescription));
+ OUString sContent( OUString::createFromAscii(pDescription) );
sContent += rText;
sal_uInt16 nPos = pDebugWindow->GetLBox().InsertEntry(sContent);
pDebugWindow->GetLBox().SelectEntryPos(nPos);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
