From cb000a71d4bbdd89e8f89a47e7fd14cb24f6ffdf Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 24 Oct 2010 20:47:49 +0100 Subject: micro opts --- stoc/source/defaultregistry/defaultregistry.cxx | 4 ++-- stoc/source/inspect/introspection.cxx | 6 +++--- stoc/source/javavm/javavm.cxx | 2 +- stoc/source/namingservice/namingservice.cxx | 2 +- stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx | 4 ++-- stoc/source/tdmanager/tdmgr_tdenumeration.cxx | 8 ++++---- stoc/source/uriproc/ExternalUriReferenceTranslator.cxx | 10 +++++----- stoc/source/uriproc/UriReferenceFactory.cxx | 14 +++++++------- .../uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 12 ++++++------ stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx | 10 +++++----- 10 files changed, 36 insertions(+), 36 deletions(-) (limited to 'stoc') diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index 9cf6a0c2390c..5bf2e3abb34d 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -1288,7 +1288,7 @@ void SAL_CALL NestedRegistryImpl::open( const OUString&, sal_Bool, sal_Bool ) throw(InvalidRegistryException, RuntimeException) { throw InvalidRegistryException( - OUString::createFromAscii("the 'open' method is not specified for a nested registry"), + OUString(RTL_CONSTASCII_USTRINGPARAM("the 'open' method is not specified for a nested registry")), Reference< XInterface >() ); } @@ -1334,7 +1334,7 @@ void SAL_CALL NestedRegistryImpl::destroy( ) throw(InvalidRegistryException, RuntimeException) { throw InvalidRegistryException( - OUString::createFromAscii("the 'destroy' method is not specified for a nested registry"), + OUString(RTL_CONSTASCII_USTRINGPARAM("the 'destroy' method is not specified for a nested registry")), Reference< XInterface >() ); } diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 8d60587cb080..cf0b40c974ca 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -1928,14 +1928,14 @@ Sequence< OUString > ImplIntrospection::getSupportedServiceNames(void) throw() // Helper XServiceInfo OUString ImplIntrospection::getImplementationName_Static( ) { - return OUString::createFromAscii( IMPLEMENTATION_NAME ); + return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLEMENTATION_NAME)); } // ORegistryServiceManager_Static Sequence< OUString > ImplIntrospection::getSupportedServiceNames_Static(void) throw() { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString::createFromAscii( SERVICE_NAME ); + aSNS.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME)); return aSNS; } @@ -3074,7 +3074,7 @@ sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey ) { Reference< XRegistryKey > xNewKey( reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( - OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("/" IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) ); const Sequence< OUString > & rSNL = stoc_inspect::ImplIntrospection::getSupportedServiceNames_Static(); diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index f6bf99fea773..2822dbc2a812 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -543,7 +543,7 @@ static void setTimeZone(stoc_javavm::JVM * pjvm) throw() { #endif if (!strcmp(TIMEZONE, p)) - pjvm->pushProp(rtl::OUString::createFromAscii("user.timezone=ECT")); + pjvm->pushProp(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user.timezone=ECT"))); } void initVMConfiguration( diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index a29904d6a20d..215e7c9180ae 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -130,7 +130,7 @@ public: throw(::com::sun::star::uno::RuntimeException); static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static() { - OUString aStr( OUString::createFromAscii( SERVICENAME ) ); + OUString aStr( OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)) ); return Sequence< OUString >( &aStr, 1 ); } diff --git a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx index 00799d76a3d7..3cb4ebbf82dc 100644 --- a/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx +++ b/stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx @@ -290,8 +290,8 @@ TypeDescriptionEnumerationImpl::nextTypeDescription() return xTD; throw container::NoSuchElementException( - rtl::OUString::createFromAscii( - "No further elements in enumeration!" ), + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("No further elements in enumeration!") ), static_cast< cppu::OWeakObject * >( this ) ); } diff --git a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx index 0cffdb2bdec5..a73625cf058c 100644 --- a/stoc/source/tdmanager/tdmgr_tdenumeration.cxx +++ b/stoc/source/tdmanager/tdmgr_tdenumeration.cxx @@ -99,8 +99,8 @@ uno::Any SAL_CALL TypeDescriptionEnumerationImpl::nextElement() return xEnum->nextElement(); throw container::NoSuchElementException( - rtl::OUString::createFromAscii( - "No further elements in enumeration!" ), + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("No further elements in enumeration!") ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -122,8 +122,8 @@ TypeDescriptionEnumerationImpl::nextTypeDescription() return xEnum->nextTypeDescription(); throw container::NoSuchElementException( - rtl::OUString::createFromAscii( - "No further elements in enumeration!" ), + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("No further elements in enumeration!") ), static_cast< cppu::OWeakObject * >( this ) ); } diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx index 359ae36dc2c0..1a9f65e641e1 100644 --- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx +++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx @@ -222,19 +222,19 @@ css::uno::Reference< css::uno::XInterface > create( return static_cast< cppu::OWeakObject * >(new Translator(context)); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii("std::bad_alloc"), 0); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0); } } rtl::OUString getImplementationName() { - return rtl::OUString::createFromAscii( - "com.sun.star.comp.uri.ExternalUriReferenceTranslator"); + return rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.ExternalUriReferenceTranslator")); } css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { css::uno::Sequence< rtl::OUString > s(1); - s[0] = rtl::OUString::createFromAscii( - "com.sun.star.uri.ExternalUriReferenceTranslator"); + s[0] = rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator")); return s; } diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx index 1423cc4ccad4..1d87c69ab07c 100644 --- a/stoc/source/uriproc/UriReferenceFactory.cxx +++ b/stoc/source/uriproc/UriReferenceFactory.cxx @@ -422,7 +422,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse( throw; } catch (css::uno::Exception & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString::createFromAscii("creating service ") + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("creating service ")) + serviceName, static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); //TODO: preserve type of e @@ -441,7 +441,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse( uriRef = parseGeneric(scheme, schemeSpecificPart); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii("std::bad_alloc"), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), static_cast< cppu::OWeakObject * >(this)); } } @@ -706,19 +706,19 @@ css::uno::Reference< css::uno::XInterface > create( return static_cast< cppu::OWeakObject * >(new Factory(context)); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii("std::bad_alloc"), 0); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0); } } rtl::OUString getImplementationName() { - return rtl::OUString::createFromAscii( - "com.sun.star.comp.uri.UriReferenceFactory"); + return rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.UriReferenceFactory")); } css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { css::uno::Sequence< rtl::OUString > s(1); - s[0] = rtl::OUString::createFromAscii( - "com.sun.star.uri.UriReferenceFactory"); + s[0] = rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.UriReferenceFactory")); return s; } diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx index e08e78b39b26..310f3aa318b6 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx @@ -449,7 +449,7 @@ Parser::parse( return new UrlReference(scheme, schemeSpecificPart); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii("std::bad_alloc"), 0); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0); } } @@ -467,19 +467,19 @@ css::uno::Reference< css::uno::XInterface > create( return static_cast< cppu::OWeakObject * >(new Parser); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii("std::bad_alloc"), 0); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0); } } rtl::OUString getImplementationName() { - return rtl::OUString::createFromAscii( - "com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"); + return rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript")); } css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { css::uno::Sequence< rtl::OUString > s(1); - s[0] = rtl::OUString::createFromAscii( - "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"); + s[0] = rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript")); return s; } diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx index e78dcc3a7153..1ac83724614a 100644 --- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx +++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx @@ -149,19 +149,19 @@ css::uno::Reference< css::uno::XInterface > create( return static_cast< cppu::OWeakObject * >(new Factory(context)); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii("std::bad_alloc"), 0); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0); } } rtl::OUString getImplementationName() { - return rtl::OUString::createFromAscii( - "com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory"); + return rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory")); } css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { css::uno::Sequence< rtl::OUString > s(1); - s[0] = rtl::OUString::createFromAscii( - "com.sun.star.uri.VndSunStarPkgUrlReferenceFactory"); + s[0] = rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.VndSunStarPkgUrlReferenceFactory")); return s; } -- cgit