diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-09-17 13:37:42 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-06-11 09:58:49 +0200 |
| commit | 25fc5f91ab7e6fd410ccd403ba19741a16eaab49 (patch) | |
| tree | 59dd98e95d4fa237fc3d118077904860d051a586 /stoc/source | |
| parent | 3ae546f97bf6c80627271c28943795175b97fdb9 (diff) | |
[API CHANGE] Deprecate css.registry.XSimpleRegistry::mergeKey
...and let its implementations just throw a RuntimeException, now that regmerge
has been removed in "[API CHANGE] Remove deprecated idlc and regmerge from the
SDK". Deprecate css.registry.MergeConflictException along with it (though
stoc/source/implementationregistration/ still uses it internally). And remove
the previously unused include/registry/writer.hxx along with the newly unused
include/registry/writer.h, RegistryTypeWriter, and RegistryTypeReader.
Change-Id: I10fd286617975dc0ef9f74460a3a3eab8060939d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123615
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'stoc/source')
| -rw-r--r-- | stoc/source/defaultregistry/defaultregistry.cxx | 10 | ||||
| -rw-r--r-- | stoc/source/simpleregistry/simpleregistry.cxx | 25 |
2 files changed, 4 insertions, 31 deletions
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index 866648439157..689aed725795 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -1169,15 +1169,9 @@ sal_Bool SAL_CALL NestedRegistryImpl::isReadOnly( ) } -void SAL_CALL NestedRegistryImpl::mergeKey( const OUString& aKeyName, const OUString& aUrl ) +void SAL_CALL NestedRegistryImpl::mergeKey( const OUString&, const OUString& ) { - Guard< Mutex > aGuard( m_mutex ); - if ( m_localReg.is() && m_localReg->isValid() ) - { - m_localReg->mergeKey(aKeyName, aUrl); - - m_state++; - } + throw css::uno::RuntimeException("css.registry.NestedRegistry::mergeKey: not implemented"); } } // namespace diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index 6291889a3733..b87310233ef2 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/registry/InvalidRegistryException.hpp> #include <com/sun/star/registry/InvalidValueException.hpp> -#include <com/sun/star/registry/MergeConflictException.hpp> #include <com/sun/star/registry/RegistryKeyType.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/registry/XSimpleRegistry.hpp> @@ -903,29 +902,9 @@ sal_Bool SimpleRegistry::isReadOnly() } void SimpleRegistry::mergeKey( - OUString const & aKeyName, OUString const & aUrl) + OUString const &, OUString const &) { - std::scoped_lock guard(mutex_); - RegistryKey root; - RegError err = registry_.openRootKey(root); - if (err == RegError::NO_ERROR) { - err = registry_.mergeKey(root, aKeyName, aUrl, false); - } - switch (err) { - case RegError::NO_ERROR: - case RegError::MERGE_CONFLICT: - break; - case RegError::MERGE_ERROR: - throw css::registry::MergeConflictException( - "com.sun.star.registry.SimpleRegistry.mergeKey:" - " underlying Registry::mergeKey() = RegError::MERGE_ERROR", - static_cast< cppu::OWeakObject * >(this)); - default: - throw css::registry::InvalidRegistryException( - "com.sun.star.registry.SimpleRegistry.mergeKey:" - " underlying Registry::getRootKey/mergeKey() = " + OUString::number(static_cast<int>(err)), - static_cast< OWeakObject * >(this)); - } + throw css::uno::RuntimeException("css.registry.SimpleRegistry::mergeKey: not implemented"); } } |