diff options
Diffstat (limited to 'stoc')
-rw-r--r-- | stoc/source/corereflection/crefl.cxx | 14 | ||||
-rw-r--r-- | stoc/source/corereflection/criface.cxx | 3 | ||||
-rw-r--r-- | stoc/source/implementationregistration/implreg.cxx | 38 | ||||
-rw-r--r-- | stoc/source/invocation/invocation.cxx | 8 | ||||
-rw-r--r-- | stoc/source/invocation_adapterfactory/iafactory.cxx | 4 | ||||
-rw-r--r-- | stoc/source/javaloader/javaloader.cxx | 10 | ||||
-rw-r--r-- | stoc/source/javavm/javavm.cxx | 51 | ||||
-rw-r--r-- | stoc/source/loader/dllcomponentloader.cxx | 4 | ||||
-rw-r--r-- | stoc/source/namingservice/namingservice.cxx | 6 | ||||
-rw-r--r-- | stoc/source/registry_tdprovider/structtypedescription.cxx | 3 | ||||
-rw-r--r-- | stoc/source/registry_tdprovider/tdprovider.cxx | 8 | ||||
-rw-r--r-- | stoc/source/registry_tdprovider/tdservice.cxx | 18 | ||||
-rw-r--r-- | stoc/source/security/access_controller.cxx | 2 | ||||
-rw-r--r-- | stoc/source/security/file_policy.cxx | 2 | ||||
-rw-r--r-- | stoc/source/simpleregistry/simpleregistry.cxx | 174 | ||||
-rw-r--r-- | stoc/source/typeconv/convert.cxx | 4 |
16 files changed, 137 insertions, 212 deletions
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index eec2d87a9cbc..866c78ae0d4a 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -46,13 +46,13 @@ static const sal_Int32 CACHE_SIZE = 256; static Sequence< OUString > core_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) ); + seqNames.getArray()[0] = OUString( SERVICENAME ); return seqNames; } static OUString core_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } //__________________________________________________________________________________________________ IdlReflectionServiceImpl::IdlReflectionServiceImpl( @@ -368,7 +368,7 @@ Reference< XIdlClass > IdlReflectionServiceImpl::forType( typelib_TypeDescriptio return xRet; } throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM("IdlReflectionServiceImpl::forType() failed!") ), + OUString( "IdlReflectionServiceImpl::forType() failed!" ), (XWeak *)(OWeakObject *)this ); } @@ -382,8 +382,8 @@ const Mapping & IdlReflectionServiceImpl::getCpp2Uno() if (! _aCpp2Uno.is()) { _aCpp2Uno = Mapping( - OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ), - OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ) ); + OUString( CPPU_CURRENT_LANGUAGE_BINDING_NAME ), + OUString( UNO_LB_UNO ) ); OSL_ENSURE( _aCpp2Uno.is(), "### cannot get c++ to uno mapping!" ); if (! _aCpp2Uno.is()) { @@ -405,8 +405,8 @@ const Mapping & IdlReflectionServiceImpl::getUno2Cpp() if (! _aUno2Cpp.is()) { _aUno2Cpp = Mapping( - OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ), - OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ) ); + OUString( UNO_LB_UNO ), + OUString( CPPU_CURRENT_LANGUAGE_BINDING_NAME ) ); OSL_ENSURE( _aUno2Cpp.is(), "### cannot get uno to c++ mapping!" ); if (! _aUno2Cpp.is()) { diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index d199c9361cef..28310227beaa 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -323,9 +323,8 @@ void IdlAttributeFieldImpl::checkException( } else { throw WrappedTargetRuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "non-RuntimeException occurred when accessing an" - " interface type attribute")), + " interface type attribute"), context, e); } } diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index c2fdac4d32d3..71c1409fe8ec 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -83,21 +83,21 @@ struct StringPool OUString com_sun_star_registry_SimpleRegistry; OUString Registry; StringPool() - : sImplementationName( RTL_CONSTASCII_USTRINGPARAM( IMPLNAME ) ) - , sServiceName( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME ) ) - , TMP( RTL_CONSTASCII_USTRINGPARAM( "TMP" ) ) - , TEMP( RTL_CONSTASCII_USTRINGPARAM( "TEMP" ) ) - , slash_UNO_slash_REGISTRY_LINKS( RTL_CONSTASCII_USTRINGPARAM("/UNO/REGISTRY_LINKS")) - , slash_IMPLEMENTATIONS( RTL_CONSTASCII_USTRINGPARAM( "/IMPLEMENTATIONS" ) ) - , slash_UNO( RTL_CONSTASCII_USTRINGPARAM("/UNO")) - , slash_UNO_slash_SERVICES( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) - , slash_UNO_slash_SINGLETONS( RTL_CONSTASCII_USTRINGPARAM("/UNO/SINGLETONS")) - , slash_SERVICES( RTL_CONSTASCII_USTRINGPARAM("/SERVICES/") ) - , slash_UNO_slash_LOCATION( RTL_CONSTASCII_USTRINGPARAM("/UNO/LOCATION") ) - , slash_UNO_slash_ACTIVATOR( RTL_CONSTASCII_USTRINGPARAM("/UNO/ACTIVATOR") ) - , colon_old( RTL_CONSTASCII_USTRINGPARAM(":old")) - , com_sun_star_registry_SimpleRegistry(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.SimpleRegistry") ) - , Registry( RTL_CONSTASCII_USTRINGPARAM("Registry") ) + : sImplementationName( IMPLNAME ) + , sServiceName( SERVICENAME ) + , TMP( "TMP" ) + , TEMP( "TEMP" ) + , slash_UNO_slash_REGISTRY_LINKS( "/UNO/REGISTRY_LINKS") + , slash_IMPLEMENTATIONS( "/IMPLEMENTATIONS" ) + , slash_UNO( "/UNO") + , slash_UNO_slash_SERVICES( "/UNO/SERVICES") + , slash_UNO_slash_SINGLETONS( "/UNO/SINGLETONS") + , slash_SERVICES( "/SERVICES/" ) + , slash_UNO_slash_LOCATION( "/UNO/LOCATION" ) + , slash_UNO_slash_ACTIVATOR( "/UNO/ACTIVATOR" ) + , colon_old( ":old") + , com_sun_star_registry_SimpleRegistry("com.sun.star.registry.SimpleRegistry" ) + , Registry( "Registry" ) {} private: StringPool( const StringPool & ); @@ -1082,7 +1082,7 @@ static void prepareRegistry( if (!subKeys.getLength()) { throw InvalidRegistryException( - OUString( RTL_CONSTASCII_USTRINGPARAM( "prepareRegistry(): source registry is empty" ) ), + OUString( "prepareRegistry(): source registry is empty" ), Reference< XInterface > () ); } @@ -1568,9 +1568,9 @@ void ImplementationRegistration::prepareRegister( else { throw CannotRegisterImplementationException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "ImplementationRegistration::registerImplementation() " - "no componentcontext available to instantiate loader")), + "no componentcontext available to instantiate loader"), Reference< XInterface > () ); } } @@ -1820,7 +1820,7 @@ void ImplementationRegistration::doRegister( else { throw CannotRegisterImplementationException( - OUString( RTL_CONSTASCII_USTRINGPARAM( "ImplementationRegistration::doRegistration() component registration signaled failure" ) ), + OUString( "ImplementationRegistration::doRegistration() component registration signaled failure" ), Reference< XInterface > () ); } diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 8ec0c9ae00c9..9c2a2ab3387d 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -69,13 +69,13 @@ namespace stoc_inv static Sequence< OUString > inv_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); + seqNames.getArray()[0] = OUString(SERVICENAME); return seqNames; } static OUString inv_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } // TODO: Zentral implementieren @@ -601,7 +601,7 @@ void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value ) catch (const Exception & exc) { throw InvocationTargetException( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception occurred in setValue(): ") ) + + OUString( "exception occurred in setValue(): " ) + exc.Message, Reference< XInterface >(), makeAny( exc /* though sliced */ ) ); } } @@ -912,7 +912,7 @@ InvocationInfo SAL_CALL Invocation_Impl::getInfoForName( const OUString& aName, if( !bFound ) { throw IllegalArgumentException( - OUString( RTL_CONSTASCII_USTRINGPARAM("Unknown name, getExactName() failed!") ), + OUString( "Unknown name, getExactName() failed!" ), (XWeak *)(OWeakObject *)this, 0 ); } return aRetInfo; diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index f0f23d14cc0a..ad7dbecb8125 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -63,13 +63,13 @@ static Sequence< OUString > invadp_getSupportedServiceNames() { Sequence< OUString > seqNames(1); seqNames.getArray()[0] = - OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); + OUString(SERVICENAME); return seqNames; } static OUString invadp_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } struct hash_ptr diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index d97278d9c684..dc68d02597d7 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -135,9 +135,9 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL // get a java vm, where we can create a loader css::uno::Reference<XJavaVM> javaVM_xJavaVM( m_xComponentContext->getValueByName( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "/singletons/" - "com.sun.star.java.theJavaVirtualMachine"))), + "com.sun.star.java.theJavaVirtualMachine")), UNO_QUERY_THROW); // Use the special protocol of XJavaVM.getJavaVM: If the passed in @@ -227,7 +227,7 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL "javaloader error - no Java environment available"), css::uno::Reference<XInterface>()); // why is there no convinient contructor? - OUString sCppu_current_lb_name(RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME)); + OUString sCppu_current_lb_name(CPPU_CURRENT_LANGUAGE_BINDING_NAME); uno_getEnvironment(&pUno_environment, sCppu_current_lb_name.pData, NULL); if(!pUno_environment) throw RuntimeException(OUString( @@ -267,9 +267,9 @@ const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaL catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) { throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "jvmaccess::VirtualMachine::AttachGuard" - "::CreationException")),0); + "::CreationException"),0); } // set the service manager at the javaloader diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 78e67e9de75d..8d3da57e367c 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -636,13 +636,12 @@ JavaVirtualMachine::initialize(css::uno::Sequence< css::uno::Any > const & if (!m_xUnoVirtualMachine.is()) { throw css::lang::IllegalArgumentException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "sequence of exactly one any containing either (a) a" " com.sun.star.beans.NamedValue with Name" " \"UnoVirtualMachine\" and Value a hyper representing a" " non-null pointer to a jvmaccess:UnoVirtualMachine, or (b)" " a hyper representing a non-null pointer to a" - " jvmaccess::VirtualMachine required")), + " jvmaccess::VirtualMachine required"), static_cast< cppu::OWeakObject * >(this), 0); } m_xVirtualMachine = m_xUnoVirtualMachine->getVirtualMachine(); @@ -787,9 +786,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) //Please install a JRE and restart %PRODUCTNAME. css::java::JavaNotFoundException exc( OUString( - RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::getJavaVM failed because" - " No suitable JRE found!")), + " No suitable JRE found!"), static_cast< cppu::OWeakObject * >(this)); askForRetry(css::uno::makeAny(exc)); return css::uno::Any(); @@ -798,9 +796,9 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) { //An unexpected error occurred throw css::uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "[JavaVirtualMachine]:An unexpected error occurred" - " while searching for a Java!")), 0); + " while searching for a Java!"), 0); } } case JFW_E_INVALID_SETTINGS: @@ -811,9 +809,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) // you want to have used by %PRODUCTNAME. css::java::InvalidJavaSettingsException exc( OUString( - RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::getJavaVM failed because" - " Java settings have changed!")), + " Java settings have changed!"), static_cast< cppu::OWeakObject * >(this)); askForRetry(css::uno::makeAny(exc)); return css::uno::Any(); @@ -826,9 +823,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) //enable the use of a JRE now? css::java::JavaDisabledException exc( OUString( - RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::getJavaVM failed because" - " Java is disabled!")), + " Java is disabled!"), static_cast< cppu::OWeakObject * >(this)); if( ! askForRetry(css::uno::makeAny(exc))) return css::uno::Any(); @@ -868,9 +864,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) //and select it under Tools - Options - %PRODUCTNAME - Java. css::java::JavaVMCreationFailureException exc( OUString( - RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::getJavaVM failed because" - " Java is defective!")), + " Java is defective!"), static_cast< cppu::OWeakObject * >(this), 0); askForRetry(css::uno::makeAny(exc)); return css::uno::Any(); @@ -888,9 +883,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) //%PRODUCTNAME must be restarted. Please restart %PRODUCTNAME now. css::java::RestartRequiredException exc( OUString( - RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::getJavaVM failed because" - "Office must be restarted before Java can be used!")), + "Office must be restarted before Java can be used!"), static_cast< cppu::OWeakObject * >(this)); askForRetry(css::uno::makeAny(exc)); return css::uno::Any(); @@ -899,9 +893,9 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) //RuntimeException: error is somewhere in the java framework. //An unexpected error occurred throw css::uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "[JavaVirtualMachine]:An unexpected error occurred" - " while starting Java!")), 0); + " while starting Java!"), 0); } if (bStarted) @@ -929,9 +923,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) } catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) { throw css::uno::RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "jvmaccess::VirtualMachine::AttachGuard::" - "CreationException occurred")), + "CreationException occurred"), static_cast< cppu::OWeakObject * >(this)); } } @@ -940,9 +933,8 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) if (m_pJavaVm == 0) { throw css::uno::RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine service was initialized in a way" - " that the requested JavaVM pointer is not available")), + " that the requested JavaVM pointer is not available"), static_cast< cppu::OWeakObject * >(this)); } return css::uno::makeAny(reinterpret_cast< sal_IntPtr >(m_pJavaVm)); @@ -1010,9 +1002,9 @@ void SAL_CALL JavaVirtualMachine::registerThread() OUString(), static_cast< cppu::OWeakObject * >(this)); if (!m_xUnoVirtualMachine.is()) throw css::uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "JavaVirtualMachine::registerThread:" - " null VirtualMachine")), + " null VirtualMachine"), static_cast< cppu::OWeakObject * >(this)); GuardStack * pStack = static_cast< GuardStack * >(m_aAttachGuards.getData()); @@ -1031,9 +1023,8 @@ void SAL_CALL JavaVirtualMachine::registerThread() { throw css::uno::RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "JavaVirtualMachine::registerThread: jvmaccess::" - "VirtualMachine::AttachGuard::CreationException")), + "VirtualMachine::AttachGuard::CreationException"), static_cast< cppu::OWeakObject * >(this)); } } @@ -1047,17 +1038,17 @@ void SAL_CALL JavaVirtualMachine::revokeThread() OUString(), static_cast< cppu::OWeakObject * >(this)); if (!m_xUnoVirtualMachine.is()) throw css::uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "JavaVirtualMachine::revokeThread:" - " null VirtualMachine")), + " null VirtualMachine"), static_cast< cppu::OWeakObject * >(this)); GuardStack * pStack = static_cast< GuardStack * >(m_aAttachGuards.getData()); if (pStack == 0 || pStack->empty()) throw css::uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "JavaVirtualMachine::revokeThread:" - " no matching registerThread")), + " no matching registerThread"), static_cast< cppu::OWeakObject * >(this)); delete pStack->top(); pStack->pop(); @@ -1329,9 +1320,9 @@ void SAL_CALL JavaVirtualMachine::elementReplaced( catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) { throw css::uno::RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString( "jvmaccess::VirtualMachine::AttachGuard::" - "CreationException")), + "CreationException"), 0); } } diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index fb9ad064ffbf..5e65c20b11a7 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -59,13 +59,13 @@ namespace stoc_bootstrap Sequence< OUString > loader_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); + seqNames.getArray()[0] = OUString(SERVICENAME); return seqNames; } OUString loader_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } } diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index ed3ec3194676..d4473b32d921 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -51,13 +51,13 @@ namespace stoc_namingservice static Sequence< OUString > ns_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); + seqNames.getArray()[0] = OUString(SERVICENAME); return seqNames; } static OUString ns_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } struct equalOWString_Impl @@ -99,7 +99,7 @@ public: throw(::com::sun::star::uno::RuntimeException); static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static() { - OUString aStr( OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)) ); + OUString aStr( OUString(SERVICENAME) ); return Sequence< OUString >( &aStr, 1 ); } diff --git a/stoc/source/registry_tdprovider/structtypedescription.cxx b/stoc/source/registry_tdprovider/structtypedescription.cxx index a95a1802e173..b85b5f4c33d3 100644 --- a/stoc/source/registry_tdprovider/structtypedescription.cxx +++ b/stoc/source/registry_tdprovider/structtypedescription.cxx @@ -100,9 +100,8 @@ css::uno::Sequence< OUString > StructTypeDescription::getTypeParameters() { throw css::uno::RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "type parameter of polymorphic struct type template" - " not RT_ACCESS_INVALID/RT_REF_TYPE_PARAMETER")), + " not RT_ACCESS_INVALID/RT_REF_TYPE_PARAMETER"), static_cast< cppu::OWeakObject * >(this)); } parameters[i] = reader.getReferenceTypeName(i); diff --git a/stoc/source/registry_tdprovider/tdprovider.cxx b/stoc/source/registry_tdprovider/tdprovider.cxx index a0a6ba6309cc..9a739f0fc303 100644 --- a/stoc/source/registry_tdprovider/tdprovider.cxx +++ b/stoc/source/registry_tdprovider/tdprovider.cxx @@ -56,13 +56,13 @@ namespace stoc_bootstrap uno::Sequence< OUString > rdbtdp_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); + seqNames.getArray()[0] = OUString(SERVICENAME); return seqNames; } OUString rdbtdp_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } } @@ -94,9 +94,9 @@ class ProviderImpl public: TypeDescriptionManagerWrapper( ProviderImpl * pProvider ) : m_xTDMgr( pProvider->_xContext->getValueByName( - OUString( RTL_CONSTASCII_USTRINGPARAM( + OUString( "/singletons/com.sun.star.reflection." - "theTypeDescriptionManager") ) ), + "theTypeDescriptionManager" ) ), UNO_QUERY_THROW ), m_xThisProvider( pProvider ) {} diff --git a/stoc/source/registry_tdprovider/tdservice.cxx b/stoc/source/registry_tdprovider/tdservice.cxx index 9dda6bd54d08..926e31ad0fa1 100644 --- a/stoc/source/registry_tdprovider/tdservice.cxx +++ b/stoc/source/registry_tdprovider/tdservice.cxx @@ -374,9 +374,8 @@ void ServiceTypeDescriptionImpl::getReferences() || aReader.getFieldCount() != 0 ) throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "Service is single-interface--based but also has" - " references and/or properties" ) ), + " references and/or properties" ), static_cast< OWeakObject * >( this ) ); Reference< XTypeDescription > ifc; try @@ -395,9 +394,8 @@ void ServiceTypeDescriptionImpl::getReferences() if (resolveTypedefs(ifc)->getTypeClass() != TypeClass_INTERFACE) { throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "Single-interface--based service is not based on" - " interface type" ) ), + " interface type" ), static_cast< OWeakObject * >( this ) ); } MutexGuard guard(getMutex()); @@ -440,9 +438,8 @@ void ServiceTypeDescriptionImpl::getReferences() { throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.container." - "NoSuchElementException: " ) ) + "NoSuchElementException: " ) + e.Message, static_cast< OWeakObject * >( this ) ); } @@ -483,9 +480,8 @@ void ServiceTypeDescriptionImpl::getReferences() { throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.container." - "NoSuchElementException: " ) ) + "NoSuchElementException: " ) + e.Message, static_cast< OWeakObject * >( this ) ); } @@ -497,9 +493,8 @@ void ServiceTypeDescriptionImpl::getReferences() if ( !( aTypeDesc >>= aOptionalInterfaces[ nOI ] ) ) throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "Service 'supports' is not an" - " interface" ) ), + " interface" ), static_cast< OWeakObject * >( this ) ); nOI++; } @@ -509,9 +504,8 @@ void ServiceTypeDescriptionImpl::getReferences() if ( !( aTypeDesc >>= aMandatoryInterfaces[ nMI ] ) ) throw RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "Service 'supports' is not an" - " interface" ) ), + " interface" ), static_cast< OWeakObject * >( this ) ); nMI++; } diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 9486b7cd9e83..1adbf290791f 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -1010,7 +1010,7 @@ Reference< XInterface > SAL_CALL ac_create( Sequence< OUString > ac_getSupportedServiceNames() SAL_THROW(()) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME)); + aSNS.getArray()[0] = OUString(SERVICE_NAME); return aSNS; } //-------------------------------------------------------------------------------------------------- diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index 5050d27cef91..344b968c3063 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -575,7 +575,7 @@ Reference< XInterface > SAL_CALL filepolicy_create( Sequence< OUString > filepolicy_getSupportedServiceNames() SAL_THROW(()) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME)); + aSNS.getArray()[0] = OUString(SERVICE_NAME); return aSNS; } //-------------------------------------------------------------------------------------------------- diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index f59d5cf42f3b..e9bcef7a5d4d 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -272,9 +272,8 @@ css::registry::RegistryKeyType Key::getKeyType(OUString const & rKeyName) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getKeyType:" - " underlying RegistryKey::getKeyType() = ")) + + " underlying RegistryKey::getKeyType() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -305,9 +304,8 @@ css::registry::RegistryValueType Key::getValueType() default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getValueType:" - " underlying RegistryKey::getValueInfo() = ")) + + " underlying RegistryKey::getValueInfo() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -347,16 +345,14 @@ sal_Int32 Key::getLongValue() throw ( case REG_INVALID_VALUE: throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongValue:" - " underlying RegistryKey::getValue() = REG_INVALID_VALUE")), + " underlying RegistryKey::getValue() = REG_INVALID_VALUE"), static_cast< OWeakObject * >(this)); default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongValue:" - " underlying RegistryKey::getValue() = ")) + + " underlying RegistryKey::getValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -372,9 +368,8 @@ void Key::setLongValue(sal_Int32 value) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setLongValue:" - " underlying RegistryKey::setValue() = ")) + + " underlying RegistryKey::setValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -395,17 +390,15 @@ css::uno::Sequence< sal_Int32 > Key::getLongListValue() throw ( case REG_INVALID_VALUE: throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongListValue:" " underlying RegistryKey::getLongListValue() =" - " REG_INVALID_VALUE")), + " REG_INVALID_VALUE"), static_cast< OWeakObject * >(this)); default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongListValue:" - " underlying RegistryKey::getLongListValue() = ")) + + " underlying RegistryKey::getLongListValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -413,9 +406,8 @@ css::uno::Sequence< sal_Int32 > Key::getLongListValue() throw ( if (n > SAL_MAX_INT32) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongListValue:" - " underlying RegistryKey::getLongListValue() too large")), + " underlying RegistryKey::getLongListValue() too large"), static_cast< OWeakObject * >(this)); } css::uno::Sequence< sal_Int32 > value(static_cast< sal_Int32 >(n)); @@ -439,9 +431,8 @@ void Key::setLongListValue(css::uno::Sequence< sal_Int32 > const & seqValue) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setLongListValue:" - " underlying RegistryKey::setLongListValue() = ")) + + " underlying RegistryKey::setLongListValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -458,18 +449,16 @@ OUString Key::getAsciiValue() throw ( if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" - " underlying RegistryKey::getValueInfo() = ")) + + " underlying RegistryKey::getValueInfo() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } if (type != RG_VALUETYPE_STRING) { throw css::registry::InvalidValueException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" - " underlying RegistryKey type = ")) + + " underlying RegistryKey type = ") + OUString::number(type)), static_cast< OWeakObject * >(this)); } @@ -477,18 +466,16 @@ OUString Key::getAsciiValue() throw ( if (size == 0) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" " underlying RegistryKey size 0 cannot happen due to" - " design error")), + " design error"), static_cast< OWeakObject * >(this)); } if (size > SAL_MAX_INT32) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" - " underlying RegistryKey size too large")), + " underlying RegistryKey size too large"), static_cast< OWeakObject * >(this)); } std::vector< char > list(size); @@ -496,19 +483,17 @@ OUString Key::getAsciiValue() throw ( if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" - " underlying RegistryKey::getValue() = ")) + + " underlying RegistryKey::getValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } if (list[size - 1] != '\0') { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" " underlying RegistryKey value must be null-terminated due" - " to design error")), + " to design error"), static_cast< OWeakObject * >(this)); } OUString value; @@ -521,9 +506,8 @@ OUString Key::getAsciiValue() throw ( { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" - " underlying RegistryKey not UTF-8")), + " underlying RegistryKey not UTF-8"), static_cast< OWeakObject * >(this)); } return value; @@ -541,9 +525,8 @@ void Key::setAsciiValue(OUString const & value) { throw css::uno::RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setAsciiValue:" - " value not UTF-16")), + " value not UTF-16"), static_cast< OWeakObject * >(this)); } RegError err = key_.setValue( @@ -553,9 +536,8 @@ void Key::setAsciiValue(OUString const & value) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setAsciiValue:" - " underlying RegistryKey::setValue() = ")) + + " underlying RegistryKey::setValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -576,18 +558,16 @@ css::uno::Sequence< OUString > Key::getAsciiListValue() throw ( case REG_INVALID_VALUE: throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getAsciiListValue: underlying" - " RegistryKey::getStringListValue() = REG_INVALID_VALUE")), + " RegistryKey::getStringListValue() = REG_INVALID_VALUE"), static_cast< OWeakObject * >(this)); default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getAsciiListValue: underlying" - " RegistryKey::getStringListValue() = ")) + + " RegistryKey::getStringListValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -595,10 +575,9 @@ css::uno::Sequence< OUString > Key::getAsciiListValue() throw ( if (n > SAL_MAX_INT32) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getAsciiListValue: underlying" - " RegistryKey::getStringListValue() too large")), + " RegistryKey::getStringListValue() too large"), static_cast< OWeakObject * >(this)); } css::uno::Sequence< OUString > value(static_cast< sal_Int32 >(n)); @@ -614,10 +593,9 @@ css::uno::Sequence< OUString > Key::getAsciiListValue() throw ( { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getAsciiListValue: underlying RegistryKey not" - " UTF-8")), + " UTF-8"), static_cast< OWeakObject * >(this)); } } @@ -639,9 +617,8 @@ void Key::setAsciiListValue( { throw css::uno::RuntimeException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" - " setAsciiListValue: value not UTF-16")), + " setAsciiListValue: value not UTF-16"), static_cast< OWeakObject * >(this)); } list.push_back(utf8); @@ -658,10 +635,9 @@ void Key::setAsciiListValue( if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " setAsciiListValue: underlying" - " RegistryKey::setStringListValue() = ")) + + " RegistryKey::setStringListValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -678,18 +654,16 @@ OUString Key::getStringValue() throw ( if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" - " underlying RegistryKey::getValueInfo() = ")) + + " underlying RegistryKey::getValueInfo() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } if (type != RG_VALUETYPE_UNICODE) { throw css::registry::InvalidValueException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" - " underlying RegistryKey type = ")) + + " underlying RegistryKey type = ") + OUString::number(type)), static_cast< OWeakObject * >(this)); } @@ -698,18 +672,16 @@ OUString Key::getStringValue() throw ( if (size == 0 || (size & 1) == 1) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" " underlying RegistryKey size 0 or odd cannot happen due to" - " design error")), + " design error"), static_cast< OWeakObject * >(this)); } if (size > SAL_MAX_INT32) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" - " underlying RegistryKey size too large")), + " underlying RegistryKey size too large"), static_cast< OWeakObject * >(this)); } std::vector< sal_Unicode > list(size); @@ -717,19 +689,17 @@ OUString Key::getStringValue() throw ( if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" - " underlying RegistryKey::getValue() = ")) + + " underlying RegistryKey::getValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } if (list[size/2 - 1] != 0) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" " underlying RegistryKey value must be null-terminated due" - " to design error")), + " to design error"), static_cast< OWeakObject * >(this)); } return OUString(&list[0], static_cast< sal_Int32 >(size/2 - 1)); @@ -747,9 +717,8 @@ void Key::setStringValue(OUString const & value) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setStringValue:" - " underlying RegistryKey::setValue() = ")) + + " underlying RegistryKey::setValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -770,18 +739,16 @@ css::uno::Sequence< OUString > Key::getStringListValue() throw ( case REG_INVALID_VALUE: throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getStringListValue: underlying" - " RegistryKey::getUnicodeListValue() = REG_INVALID_VALUE")), + " RegistryKey::getUnicodeListValue() = REG_INVALID_VALUE"), static_cast< OWeakObject * >(this)); default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getStringListValue: underlying" - " RegistryKey::getUnicodeListValue() = ")) + + " RegistryKey::getUnicodeListValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -789,10 +756,9 @@ css::uno::Sequence< OUString > Key::getStringListValue() throw ( if (n > SAL_MAX_INT32) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " getStringListValue: underlying" - " RegistryKey::getUnicodeListValue() too large")), + " RegistryKey::getUnicodeListValue() too large"), static_cast< OWeakObject * >(this)); } css::uno::Sequence< OUString > value(static_cast< sal_Int32 >(n)); @@ -817,10 +783,9 @@ void Key::setStringListValue( if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key" " setStringListValue: underlying" - " RegistryKey::setUnicodeListValue() = ")) + + " RegistryKey::setUnicodeListValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -838,27 +803,24 @@ css::uno::Sequence< sal_Int8 > Key::getBinaryValue() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getBinaryValue:" - " underlying RegistryKey::getValueInfo() = ")) + + " underlying RegistryKey::getValueInfo() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } if (type != RG_VALUETYPE_BINARY) { throw css::registry::InvalidValueException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getBinaryValue:" - " underlying RegistryKey type = ")) + + " underlying RegistryKey type = ") + OUString::number(type)), static_cast< OWeakObject * >(this)); } if (size > SAL_MAX_INT32) { throw css::registry::InvalidValueException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getBinaryValue:" - " underlying RegistryKey size too large")), + " underlying RegistryKey size too large"), static_cast< OWeakObject * >(this)); } css::uno::Sequence< sal_Int8 > value(static_cast< sal_Int32 >(size)); @@ -866,9 +828,8 @@ css::uno::Sequence< sal_Int8 > Key::getBinaryValue() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getBinaryValue:" - " underlying RegistryKey::getValue() = ")) + + " underlying RegistryKey::getValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -886,9 +847,8 @@ void Key::setBinaryValue(css::uno::Sequence< sal_Int8 > const & value) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setBinaryValue:" - " underlying RegistryKey::setValue() = ")) + + " underlying RegistryKey::setValue() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -909,9 +869,8 @@ css::uno::Reference< css::registry::XRegistryKey > Key::openKey( default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key openKey:" - " underlying RegistryKey::openKey() = ")) + + " underlying RegistryKey::openKey() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -932,9 +891,8 @@ css::uno::Reference< css::registry::XRegistryKey > Key::createKey( default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key createKey:" - " underlying RegistryKey::createKey() = ")) + + " underlying RegistryKey::createKey() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -948,9 +906,8 @@ void Key::closeKey() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key closeKey:" - " underlying RegistryKey::closeKey() = ")) + + " underlying RegistryKey::closeKey() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -964,9 +921,8 @@ void Key::deleteKey(OUString const & rKeyName) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key deleteKey:" - " underlying RegistryKey::deleteKey() = ")) + + " underlying RegistryKey::deleteKey() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -982,9 +938,8 @@ Key::openKeys() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key openKeys:" - " underlying RegistryKey::openSubKeys() = ")) + + " underlying RegistryKey::openSubKeys() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -992,9 +947,8 @@ Key::openKeys() if (n > SAL_MAX_INT32) { throw css::registry::InvalidRegistryException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getKeyNames:" - " underlying RegistryKey::getKeyNames() too large")), + " underlying RegistryKey::getKeyNames() too large"), static_cast< OWeakObject * >(this)); } css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > > @@ -1015,9 +969,8 @@ css::uno::Sequence< OUString > Key::getKeyNames() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getKeyNames:" - " underlying RegistryKey::getKeyNames() = ")) + + " underlying RegistryKey::getKeyNames() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1025,9 +978,8 @@ css::uno::Sequence< OUString > Key::getKeyNames() if (n > SAL_MAX_INT32) { throw css::registry::InvalidRegistryException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getKeyNames:" - " underlying RegistryKey::getKeyNames() too large")), + " underlying RegistryKey::getKeyNames() too large"), static_cast< OWeakObject * >(this)); } css::uno::Sequence< OUString > names(static_cast< sal_Int32 >(n)); @@ -1050,9 +1002,8 @@ sal_Bool Key::createLink( case REG_DETECT_RECURSION: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key createLink:" - " underlying RegistryKey::createLink() = ")) + + " underlying RegistryKey::createLink() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); default: @@ -1068,9 +1019,8 @@ void Key::deleteLink(OUString const & rLinkName) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key deleteLink:" - " underlying RegistryKey::deleteLink() = ")) + + " underlying RegistryKey::deleteLink() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1085,9 +1035,8 @@ OUString Key::getLinkTarget(OUString const & rLinkName) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLinkTarget:" - " underlying RegistryKey::getLinkTarget() = ")) + + " underlying RegistryKey::getLinkTarget() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1103,9 +1052,8 @@ OUString Key::getResolvedName(OUString const & aKeyName) if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getResolvedName:" - " underlying RegistryKey::getResolvedName() = ")) + + " underlying RegistryKey::getResolvedName() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1134,8 +1082,7 @@ void SimpleRegistry::open( "com.sun.star.registry.SimpleRegistry.open(") + rURL + OUString( - RTL_CONSTASCII_USTRINGPARAM( - "): underlying Registry::open/create() = ")) + + "): underlying Registry::open/create() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1154,9 +1101,8 @@ void SimpleRegistry::close() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.close:" - " underlying Registry::close() = ")) + + " underlying Registry::close() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1170,9 +1116,8 @@ void SimpleRegistry::destroy() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.destroy:" - " underlying Registry::destroy() = ")) + + " underlying Registry::destroy() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1187,9 +1132,8 @@ css::uno::Reference< css::registry::XRegistryKey > SimpleRegistry::getRootKey() if (err != REG_NO_ERROR) { throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.getRootKey:" - " underlying Registry::getRootKey() = ")) + + " underlying Registry::getRootKey() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } @@ -1222,16 +1166,14 @@ void SimpleRegistry::mergeKey( case REG_MERGE_ERROR: throw css::registry::MergeConflictException( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.mergeKey:" - " underlying Registry::mergeKey() = REG_MERGE_ERROR")), + " underlying Registry::mergeKey() = REG_MERGE_ERROR"), static_cast< cppu::OWeakObject * >(this)); default: throw css::registry::InvalidRegistryException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.mergeKey:" - " underlying Registry::getRootKey/mergeKey() = ")) + + " underlying Registry::getRootKey/mergeKey() = ") + OUString::number(err)), static_cast< OWeakObject * >(this)); } diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index bc8b3cac5d4f..799bae3f8a7e 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -54,13 +54,13 @@ namespace stoc_services Sequence< OUString > tcv_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME)); + seqNames.getArray()[0] = OUString(SERVICENAME); return seqNames; } OUString tcv_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME)); + return OUString(IMPLNAME); } } |