diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /editeng/qa | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
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
Diffstat (limited to 'editeng/qa')
-rw-r--r-- | editeng/qa/lookuptree/lookuptree_test.cxx | 10 | ||||
-rw-r--r-- | editeng/qa/unit/core-test.cxx | 32 |
2 files changed, 21 insertions, 21 deletions
diff --git a/editeng/qa/lookuptree/lookuptree_test.cxx b/editeng/qa/lookuptree/lookuptree_test.cxx index 5cfd57804851..c8ee1ab0e558 100644 --- a/editeng/qa/lookuptree/lookuptree_test.cxx +++ b/editeng/qa/lookuptree/lookuptree_test.cxx @@ -194,25 +194,25 @@ void LookupTreeTest::test() CPPUNIT_ASSERT_EQUAL( OUString("uer"), a->suggestAutoCompletion() ); // Test unicode - OUString aQueryString = rtl::OStringToOUString( "H\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ); + OUString aQueryString = OStringToOUString( "H\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ); a->insert( aQueryString ); a->returnToRoot(); a->advance( sal_Unicode('H') ); OUString aAutocompletedString = a->suggestAutoCompletion(); - OUString aExpectedString = rtl::OStringToOUString( "\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ); + OUString aExpectedString = OStringToOUString( "\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ); CPPUNIT_ASSERT_EQUAL( aExpectedString, aAutocompletedString ); OString aUtf8String( "\xe3\x81\x82\xe3\x81\x97\xe3\x81\x9f" ); - aQueryString = rtl::OStringToOUString( aUtf8String, RTL_TEXTENCODING_UTF8 ); + aQueryString = OStringToOUString( aUtf8String, RTL_TEXTENCODING_UTF8 ); a->insert( aQueryString ); - OUString aGotoString = rtl::OStringToOUString( "\xe3\x81\x82", RTL_TEXTENCODING_UTF8 ); + OUString aGotoString = OStringToOUString( "\xe3\x81\x82", RTL_TEXTENCODING_UTF8 ); a->gotoNode( aGotoString ); aAutocompletedString = a->suggestAutoCompletion(); - aExpectedString = rtl::OStringToOUString( "\xe3\x81\x97\xe3\x81\x9f", RTL_TEXTENCODING_UTF8 ); + aExpectedString = OStringToOUString( "\xe3\x81\x97\xe3\x81\x9f", RTL_TEXTENCODING_UTF8 ); CPPUNIT_ASSERT_EQUAL( aExpectedString, aAutocompletedString ); delete a; diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index dd4711cac8fb..4881593ecc31 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -96,13 +96,13 @@ void Test::testConstruction() { EditEngine aEngine(mpItemPool); - rtl::OUString aParaText = "I am Edit Engine."; + OUString aParaText = "I am Edit Engine."; aEngine.SetText(aParaText); } namespace { -bool includes(const uno::Sequence<rtl::OUString>& rSeq, const rtl::OUString& rVal) +bool includes(const uno::Sequence<OUString>& rSeq, const OUString& rVal) { for (sal_Int32 i = 0, n = rSeq.getLength(); i < n; ++i) if (rSeq[i] == rVal) @@ -118,7 +118,7 @@ void Test::testUnoTextFields() { // DATE SvxUnoTextField aField(text::textfield::Type::DATE); - uno::Sequence<rtl::OUString> aSvcs = aField.getSupportedServiceNames(); + uno::Sequence<OUString> aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.DateTime"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -126,7 +126,7 @@ void Test::testUnoTextFields() { // URL SvxUnoTextField aField(text::textfield::Type::URL); - uno::Sequence<rtl::OUString> aSvcs = aField.getSupportedServiceNames(); + uno::Sequence<OUString> aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.URL"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -134,7 +134,7 @@ void Test::testUnoTextFields() { // PAGE SvxUnoTextField aField(text::textfield::Type::PAGE); - uno::Sequence<rtl::OUString> aSvcs = aField.getSupportedServiceNames(); + uno::Sequence<OUString> aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.PageNumber"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -142,7 +142,7 @@ void Test::testUnoTextFields() { // PAGES SvxUnoTextField aField(text::textfield::Type::PAGES); - uno::Sequence<rtl::OUString> aSvcs = aField.getSupportedServiceNames(); + uno::Sequence<OUString> aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.PageCount"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -150,7 +150,7 @@ void Test::testUnoTextFields() { // TIME SvxUnoTextField aField(text::textfield::Type::TIME); - uno::Sequence<rtl::OUString> aSvcs = aField.getSupportedServiceNames(); + uno::Sequence<OUString> aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.DateTime"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -158,7 +158,7 @@ void Test::testUnoTextFields() { // FILE SvxUnoTextField aField(text::textfield::Type::DOCINFO_TITLE); - uno::Sequence<rtl::OUString> aSvcs = aField.getSupportedServiceNames(); + uno::Sequence<OUString> aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.docinfo.Title"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -166,7 +166,7 @@ void Test::testUnoTextFields() { // TABLE SvxUnoTextField aField(text::textfield::Type::TABLE); - uno::Sequence<rtl::OUString> aSvcs = aField.getSupportedServiceNames(); + uno::Sequence<OUString> aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.SheetName"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -174,7 +174,7 @@ void Test::testUnoTextFields() { // EXTENDED TIME SvxUnoTextField aField(text::textfield::Type::EXTENDED_TIME); - uno::Sequence<rtl::OUString> aSvcs = aField.getSupportedServiceNames(); + uno::Sequence<OUString> aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.DateTime"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -182,7 +182,7 @@ void Test::testUnoTextFields() { // EXTENDED FILE SvxUnoTextField aField(text::textfield::Type::EXTENDED_FILE); - uno::Sequence<rtl::OUString> aSvcs = aField.getSupportedServiceNames(); + uno::Sequence<OUString> aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.FileName"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -190,7 +190,7 @@ void Test::testUnoTextFields() { // AUTHOR SvxUnoTextField aField(text::textfield::Type::AUTHOR); - uno::Sequence<rtl::OUString> aSvcs = aField.getSupportedServiceNames(); + uno::Sequence<OUString> aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.Author"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -198,7 +198,7 @@ void Test::testUnoTextFields() { // MEASURE SvxUnoTextField aField(text::textfield::Type::MEASURE); - uno::Sequence<rtl::OUString> aSvcs = aField.getSupportedServiceNames(); + uno::Sequence<OUString> aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.Measure"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -206,7 +206,7 @@ void Test::testUnoTextFields() { // PRESENTATION HEADER SvxUnoTextField aField(text::textfield::Type::PRESENTATION_HEADER); - uno::Sequence<rtl::OUString> aSvcs = aField.getSupportedServiceNames(); + uno::Sequence<OUString> aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.presentation.textfield.Header"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -214,7 +214,7 @@ void Test::testUnoTextFields() { // PRESENTATION FOOTER SvxUnoTextField aField(text::textfield::Type::PRESENTATION_FOOTER); - uno::Sequence<rtl::OUString> aSvcs = aField.getSupportedServiceNames(); + uno::Sequence<OUString> aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.presentation.textfield.Footer"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } @@ -222,7 +222,7 @@ void Test::testUnoTextFields() { // PRESENTATION DATE TIME SvxUnoTextField aField(text::textfield::Type::PRESENTATION_DATE_TIME); - uno::Sequence<rtl::OUString> aSvcs = aField.getSupportedServiceNames(); + uno::Sequence<OUString> aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.presentation.textfield.DateTime"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); } |