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 )
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 >() );
}
......
......@@ -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();
......
......@@ -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(
......
......@@ -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 );
}
......
......@@ -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 ) );
}
......
......@@ -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 ) );
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
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