diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-02-02 19:41:06 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-02-02 20:06:18 +0000 |
| commit | 2c961e4dc2290bb726d42047205623bcd102f046 (patch) | |
| tree | f59de750dca69c085953683630f21dee44c5d075 /udkapi | |
| parent | 537a8de72b935a406e6154a8cc55040ed521741e (diff) | |
Update the reference rdbs to libreoffice-7.5.0.3
.../master/instdir/sdk/bin/unoidl-read --published \
.../libreoffice-7.5.0.3/instdir/program/types.rdb \
>.../master/udkapi/type_reference/udkapi.idl
.../master/instdir/sdk/bin/unoidl-read --published \
.../libreoffice-7.5.0.3/instdir/program/types.rdb \
.../libreoffice-7.5.0.3/instdir/program/types/offapi.rdb \
>.../master/offapi/type_reference/offapi.idl
* plus manual fixup by re-applying offapi/type_reference/offapi.idl part of
b706b04110d9305b319689a5577746fac3e0e4c3 "[API CHANGE] offapi: clean up these
index services IDL files"
Change-Id: I5ac92f36f3952d335822c487d81efd3e9f38cd8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146510
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'udkapi')
| -rw-r--r-- | udkapi/type_reference/udkapi.idl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/udkapi/type_reference/udkapi.idl b/udkapi/type_reference/udkapi.idl index bb7670a4a166..de867416c453 100644 --- a/udkapi/type_reference/udkapi.idl +++ b/udkapi/type_reference/udkapi.idl @@ -1366,7 +1366,7 @@ module com { module registry { published exception InvalidRegistryException: ::com::sun::star::uno::Exception { }; - published exception MergeConflictException: ::com::sun::star::uno::Exception { + /** @deprecated */ published exception MergeConflictException: ::com::sun::star::uno::Exception { }; published interface XSimpleRegistry { interface ::com::sun::star::uno::XInterface; @@ -1377,7 +1377,7 @@ module com { void destroy() raises (::com::sun::star::registry::InvalidRegistryException); ::com::sun::star::registry::XRegistryKey getRootKey() raises (::com::sun::star::registry::InvalidRegistryException); boolean isReadOnly() raises (::com::sun::star::registry::InvalidRegistryException); - void mergeKey([in] string aKeyName, [in] string aUrl) raises (::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::registry::MergeConflictException); + /** @deprecated */ void mergeKey([in] string aKeyName, [in] string aUrl) raises (::com::sun::star::registry::InvalidRegistryException, ::com::sun::star::registry::MergeConflictException); }; published service DefaultRegistry { interface ::com::sun::star::registry::XSimpleRegistry; |