diff options
Diffstat (limited to 'configmgr/source/configurationregistry.cxx')
| -rw-r--r-- | configmgr/source/configurationregistry.cxx | 134 |
1 files changed, 69 insertions, 65 deletions
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx index 1301fcf134ce..d162c430382b 100644 --- a/configmgr/source/configurationregistry.cxx +++ b/configmgr/source/configurationregistry.cxx @@ -52,6 +52,7 @@ #include <cppuhelper/weak.hxx> #include <mutex> #include <rtl/ustring.hxx> +#include <utility> #include <sal/types.h> namespace com::sun::star::util { @@ -77,14 +78,14 @@ private: virtual ~Service() override {} virtual OUString SAL_CALL getImplementationName() override - { return "com.sun.star.comp.configuration.ConfigurationRegistry"; } + { return u"com.sun.star.comp.configuration.ConfigurationRegistry"_ustr; } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override - { return { "com.sun.star.configuration.ConfigurationRegistry" }; } + { return { u"com.sun.star.configuration.ConfigurationRegistry"_ustr }; } virtual OUString SAL_CALL getURL() override; @@ -131,8 +132,8 @@ class RegistryKey: public cppu::WeakImplHelper< css::registry::XRegistryKey > { public: - RegistryKey(Service & service, css::uno::Any const & value): - service_(service), value_(value) {} + RegistryKey(Service & service, css::uno::Any value): + service_(service), value_(std::move(value)) {} private: RegistryKey(const RegistryKey&) = delete; @@ -220,7 +221,7 @@ Service::Service( try { provider_.set( context->getServiceManager()->createInstanceWithContext( - "com.sun.star.configuration.DefaultProvider", context), + u"com.sun.star.configuration.DefaultProvider"_ustr, context), css::uno::UNO_QUERY_THROW); } catch (css::uno::RuntimeException &) { throw; @@ -247,13 +248,12 @@ void Service::open(OUString const & rURL, sal_Bool bReadOnly, sal_Bool) doClose(); } css::uno::Sequence< css::uno::Any > args{ css::uno::Any( - css::beans::NamedValue("nodepath", css::uno::Any(rURL))) }; + css::beans::NamedValue(u"nodepath"_ustr, css::uno::Any(rURL))) }; try { access_ = provider_->createInstanceWithArguments( (bReadOnly - ? OUString("com.sun.star.configuration.ConfigurationAccess") - : OUString( - "com.sun.star.configuration.ConfigurationUpdateAccess")), + ? u"com.sun.star.configuration.ConfigurationAccess"_ustr + : u"com.sun.star.configuration.ConfigurationUpdateAccess"_ustr), args); } catch (css::uno::RuntimeException &) { throw; @@ -262,7 +262,7 @@ void Service::open(OUString const & rURL, sal_Bool bReadOnly, sal_Bool) throw css::lang::WrappedTargetRuntimeException( "com.sun.star.configuration.ConfigurationRegistry: open failed: " + e.Message, - static_cast< cppu::OWeakObject * >(this), anyEx ); + getXWeak(), anyEx ); } url_ = rURL; readOnly_ = bReadOnly; @@ -283,8 +283,8 @@ void Service::close() void Service::destroy() { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } css::uno::Reference< css::registry::XRegistryKey > Service::getRootKey() @@ -303,46 +303,46 @@ sal_Bool Service::isReadOnly() { void Service::mergeKey(OUString const &, OUString const &) { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } void Service::flush() { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } void Service::addFlushListener( css::uno::Reference< css::util::XFlushListener > const &) { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } void Service::removeFlushListener( css::uno::Reference< css::util::XFlushListener > const &) { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } void Service::checkValid() { if (!access_.is()) { throw css::registry::InvalidRegistryException( - "com.sun.star.configuration.ConfigurationRegistry: not valid", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not valid"_ustr, + getXWeak()); } } void Service::checkValid_RuntimeException() { if (!access_.is()) { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not valid", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not valid"_ustr, + getXWeak()); } } @@ -358,8 +358,8 @@ OUString RegistryKey::getKeyName() { return named->getName(); } throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } sal_Bool RegistryKey::isReadOnly() @@ -411,20 +411,24 @@ sal_Int32 RegistryKey::getLongValue() { std::unique_lock g(service_.mutex_); service_.checkValid(); - sal_Int32 v = 0; - if (value_ >>= v) { - return v; + sal_Int32 v1 = 0; + if (value_ >>= v1) { + return v1; + } + bool v2; + if (value_ >>= v2) { + return sal_Int32(v2); } throw css::registry::InvalidValueException( - "com.sun.star.configuration.ConfigurationRegistry", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry"_ustr, + getXWeak()); } void RegistryKey::setLongValue(sal_Int32) { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } css::uno::Sequence< sal_Int32 > RegistryKey::getLongListValue() @@ -436,15 +440,15 @@ css::uno::Sequence< sal_Int32 > RegistryKey::getLongListValue() return v; } throw css::registry::InvalidValueException( - "com.sun.star.configuration.ConfigurationRegistry", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry"_ustr, + getXWeak()); } void RegistryKey::setLongListValue(css::uno::Sequence< sal_Int32 > const &) { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } OUString RegistryKey::getAsciiValue() @@ -456,15 +460,15 @@ OUString RegistryKey::getAsciiValue() return v; } throw css::registry::InvalidValueException( - "com.sun.star.configuration.ConfigurationRegistry", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry"_ustr, + getXWeak()); } void RegistryKey::setAsciiValue(OUString const &) { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } css::uno::Sequence< OUString > RegistryKey::getAsciiListValue() @@ -476,15 +480,15 @@ css::uno::Sequence< OUString > RegistryKey::getAsciiListValue() return v; } throw css::registry::InvalidValueException( - "com.sun.star.configuration.ConfigurationRegistry", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry"_ustr, + getXWeak()); } void RegistryKey::setAsciiListValue(css::uno::Sequence< OUString > const &) { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } OUString RegistryKey::getStringValue() @@ -496,15 +500,15 @@ OUString RegistryKey::getStringValue() return v; } throw css::registry::InvalidValueException( - "com.sun.star.configuration.ConfigurationRegistry", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry"_ustr, + getXWeak()); } void RegistryKey::setStringValue(OUString const &) { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } css::uno::Sequence< OUString > RegistryKey::getStringListValue() @@ -516,16 +520,16 @@ css::uno::Sequence< OUString > RegistryKey::getStringListValue() return v; } throw css::registry::InvalidValueException( - "com.sun.star.configuration.ConfigurationRegistry", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry"_ustr, + getXWeak()); } void RegistryKey::setStringListValue( css::uno::Sequence< OUString > const &) { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } css::uno::Sequence< sal_Int8 > RegistryKey::getBinaryValue() @@ -537,15 +541,15 @@ css::uno::Sequence< sal_Int8 > RegistryKey::getBinaryValue() return v; } throw css::registry::InvalidValueException( - "com.sun.star.configuration.ConfigurationRegistry", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry"_ustr, + getXWeak()); } void RegistryKey::setBinaryValue(css::uno::Sequence< sal_Int8 > const &) { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } css::uno::Reference< css::registry::XRegistryKey > RegistryKey::openKey( @@ -567,8 +571,8 @@ css::uno::Reference< css::registry::XRegistryKey > RegistryKey::createKey( OUString const &) { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } void RegistryKey::closeKey() @@ -580,23 +584,23 @@ void RegistryKey::closeKey() void RegistryKey::deleteKey(OUString const &) { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > > RegistryKey::openKeys() { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } css::uno::Sequence< OUString > RegistryKey::getKeyNames() { throw css::uno::RuntimeException( - "com.sun.star.configuration.ConfigurationRegistry: not implemented", - static_cast< cppu::OWeakObject * >(this)); + u"com.sun.star.configuration.ConfigurationRegistry: not implemented"_ustr, + getXWeak()); } sal_Bool RegistryKey::createLink(OUString const &, OUString const &) |