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 /starmath/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 'starmath/qa')
-rw-r--r-- | starmath/qa/cppunit/test_nodetotextvisitors.cxx | 2 | ||||
-rw-r--r-- | starmath/qa/cppunit/test_starmath.cxx | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx index b64a5849a459..3f067be4b35e 100644 --- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx +++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx @@ -49,7 +49,7 @@ struct assertion_traits<String> static std::string toString(const String& x) { OStringStream ost; - ost << rtl::OUStringToOString(x, RTL_TEXTENCODING_UTF8).getStr(); + ost << OUStringToOString(x, RTL_TEXTENCODING_UTF8).getStr(); return ost.str(); } }; diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index f493354748ee..f4bf3f1b5bec 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -126,15 +126,15 @@ void Test::tearDown() void Test::editMarker() { { - rtl::OUString sMarkedText("<?> under <?> under <?>"); + OUString sMarkedText("<?> under <?> under <?>"); m_pEditWindow->SetText(sMarkedText); m_pEditWindow->Flush(); - rtl::OUString sFinalText = m_pEditWindow->GetText(); + OUString sFinalText = m_pEditWindow->GetText(); CPPUNIT_ASSERT_MESSAGE("Should be equal text", sFinalText == sMarkedText); } { - rtl::OUString sTargetText("a under b under c"); + OUString sTargetText("a under b under c"); m_pEditWindow->SelNextMark(); m_pEditWindow->Delete(); @@ -150,12 +150,12 @@ void Test::editMarker() m_pEditWindow->InsertText("b"); m_pEditWindow->Flush(); - rtl::OUString sFinalText = m_pEditWindow->GetText(); + OUString sFinalText = m_pEditWindow->GetText(); CPPUNIT_ASSERT_MESSAGE("Should be a under b under c", sFinalText == sTargetText); } { - m_pEditWindow->SetText(rtl::OUString()); + m_pEditWindow->SetText(OUString()); m_pEditWindow->Flush(); } } @@ -189,19 +189,19 @@ void Test::editUndoRedo() { EditEngine &rEditEngine = m_xDocShRef->GetEditEngine(); - rtl::OUString sStringOne("a under b"); + OUString sStringOne("a under b"); { rEditEngine.SetText(0, sStringOne); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Strings must match", sStringOne == sFinalText); } - rtl::OUString sStringTwo("a over b"); + OUString sStringTwo("a over b"); { rEditEngine.SetText(0, sStringTwo); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Strings must match", sStringTwo == sFinalText); } @@ -210,14 +210,14 @@ void Test::editUndoRedo() { m_xDocShRef->Execute(aUndo); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Strings much match", sStringOne == sFinalText); } { m_xDocShRef->Execute(aUndo); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Must now be empty", !sFinalText.getLength()); } @@ -225,15 +225,15 @@ void Test::editUndoRedo() { m_xDocShRef->Execute(aRedo); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Strings much match", sStringOne == sFinalText); } { - rEditEngine.SetText(0, rtl::OUString()); + rEditEngine.SetText(0, OUString()); m_xDocShRef->UpdateText(); rEditEngine.ClearModifyFlag(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Must be empty", !sFinalText.getLength()); } @@ -245,11 +245,11 @@ void Test::viewZoom() EditEngine &rEditEngine = m_xDocShRef->GetEditEngine(); - rtl::OUString sStringOne("a under b"); + OUString sStringOne("a under b"); { rEditEngine.SetText(0, sStringOne); m_xDocShRef->UpdateText(); - rtl::OUString sFinalText = m_xDocShRef->GetText(); + OUString sFinalText = m_xDocShRef->GetText(); CPPUNIT_ASSERT_MESSAGE("Strings must match", sStringOne == sFinalText); } |