diff options
| author | Noel Grandin <noel@peralex.com> | 2013-11-14 13:13:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-11-19 10:29:30 +0200 |
| commit | 2c35fff7eca3a143d28dc75e6a73fe1101d2af77 (patch) | |
| tree | fb31b64880b06b0e2bd867aa6216ae0259c7c091 /configmgr | |
| parent | ccc297097891e62489e5d281a4ea128ec6b71361 (diff) | |
remove most use of RTL_CONSTASCII_USTRINGPARAM macro
This is largely unnecessary when working with OUString
Change-Id: I3cf4d68357a43665d01162ef4a2d5346a45da9be
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/qa/unit/test.cxx | 48 |
1 files changed, 16 insertions, 32 deletions
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index bc8f09c5f98f..2835437302e5 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -257,10 +257,8 @@ void RecursiveTest::test() { properties_ = css::uno::Reference< css::beans::XPropertySet >( test_.createUpdateAccess( - OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" - "dotuno:WebHtml"))), + OUString("/org.openoffice.UI.GenericCommands/UserInterface/Commands/" + "dotuno:WebHtml")), css::uno::UNO_QUERY_THROW); properties_->addPropertyChangeListener( OUString("Label"), this); @@ -308,10 +306,8 @@ SimpleRecursiveTest::SimpleRecursiveTest( void SimpleRecursiveTest::step() const { test_.setKey( - OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" - "dotuno:WebHtml")), + OUString("/org.openoffice.UI.GenericCommands/UserInterface/Commands/" + "dotuno:WebHtml"), OUString("Label"), css::uno::makeAny(OUString("step"))); } @@ -335,16 +331,12 @@ void CrossThreadTest::step() const stop.set(); WriterThread( stop, test_, - OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" - "dotuno:WebHtml")), + OUString("/org.openoffice.UI.GenericCommands/UserInterface/Commands/" + "dotuno:WebHtml"), OUString("Label")).join(); test_.resetKey( - OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" - "dotuno:WebHtml")), + OUString("/org.openoffice.UI.GenericCommands/UserInterface/Commands/" + "dotuno:WebHtml"), OUString("Label")); } @@ -409,20 +401,16 @@ void Test::testSetSetMemberName() OUString s; CPPUNIT_ASSERT( getKey( - OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" - ".uno:FontworkShapeType")), + OUString("/org.openoffice.UI.GenericCommands/UserInterface/Commands/" + ".uno:FontworkShapeType"), OUString("Label")) >>= s); CPPUNIT_ASSERT( s == "Fontwork Shape" ); css::uno::Reference< css::container::XNameAccess > access( createUpdateAccess( - OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/org.openoffice.UI.GenericCommands/UserInterface/" - "Commands"))), + OUString("/org.openoffice.UI.GenericCommands/UserInterface/" + "Commands")), css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNamed > member; access->getByName( @@ -438,10 +426,8 @@ void Test::testSetSetMemberName() CPPUNIT_ASSERT( getKey( - OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/org.openoffice.UI.GenericCommands/UserInterface/Commands/" - ".uno:FontworkShapeType")), + OUString("/org.openoffice.UI.GenericCommands/UserInterface/Commands/" + ".uno:FontworkShapeType"), OUString("Label")) >>= s); CPPUNIT_ASSERT( s == "Fontwork Gallery" ); @@ -451,10 +437,8 @@ void Test::testReadCommands() { css::uno::Reference< css::container::XNameAccess > access( createViewAccess( - OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/org.openoffice.UI.GenericCommands/UserInterface/" - "Commands"))), + OUString("/org.openoffice.UI.GenericCommands/UserInterface/" + "Commands")), css::uno::UNO_QUERY_THROW); css::uno::Sequence< OUString > names(access->getElementNames()); CPPUNIT_ASSERT(names.getLength() == 695); |