Kaydet (Commit) cb000a71 authored tarafından Caolán McNamara's avatar Caolán McNamara

micro opts

üst 9007f723
...@@ -1288,7 +1288,7 @@ void SAL_CALL NestedRegistryImpl::open( const OUString&, sal_Bool, sal_Bool ) ...@@ -1288,7 +1288,7 @@ void SAL_CALL NestedRegistryImpl::open( const OUString&, sal_Bool, sal_Bool )
throw(InvalidRegistryException, RuntimeException) throw(InvalidRegistryException, RuntimeException)
{ {
throw InvalidRegistryException( 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 >() ); Reference< XInterface >() );
} }
...@@ -1334,7 +1334,7 @@ void SAL_CALL NestedRegistryImpl::destroy( ) ...@@ -1334,7 +1334,7 @@ void SAL_CALL NestedRegistryImpl::destroy( )
throw(InvalidRegistryException, RuntimeException) throw(InvalidRegistryException, RuntimeException)
{ {
throw InvalidRegistryException( 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 >() ); Reference< XInterface >() );
} }
......
...@@ -1928,14 +1928,14 @@ Sequence< OUString > ImplIntrospection::getSupportedServiceNames(void) throw() ...@@ -1928,14 +1928,14 @@ Sequence< OUString > ImplIntrospection::getSupportedServiceNames(void) throw()
// Helper XServiceInfo // Helper XServiceInfo
OUString ImplIntrospection::getImplementationName_Static( ) OUString ImplIntrospection::getImplementationName_Static( )
{ {
return OUString::createFromAscii( IMPLEMENTATION_NAME ); return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLEMENTATION_NAME));
} }
// ORegistryServiceManager_Static // ORegistryServiceManager_Static
Sequence< OUString > ImplIntrospection::getSupportedServiceNames_Static(void) throw() Sequence< OUString > ImplIntrospection::getSupportedServiceNames_Static(void) throw()
{ {
Sequence< OUString > aSNS( 1 ); Sequence< OUString > aSNS( 1 );
aSNS.getArray()[0] = OUString::createFromAscii( SERVICE_NAME ); aSNS.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
return aSNS; return aSNS;
} }
...@@ -3074,7 +3074,7 @@ sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey ) ...@@ -3074,7 +3074,7 @@ sal_Bool SAL_CALL component_writeInfo( void *, void * pRegistryKey )
{ {
Reference< XRegistryKey > xNewKey( Reference< XRegistryKey > xNewKey(
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) ); OUString(RTL_CONSTASCII_USTRINGPARAM("/" IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) );
const Sequence< OUString > & rSNL = const Sequence< OUString > & rSNL =
stoc_inspect::ImplIntrospection::getSupportedServiceNames_Static(); stoc_inspect::ImplIntrospection::getSupportedServiceNames_Static();
......
...@@ -543,7 +543,7 @@ static void setTimeZone(stoc_javavm::JVM * pjvm) throw() { ...@@ -543,7 +543,7 @@ static void setTimeZone(stoc_javavm::JVM * pjvm) throw() {
#endif #endif
if (!strcmp(TIMEZONE, p)) if (!strcmp(TIMEZONE, p))
pjvm->pushProp(rtl::OUString::createFromAscii("user.timezone=ECT")); pjvm->pushProp(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user.timezone=ECT")));
} }
void initVMConfiguration( void initVMConfiguration(
......
...@@ -130,7 +130,7 @@ public: ...@@ -130,7 +130,7 @@ public:
throw(::com::sun::star::uno::RuntimeException); throw(::com::sun::star::uno::RuntimeException);
static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static() static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static()
{ {
OUString aStr( OUString::createFromAscii( SERVICENAME ) ); OUString aStr( OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)) );
return Sequence< OUString >( &aStr, 1 ); return Sequence< OUString >( &aStr, 1 );
} }
......
...@@ -290,8 +290,8 @@ TypeDescriptionEnumerationImpl::nextTypeDescription() ...@@ -290,8 +290,8 @@ TypeDescriptionEnumerationImpl::nextTypeDescription()
return xTD; return xTD;
throw container::NoSuchElementException( throw container::NoSuchElementException(
rtl::OUString::createFromAscii( rtl::OUString(
"No further elements in enumeration!" ), RTL_CONSTASCII_USTRINGPARAM("No further elements in enumeration!") ),
static_cast< cppu::OWeakObject * >( this ) ); static_cast< cppu::OWeakObject * >( this ) );
} }
......
...@@ -99,8 +99,8 @@ uno::Any SAL_CALL TypeDescriptionEnumerationImpl::nextElement() ...@@ -99,8 +99,8 @@ uno::Any SAL_CALL TypeDescriptionEnumerationImpl::nextElement()
return xEnum->nextElement(); return xEnum->nextElement();
throw container::NoSuchElementException( throw container::NoSuchElementException(
rtl::OUString::createFromAscii( rtl::OUString(
"No further elements in enumeration!" ), RTL_CONSTASCII_USTRINGPARAM("No further elements in enumeration!") ),
static_cast< cppu::OWeakObject * >( this ) ); static_cast< cppu::OWeakObject * >( this ) );
} }
...@@ -122,8 +122,8 @@ TypeDescriptionEnumerationImpl::nextTypeDescription() ...@@ -122,8 +122,8 @@ TypeDescriptionEnumerationImpl::nextTypeDescription()
return xEnum->nextTypeDescription(); return xEnum->nextTypeDescription();
throw container::NoSuchElementException( throw container::NoSuchElementException(
rtl::OUString::createFromAscii( rtl::OUString(
"No further elements in enumeration!" ), RTL_CONSTASCII_USTRINGPARAM("No further elements in enumeration!") ),
static_cast< cppu::OWeakObject * >( this ) ); static_cast< cppu::OWeakObject * >( this ) );
} }
......
...@@ -222,19 +222,19 @@ css::uno::Reference< css::uno::XInterface > create( ...@@ -222,19 +222,19 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< cppu::OWeakObject * >(new Translator(context)); return static_cast< cppu::OWeakObject * >(new Translator(context));
} catch (std::bad_alloc &) { } catch (std::bad_alloc &) {
throw css::uno::RuntimeException( throw css::uno::RuntimeException(
rtl::OUString::createFromAscii("std::bad_alloc"), 0); rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0);
} }
} }
rtl::OUString getImplementationName() { rtl::OUString getImplementationName() {
return rtl::OUString::createFromAscii( return rtl::OUString(
"com.sun.star.comp.uri.ExternalUriReferenceTranslator"); RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.ExternalUriReferenceTranslator"));
} }
css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
css::uno::Sequence< rtl::OUString > s(1); css::uno::Sequence< rtl::OUString > s(1);
s[0] = rtl::OUString::createFromAscii( s[0] = rtl::OUString(
"com.sun.star.uri.ExternalUriReferenceTranslator"); RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.ExternalUriReferenceTranslator"));
return s; return s;
} }
......
...@@ -422,7 +422,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse( ...@@ -422,7 +422,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse(
throw; throw;
} catch (css::uno::Exception & e) { } catch (css::uno::Exception & e) {
throw css::lang::WrappedTargetRuntimeException( throw css::lang::WrappedTargetRuntimeException(
rtl::OUString::createFromAscii("creating service ") rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("creating service "))
+ serviceName, + serviceName,
static_cast< cppu::OWeakObject * >(this), static_cast< cppu::OWeakObject * >(this),
css::uno::makeAny(e)); //TODO: preserve type of e css::uno::makeAny(e)); //TODO: preserve type of e
...@@ -441,7 +441,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse( ...@@ -441,7 +441,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse(
uriRef = parseGeneric(scheme, schemeSpecificPart); uriRef = parseGeneric(scheme, schemeSpecificPart);
} catch (std::bad_alloc &) { } catch (std::bad_alloc &) {
throw css::uno::RuntimeException( throw css::uno::RuntimeException(
rtl::OUString::createFromAscii("std::bad_alloc"), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")),
static_cast< cppu::OWeakObject * >(this)); static_cast< cppu::OWeakObject * >(this));
} }
} }
...@@ -706,19 +706,19 @@ css::uno::Reference< css::uno::XInterface > create( ...@@ -706,19 +706,19 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< cppu::OWeakObject * >(new Factory(context)); return static_cast< cppu::OWeakObject * >(new Factory(context));
} catch (std::bad_alloc &) { } catch (std::bad_alloc &) {
throw css::uno::RuntimeException( throw css::uno::RuntimeException(
rtl::OUString::createFromAscii("std::bad_alloc"), 0); rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0);
} }
} }
rtl::OUString getImplementationName() { rtl::OUString getImplementationName() {
return rtl::OUString::createFromAscii( return rtl::OUString(
"com.sun.star.comp.uri.UriReferenceFactory"); RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.UriReferenceFactory"));
} }
css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
css::uno::Sequence< rtl::OUString > s(1); css::uno::Sequence< rtl::OUString > s(1);
s[0] = rtl::OUString::createFromAscii( s[0] = rtl::OUString(
"com.sun.star.uri.UriReferenceFactory"); RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.UriReferenceFactory"));
return s; return s;
} }
......
...@@ -449,7 +449,7 @@ Parser::parse( ...@@ -449,7 +449,7 @@ Parser::parse(
return new UrlReference(scheme, schemeSpecificPart); return new UrlReference(scheme, schemeSpecificPart);
} catch (std::bad_alloc &) { } catch (std::bad_alloc &) {
throw css::uno::RuntimeException( 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( ...@@ -467,19 +467,19 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< cppu::OWeakObject * >(new Parser); return static_cast< cppu::OWeakObject * >(new Parser);
} catch (std::bad_alloc &) { } catch (std::bad_alloc &) {
throw css::uno::RuntimeException( throw css::uno::RuntimeException(
rtl::OUString::createFromAscii("std::bad_alloc"), 0); rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0);
} }
} }
rtl::OUString getImplementationName() { rtl::OUString getImplementationName() {
return rtl::OUString::createFromAscii( return rtl::OUString(
"com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"); RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"));
} }
css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
css::uno::Sequence< rtl::OUString > s(1); css::uno::Sequence< rtl::OUString > s(1);
s[0] = rtl::OUString::createFromAscii( s[0] = rtl::OUString(
"com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"); RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript"));
return s; return s;
} }
......
...@@ -149,19 +149,19 @@ css::uno::Reference< css::uno::XInterface > create( ...@@ -149,19 +149,19 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< cppu::OWeakObject * >(new Factory(context)); return static_cast< cppu::OWeakObject * >(new Factory(context));
} catch (std::bad_alloc &) { } catch (std::bad_alloc &) {
throw css::uno::RuntimeException( throw css::uno::RuntimeException(
rtl::OUString::createFromAscii("std::bad_alloc"), 0); rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), 0);
} }
} }
rtl::OUString getImplementationName() { rtl::OUString getImplementationName() {
return rtl::OUString::createFromAscii( return rtl::OUString(
"com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory"); RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory"));
} }
css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
css::uno::Sequence< rtl::OUString > s(1); css::uno::Sequence< rtl::OUString > s(1);
s[0] = rtl::OUString::createFromAscii( s[0] = rtl::OUString(
"com.sun.star.uri.VndSunStarPkgUrlReferenceFactory"); RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.VndSunStarPkgUrlReferenceFactory"));
return s; return s;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment