From 1946794ae09ba732022fe6a74ea45e304ab70b84 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Sun, 7 Apr 2013 12:06:47 +0200 Subject: mass removal of rtl:: prefixes for O(U)String* Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09 --- basic/qa/cppunit/basic_coverage.cxx | 2 +- basic/qa/cppunit/basictest.hxx | 2 +- basic/qa/cppunit/test_append.cxx | 4 ++-- basic/qa/cppunit/test_nested_struct.cxx | 18 +++++++++--------- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'basic/qa') diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx index 56b9ab6a8412..073653b061ae 100644 --- a/basic/qa/cppunit/basic_coverage.cxx +++ b/basic/qa/cppunit/basic_coverage.cxx @@ -77,7 +77,7 @@ void Coverage::test_failed() void Coverage::test_success() { m_nb_tests_ok += 1; - fprintf(stderr,"%s,PASS\n", rtl::OUStringToOString( m_sCurrentTest, RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf(stderr,"%s,PASS\n", OUStringToOString( m_sCurrentTest, RTL_TEXTENCODING_UTF8 ).getStr() ); } void Coverage::run_test(OUString sFileURL) diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx index c828f25fb42b..25ed568ce49f 100644 --- a/basic/qa/cppunit/basictest.hxx +++ b/basic/qa/cppunit/basictest.hxx @@ -152,7 +152,7 @@ IMPL_LINK( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/) { fprintf(stderr,"(%d:%d)\n", StarBASIC::GetLine(), StarBASIC::GetCol1()); - fprintf(stderr,"Basic error: %s\n", rtl::OUStringToOString( StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() ); + fprintf(stderr,"Basic error: %s\n", OUStringToOString( StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() ); mbError = true; return 0; } diff --git a/basic/qa/cppunit/test_append.cxx b/basic/qa/cppunit/test_append.cxx index e3d9f6b6704f..ff6a56080bdc 100644 --- a/basic/qa/cppunit/test_append.cxx +++ b/basic/qa/cppunit/test_append.cxx @@ -32,7 +32,7 @@ namespace CPPUNIT_TEST_SUITE_END(); }; -rtl::OUString sTestEnableRuntime( +OUString sTestEnableRuntime( "Function doUnitTest as Integer\n" "Dim Enable as Integer\n" "Enable = 1\n" @@ -41,7 +41,7 @@ rtl::OUString sTestEnableRuntime( "End Function\n" ); -rtl::OUString sTestDimEnable( +OUString sTestDimEnable( "Sub doUnitTest\n" "Dim Enable as String\n" "End Sub\n" diff --git a/basic/qa/cppunit/test_nested_struct.cxx b/basic/qa/cppunit/test_nested_struct.cxx index 8c7fabcdec85..47bd726bd22c 100644 --- a/basic/qa/cppunit/test_nested_struct.cxx +++ b/basic/qa/cppunit/test_nested_struct.cxx @@ -53,7 +53,7 @@ namespace // tests the new behaviour, we should be able to // directly modify the value of the nested 'HorizontalLine' struct -rtl::OUString sTestSource1( +OUString sTestSource1( "Function doUnitTest() as Integer\n" "Dim b0 as new \"com.sun.star.table.TableBorder\"\n" "b0.HorizontalLine.OuterLineWidth = 9\n" @@ -61,7 +61,7 @@ rtl::OUString sTestSource1( "End Function\n" ); -rtl::OUString sTestSource1Alt( +OUString sTestSource1Alt( "Function doUnitTest() as Object\n" "Dim b0 as new \"com.sun.star.table.TableBorder\"\n" "b0.HorizontalLine.OuterLineWidth = 9\n" @@ -75,7 +75,7 @@ rtl::OUString sTestSource1Alt( // b) cloning the new instance with the value of b0.HorizontalLine // c) modifying the new instance // d) setting b0.HorizontalLine with the value of the new instance -rtl::OUString sTestSource2( +OUString sTestSource2( "Function doUnitTest()\n" "Dim b0 as new \"com.sun.star.table.TableBorder\", l as new \"com.sun.star.table.BorderLine\"\n" "l = b0.HorizontalLine\n" @@ -85,7 +85,7 @@ rtl::OUString sTestSource2( "End Function\n" ); -rtl::OUString sTestSource2Alt( +OUString sTestSource2Alt( "Function doUnitTest()\n" "Dim b0 as new \"com.sun.star.table.TableBorder\", l as new \"com.sun.star.table.BorderLine\"\n" "l = b0.HorizontalLine\n" @@ -99,7 +99,7 @@ rtl::OUString sTestSource2Alt( // a reference copy of b0.HorizontalLine, each one should have an // OuterLineWidth of 4 & 9 respectively and we should be returning // 13 the sum of the two ( hopefully unique values if we haven't copied by reference ) -rtl::OUString sTestSource3( +OUString sTestSource3( "Function doUnitTest()\n" "Dim b0 as new \"com.sun.star.table.TableBorder\"\n" "l = b0.HorizontalLine\n" @@ -110,7 +110,7 @@ rtl::OUString sTestSource3( "End Function\n" ); -rtl::OUString sTestSource3Alt( +OUString sTestSource3Alt( "Function doUnitTest()\n" "Dim b0 as new \"com.sun.star.table.TableBorder\"\n" "l = b0.HorizontalLine\n" @@ -126,7 +126,7 @@ rtl::OUString sTestSource3Alt( // nearly the same as above but this time for a fixed type // variable -rtl::OUString sTestSource4( +OUString sTestSource4( "Function doUnitTest()\n" "Dim b0 as new \"com.sun.star.table.TableBorder\", l as new \"com.sun.star.table.BorderLine\"\n" "l = b0.HorizontalLine\n" @@ -137,7 +137,7 @@ rtl::OUString sTestSource4( "End Function\n" ); -rtl::OUString sTestSource4Alt( +OUString sTestSource4Alt( "Function doUnitTest()\n" "Dim b0 as new \"com.sun.star.table.TableBorder\", l as new \"com.sun.star.table.BorderLine\"\n" "l = b0.HorizontalLine\n" @@ -156,7 +156,7 @@ rtl::OUString sTestSource4Alt( // in the debugger shows the expected values ) // We need to additionally check the actual uno struct to see if the // changes made are *really* reflected in the object -rtl::OUString sTestSource5( +OUString sTestSource5( "Function doUnitTest() as Object\n" "Dim aWinDesc as new \"com.sun.star.awt.WindowDescriptor\"\n" "Dim aRect as new \"com.sun.star.awt.Rectangle\"\n" -- cgit