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 /javaunohelper | |
| 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 'javaunohelper')
| -rw-r--r-- | javaunohelper/source/vm.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx index d73a058f2348..fdcad2711a4a 100644 --- a/javaunohelper/source/vm.cxx +++ b/javaunohelper/source/vm.cxx @@ -74,13 +74,11 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith css::uno::Any arg( css::uno::makeAny( css::beans::NamedValue( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "UnoVirtualMachine" ) ), + rtl::OUString( "UnoVirtualMachine" ), css::uno::makeAny( handle ) ) ) ); return xContext->getServiceManager()->createInstanceWithArgumentsAndContext( ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.java.JavaVirtualMachine")), + "com.sun.star.java.JavaVirtualMachine"), css::uno::Sequence< css::uno::Any >( &arg, 1 ), xContext ); } @@ -90,8 +88,7 @@ css::uno::Reference< css::uno::XInterface > SingletonFactory::createInstanceWith { return xContext->getServiceManager()->createInstanceWithArgumentsAndContext( ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.java.JavaVirtualMachine")), + "com.sun.star.java.JavaVirtualMachine"), args, xContext ); } @@ -126,8 +123,7 @@ css::uno::Reference< css::uno::XComponentContext > install_vm_singleton( css::uno::Reference< css::lang::XSingleComponentFactory > xFac( new SingletonFactory( vm_access ) ); ::cppu::ContextEntry_Init entry( ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "/singletons/com.sun.star.java.theJavaVirtualMachine")), + "/singletons/com.sun.star.java.theJavaVirtualMachine"), css::uno::makeAny( xFac ), true ); return ::cppu::createComponentContext( &entry, 1, xContext ); } |