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 /sw/qa/core/layout-test.cxx | |
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 'sw/qa/core/layout-test.cxx')
-rw-r--r-- | sw/qa/core/layout-test.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/qa/core/layout-test.cxx b/sw/qa/core/layout-test.cxx index cd56bfd6234f..f055bf6a6c3c 100644 --- a/sw/qa/core/layout-test.cxx +++ b/sw/qa/core/layout-test.cxx @@ -56,7 +56,7 @@ class SwLayoutTest : public test::BootstrapFixture, public unotest::MacrosTest public: SwLayoutTest(); - void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath); + void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath); virtual void setUp(); virtual void tearDown(); @@ -71,13 +71,13 @@ public: private: uno::Reference<uno::XInterface> m_xWriterComponent; - ::rtl::OUString m_aBaseString; + OUString m_aBaseString; }; -void SwLayoutTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath) +void SwLayoutTest::createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath) { - rtl::OUString aSep("/"); - rtl::OUStringBuffer aBuffer( getSrcRootURL() ); + OUString aSep("/"); + OUStringBuffer aBuffer( getSrcRootURL() ); aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension); aBuffer.append(aSep).append(aFileBase).append(aFileExtension); rFilePath = aBuffer.makeStringAndClear(); @@ -85,9 +85,9 @@ void SwLayoutTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUSt void SwLayoutTest::test() { - rtl::OUString aFilePath; - rtl::OUString aFileBase("test."); - rtl::OUString aExtension("odt"); + OUString aFilePath; + OUString aFileBase("test."); + OUString aExtension("odt"); createFileURL(aFileBase, aExtension, aFilePath); uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFilePath, "com.sun.star.text.TextDocument"); CPPUNIT_ASSERT(xComponent.is()); @@ -106,7 +106,7 @@ void SwLayoutTest::setUp() // This is a bit of a fudge, we do this to ensure that SwGlobals::ensure, // which is a private symbol to us, gets called m_xWriterComponent = - getMultiServiceFactory()->createInstance(rtl::OUString( + getMultiServiceFactory()->createInstance(OUString( "com.sun.star.comp.Writer.TextDocument")); CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xWriterComponent.is()); mxDesktop = com::sun::star::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ); |