diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:22:44 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:00:26 +0000 |
| commit | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch) | |
| tree | 2dbddceebf0f96492adc5652697e8efce8a8ba06 /scripting | |
| parent | fe8eba5faa59ddf9ee82f3eb009daac72a0ec846 (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 'scripting')
| -rw-r--r-- | scripting/source/basprov/basscript.cxx | 8 | ||||
| -rw-r--r-- | scripting/source/inc/util/MiscUtils.hxx | 3 | ||||
| -rw-r--r-- | scripting/source/stringresource/stringresource.cxx | 6 |
3 files changed, 6 insertions, 11 deletions
diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx index 0d04732e4b09..b4e5de641a92 100644 --- a/scripting/source/basprov/basscript.cxx +++ b/scripting/source/basprov/basscript.cxx @@ -47,7 +47,7 @@ namespace basprov { //......................................................................... #define BASSCRIPT_PROPERTY_ID_CALLER 1 -#define BASSCRIPT_PROPERTY_CALLER ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Caller" ) ) +#define BASSCRIPT_PROPERTY_CALLER ::rtl::OUString( "Caller" ) #define BASSCRIPT_DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT @@ -192,12 +192,10 @@ namespace basprov { throw provider::ScriptFrameworkErrorException( ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "wrong number of parameters!" ) ), + "wrong number of parameters!" ), Reference< XInterface >(), m_funcName, - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "Basic" ) ), + ::rtl::OUString( "Basic" ), provider::ScriptFrameworkErrorType::NO_SUCH_SCRIPT ); } } diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx index e78071c18eee..5c7218e8f100 100644 --- a/scripting/source/inc/util/MiscUtils.hxx +++ b/scripting/source/inc/util/MiscUtils.hxx @@ -77,8 +77,7 @@ public: css::frame::XTransientDocumentsDocumentContentFactory >( xMCF->createInstanceWithContext( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ) ), + "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ), xContext ), css::uno::UNO_QUERY ); } diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 6c8bb64e5e67..967a799ce55a 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -797,8 +797,7 @@ StringResourcePersistenceImpl::~StringResourcePersistenceImpl() ::rtl::OUString StringResourcePersistenceImpl::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM - ( "com.sun.star.comp.scripting.StringResourceWithLocation") ); + return ::rtl::OUString( "com.sun.star.comp.scripting.StringResourceWithLocation"); } // ----------------------------------------------------------------------------- @@ -2690,8 +2689,7 @@ void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArgumen if ( aArguments.getLength() != 6 ) { throw RuntimeException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM - ( "XInitialization::initialize: invalid number of arguments!" ) ), + ::rtl::OUString( "XInitialization::initialize: invalid number of arguments!" ), Reference< XInterface >() ); } |