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 /udkapi | |
| 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 'udkapi')
| -rw-r--r-- | udkapi/com/sun/star/registry/MergeConflictException.idl | 2 | ||||
| -rw-r--r-- | udkapi/com/sun/star/registry/XSimpleRegistry.idl | 15 |
2 files changed, 5 insertions, 12 deletions
diff --git a/udkapi/com/sun/star/registry/MergeConflictException.idl b/udkapi/com/sun/star/registry/MergeConflictException.idl index fdf6a35f1567..2d6ca3a42f3a 100644 --- a/udkapi/com/sun/star/registry/MergeConflictException.idl +++ b/udkapi/com/sun/star/registry/MergeConflictException.idl @@ -27,6 +27,8 @@ /** is thrown if entries of two registries are contradictory in the context of XSimpleRegistry::mergeKey()e() method. + + @deprecated as XSimpleRegistry::mergeKey is deprecated as well */ published exception MergeConflictException: com::sun::star::uno::Exception { diff --git a/udkapi/com/sun/star/registry/XSimpleRegistry.idl b/udkapi/com/sun/star/registry/XSimpleRegistry.idl index 342d2642f43c..13013a1d9e62 100644 --- a/udkapi/com/sun/star/registry/XSimpleRegistry.idl +++ b/udkapi/com/sun/star/registry/XSimpleRegistry.idl @@ -102,19 +102,10 @@ published interface XSimpleRegistry: com::sun::star::uno::XInterface boolean isReadOnly() raises( com::sun::star::registry::InvalidRegistryException ); - /** DEPRECATED: this method lacks a registry key (better than a URL). + /** merges a registry under the specified key. - merges a registry under the specified key. - - <p>If the key does not exist it will be created. Existing - keys will be overridden from keys of registry specified by - <var>aUrl</var>. - - @throws InvalidRegistryException - if the registry is not open. - - @throws MergeConflictException - if any differences occur during merging + @deprecated The merge functionality is deprecated and not implemented. Implementations will + throw a com::sun::star::RuntimeException. */ void mergeKey( [in] string aKeyName, [in] string aUrl ) |