summaryrefslogtreecommitdiff
path: root/extensions/qa
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-03-19 09:22:44 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-03-19 09:00:26 +0000
commit8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch)
tree2dbddceebf0f96492adc5652697e8efce8a8ba06 /extensions/qa
parentfe8eba5faa59ddf9ee82f3eb009daac72a0ec846 (diff)
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex: s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec Reviewed-on: https://gerrit.libreoffice.org/2832 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'extensions/qa')
-rw-r--r--extensions/qa/update/test_update.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/extensions/qa/update/test_update.cxx b/extensions/qa/update/test_update.cxx
index 7d5195075ba0..5459bc5a3b5c 100644
--- a/extensions/qa/update/test_update.cxx
+++ b/extensions/qa/update/test_update.cxx
@@ -84,7 +84,7 @@ protected:
deployment::UpdateInformationEntry aEntry;
if ( aUpdateInfoEnumeration->nextElement() >>= aEntry )
{
- CPPUNIT_ASSERT( aEntry.UpdateDocument->getNodeName() == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "description" ) ) );
+ CPPUNIT_ASSERT( aEntry.UpdateDocument->getNodeName() == rtl::OUString( "description" ) );
uno::Reference< dom::XNodeList> xChildNodes = aEntry.UpdateDocument->getChildNodes();
CPPUNIT_ASSERT( xChildNodes.is() );
@@ -104,8 +104,8 @@ protected:
//uno::Reference< dom::XElement > xChildId( xChildNodes->item( 0 ), uno::UNO_QUERY );
//CPPUNIT_ASSERT( xChildId.is() );
- //CPPUNIT_ASSERT( xChildId->getNodeValue() == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LibreOffice_3.4" ) ) );
- //fprintf( stderr, "Attribute == %s\n", rtl::OUStringToOString( aEntry.UpdateDocument->getAttribute( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "test" ) ) ), RTL_TEXTENCODING_UTF8 ).getStr() );
+ //CPPUNIT_ASSERT( xChildId->getNodeValue() == rtl::OUString( "LibreOffice_3.4" ) );
+ //fprintf( stderr, "Attribute == %s\n", rtl::OUStringToOString( aEntry.UpdateDocument->getAttribute( rtl::OUString( "test" ) ), RTL_TEXTENCODING_UTF8 ).getStr() );
//fprintf( stderr, "Value == %s\n", rtl::OUStringToOString( xChildId->getNodeValue(), RTL_TEXTENCODING_UTF8 ).getStr() );
// TODO check more deeply
}
@@ -120,14 +120,14 @@ protected:
rtl::Reference< UpdateCheck > aController( UpdateCheck::get() );
if ( checkForUpdates( aInfo, m_xContext, aController->getInteractionHandler(), m_xProvider,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Linux" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "x86" ) ),
+ rtl::OUString( "Linux" ),
+ rtl::OUString( "x86" ),
m_aRepositoryList,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "111111-222222-333333-444444" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InstallSetID" ) ) ) )
+ rtl::OUString( "111111-222222-333333-444444" ),
+ rtl::OUString( "InstallSetID" ) ) )
{
CPPUNIT_ASSERT( aInfo.Sources.size() == 1 );
- CPPUNIT_ASSERT( aInfo.Sources[0].URL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "http://www.libreoffice.org/download/" ) ) );
+ CPPUNIT_ASSERT( aInfo.Sources[0].URL == rtl::OUString( "http://www.libreoffice.org/download/" ) );
}
else
CPPUNIT_FAIL( "Calling checkForUpdates() failed." );
@@ -140,11 +140,11 @@ protected:
rtl::Reference< UpdateCheck > aController( UpdateCheck::get() );
if ( checkForUpdates( aInfo, m_xContext, aController->getInteractionHandler(), m_xProvider,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Linux" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "x86" ) ),
+ rtl::OUString( "Linux" ),
+ rtl::OUString( "x86" ),
m_aRepositoryList,
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "123456-abcdef-1a2b3c-4d5e6f" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InstallSetID" ) ) ) )
+ rtl::OUString( "123456-abcdef-1a2b3c-4d5e6f" ),
+ rtl::OUString( "InstallSetID" ) ) )
{
CPPUNIT_ASSERT( aInfo.Sources.empty() );
}