diff options
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; |