[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>

4 files changed, 0 insertions, 604 deletions

diff --git a/include/registry/refltype.hxx b/include/registry/refltype.hxx
index 0ca5803cd11c..5278e37c01b5 100644
--- a/include/registry/refltype.hxx
+++ b/include/registry/refltype.hxx
@@ -23,17 +23,6 @@
 #include <registry/types.hxx>
 #include <sal/types.h>
 
-/** specifies the type source of a binary type blob.
-
-    Currently only RT_UNO_IDL type is used.
- */
-enum RTTypeSource
-{
-    RT_UNO_IDL,
-    RT_CORBA_IDL,
-    RT_JAVA
-};
-
 /** specifies a helper class for const values.
 
     This class is used for easy handling of constants or enum values
@@ -55,20 +44,6 @@ public:
     }
 };
 
-/** deprecated.
-
-    An earlier version of UNO used a unique identifier for interfaces. In the
-    current version of UNO this uik was eliminated and this type is no longer used.
- */
-struct RTUik
-{
-    sal_uInt32 m_Data1;
-    sal_uInt16 m_Data2;
-    sal_uInt16 m_Data3;
-    sal_uInt32 m_Data4;
-    sal_uInt32 m_Data5;
-};
-
 /// specifies the calling convention for type reader/writer api
 #define TYPEREG_CALLTYPE SAL_CALL
 
diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx
index b98b1e936a4f..ccc19c52ad9a 100644
--- a/include/registry/registry.hxx
+++ b/include/registry/registry.hxx
@@ -40,7 +40,6 @@ struct Registry_Api
     RegError    (REGISTRY_CALLTYPE *openRegistry)       (rtl_uString*, RegHandle*, RegAccessMode);
     RegError    (REGISTRY_CALLTYPE *closeRegistry)      (RegHandle);
     RegError    (REGISTRY_CALLTYPE *destroyRegistry)    (RegHandle, rtl_uString*);
-    RegError    (REGISTRY_CALLTYPE *mergeKey)           (RegHandle, RegKeyHandle, rtl_uString*, rtl_uString*, sal_Bool, sal_Bool);
     void        (REGISTRY_CALLTYPE *acquireKey)         (RegKeyHandle);
     void        (REGISTRY_CALLTYPE *releaseKey)         (RegKeyHandle);
     sal_Bool    (REGISTRY_CALLTYPE *isKeyReadOnly)      (RegKeyHandle);
@@ -154,25 +153,6 @@ public:
     */
     inline RegError destroy(const OUString& registryName);
 
-    /** merges the registry information of the specified key with the registry
-        information of the specified file.
-
-        All existing keys will be extended and existing key values will be overwritten.
-        @param  rKey references a currently open key. The key which information is merged by this
-                     function is a subkey of this key
-        @param  keyName specifies the name of the key which will be merged.
-                        If keyName is an empty string the registry information under the key specified
-                        by rKey is merged with the information from the specified file.
-        @param  regFileName specifies the file containing the registry information.
-        @param  bReport if TRUE the function reports warnings on stdout if a key already exists.
-        @return RegError::NO_ERROR if succeeds else an error code. If it returns an error the registry will
-                restore the state before merging.
-    */
-    inline RegError mergeKey(RegistryKey& rKey,
-                                const OUString& keyName,
-                                const OUString& regFileName,
-                                bool bReport);
-
     friend class RegistryKey;
     friend class RegistryKeyArray;
     friend class RegistryKeyNames;
@@ -1050,10 +1030,4 @@ inline RegError Registry::destroy(const OUString& registryName)
         return ret;
     }
 
-inline RegError Registry::mergeKey(RegistryKey& rKey,
-                                         const OUString& keyName,
-                                         const OUString& regFileName,
-                                         bool bReport)
-    {  return m_pApi->mergeKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData, false/*bWarnings*/, bReport); }
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/registry/writer.h b/include/registry/writer.h
deleted file mode 100644
index 8f07437c5a7a..000000000000
--- a/include/registry/writer.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_REGISTRY_WRITER_H
-#define INCLUDED_REGISTRY_WRITER_H
-
-#include <registry/regdllapi.h>
-#include <registry/types.hxx>
-#include <registry/version.h>
-
-#include <rtl/ustring.h>
-#include <sal/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
-   Creates a type writer working on a binary blob that represents a UNOIDL type.
-
-   <p>Operations on a returned handle are not multi-thread&ndash;safe.</p>
-
-   @param version the version of the created type writer; must not be negative
-
-   @param documentation the documentation; must not be null
-
-   @param fileName the file name; must not be null (deprecated, use an empty string)
-
-   @param typeClass the type class of the created type writer
-
-   @param published whether the created type writer is published; for a type
-   class that cannot be published, this should be false
-
-   @param typeName the type name of the created type writer; must not be null
-
-   @param superTypeCount the number of super types of the created type writer
-
-   @param fieldCount the number of fields of the created type writer
-
-   @param methodCount the number of methods of the created type writer
-
-   @param referenceCount the number of references of the created type writer
-
-   @return a handle on the type writer; if an out-of-memory condition occurs,
-   null is returned, and no type writer is created
-
-   @since UDK 3.2.0
- */
-REG_DLLPUBLIC void * typereg_writer_create(
-    typereg_Version version, rtl_uString const * documentation,
-    rtl_uString const * fileName, RTTypeClass typeClass, sal_Bool published,
-    rtl_uString const * typeName, sal_uInt16 superTypeCount,
-    sal_uInt16 fieldCount, sal_uInt16 methodCount, sal_uInt16 referenceCount)
-    SAL_THROW_EXTERN_C();
-
-/**
-   Destroys a type writer.
-
-   @param handle a handle on a type writer obtained from a call to
-   <code>typereg_writer_create</code>; must not be null
-
-   @since UDK 3.2.0
- */
-REG_DLLPUBLIC void typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C();
-
-/**
-   Sets the type name of a super type of a type writer.
-
-   @param handle a handle on a type writer; must not be null
-
-   @param index a valid index into the range of super types of the given type
-   writer
-
-   @param typeName the super type name; must not be null
-
-   @return false iff an out-of-memory condition occurred, in which case the type
-   writer is not modified
-
-   @since UDK 3.2.0
- */
-REG_DLLPUBLIC sal_Bool typereg_writer_setSuperTypeName(
-    void const * handle, sal_uInt16 index, rtl_uString const * typeName)
-        SAL_THROW_EXTERN_C();
-
-/**
-   Sets the data of a field of a type writer.
-
-   @param handle a handle on a type writer; must not be null
-
-   @param index a valid index into the range of fields of the given type writer
-
-   @param documentation the documentation of the field; must not be null
-
-   @param fileName the file name of the field; must not be null (deprecated, use an empty string)
-
-   @param flags the flags of the field
-
-   @param name the name of the field; must not be null
-
-   @param typeName the type name of the field; must not be null
-
-   @param valueType the type of the value of the field
-
-   @param valueValue the value of the value of the field
-
-   @return false iff an out-of-memory condition occurred, in which case the type
-   writer is not modified
-
-   @since UDK 3.2.0
- */
-REG_DLLPUBLIC sal_Bool typereg_writer_setFieldData(
-    void * handle, sal_uInt16 index, rtl_uString const * documentation,
-    rtl_uString const * fileName, RTFieldAccess flags, rtl_uString const * name,
-    rtl_uString const * typeName, RTValueType valueType,
-    RTConstValueUnion valueValue)
-    SAL_THROW_EXTERN_C();
-
-/**
-   Sets the data of a method of a type writer.
-
-   @param handle a handle on a type writer; must not be null
-
-   @param index a valid index into the range of methods of the given type writer
-
-   @param documentation the documentation of the method; must not be null
-
-   @param flags the flags of the method
-
-   @param name the name of the method; must not be null
-
-   @param returnTypeName the return type name of the method; must not be null
-
-   @param parameterCount the number of parameters of the method
-
-   @param exceptionCount the number of exceptions of the method
-
-   @return false iff an out-of-memory condition occurred, in which case the type
-   writer is not modified
-
-   @since UDK 3.2.0
- */
-REG_DLLPUBLIC sal_Bool typereg_writer_setMethodData(
-    void * handle, sal_uInt16 index, rtl_uString const * documentation,
-    RTMethodMode flags, rtl_uString const * name,
-    rtl_uString const * returnTypeName, sal_uInt16 parameterCount,
-    sal_uInt16 exceptionCount)
-    SAL_THROW_EXTERN_C();
-
-/**
-   Sets the data of a parameter of a method of a type writer.
-
-   @param handle a handle on a type writer; must not be null
-
-   @param methodIndex a valid index into the range of methods of the given type
-   writer
-
-   @param parameterIndex a valid index into the range of parameters of the given
-   method
-
-   @param flags the flags of the parameter
-
-   @param name the name of the parameter; must not be null
-
-   @param typeName the type name of the parameter; must not be null
-
-   @return false iff an out-of-memory condition occurred, in which case the type
-   writer is not modified
-
-   @since UDK 3.2.0
- */
-REG_DLLPUBLIC sal_Bool typereg_writer_setMethodParameterData(
-    void const * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
-    RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName)
-    SAL_THROW_EXTERN_C();
-
-/**
-   Sets an exception type name of a method of a type writer.
-
-   @param handle a handle on a type writer; must not be null
-
-   @param methodIndex a valid index into the range of methods of the given type
-   writer
-
-   @param exceptionIndex a valid index into the range of exceptions of the given
-   method
-
-   @param typeName the exception type name; must not be null
-
-   @return false iff an out-of-memory condition occurred, in which case the type
-   writer is not modified
-
-   @since UDK 3.2.0
- */
-REG_DLLPUBLIC sal_Bool typereg_writer_setMethodExceptionTypeName(
-    void const * handle, sal_uInt16 methodIndex, sal_uInt16 exceptionIndex,
-    rtl_uString const * typeName)
-    SAL_THROW_EXTERN_C();
-
-/**
-   Sets the data of a reference of a type writer.
-
-   @param handle a handle on a type writer; must not be null
-
-   @param index a valid index into the range of references of the given type
-   writer
-
-   @param documentation the documentation of the reference; must not be null
-
-   @param sort the sort of the reference
-
-   @param flags the flags of the reference
-
-   @param typeName the type name of the reference; must not be null
-
-   @return false iff an out-of-memory condition occurred, in which case the type
-   writer is not modified
-
-   @since UDK 3.2.0
- */
-REG_DLLPUBLIC sal_Bool typereg_writer_setReferenceData(
-    void * handle, sal_uInt16 index, rtl_uString const * documentation,
-    RTReferenceType sort, RTFieldAccess flags, rtl_uString const * typeName)
-    SAL_THROW_EXTERN_C();
-
-/**
-   Returns the blob of a type writer.
-
-   @param handle a handle on a type writer; must not be null
-
-   @param size an out-parameter obtaining the size of the blob; must not be null
-
-   @return a (byte-aligned) pointer to the blob; the returned pointer and the
-   returned <code>size</code> remain valid until the next function is called on
-   the given type writer; if an out-of-memory condition occurs, null is returned
-   and <code>size</code> is not modified
- */
-REG_DLLPUBLIC void const * typereg_writer_getBlob(void * handle, sal_uInt32 * size)
-    SAL_THROW_EXTERN_C();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/registry/writer.hxx b/include/registry/writer.hxx
deleted file mode 100644
index 4bf6724610cf..000000000000
--- a/include/registry/writer.hxx
+++ /dev/null
@@ -1,291 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_REGISTRY_WRITER_HXX
-#define INCLUDED_REGISTRY_WRITER_HXX
-
-#include <registry/writer.h>
-#include <registry/refltype.hxx>
-#include <registry/types.hxx>
-#include <registry/version.h>
-
-#include <rtl/ustring.hxx>
-#include <sal/types.h>
-
-#include <new>
-
-namespace typereg {
-
-/**
-   A type writer working on a binary blob that represents a UNOIDL type.
-
-   <p>Instances of this class are not multi-thread&ndash;safe.</p>
-
-   @since UDK 3.2.0
- */
-class Writer {
-public:
-    /**
-       Creates a type writer.
-
-       @param version the version of the created type writer; must not be
-       negative
-
-       @param documentation the documentation
-
-       @param fileName the file name (deprecated, use an empty string)
-
-       @param typeClass the type class of the created type writer
-
-       @param published whether the created type writer is published; for a type
-       class that cannot be published, this should be false
-
-       @param typeName the type name of the created type writer
-
-       @param superTypeCount the number of super types of the created type
-       writer
-
-       @param fieldCount the number of fields of the created type writer
-
-       @param methodCount the number of methods of the created type writer
-
-       @param referenceCount the number of references of the created type writer
-
-       @exception std::bad_alloc is raised if an out-of-memory condition occurs
-     */
-    Writer(
-        typereg_Version version, OUString const & documentation,
-        OUString const & fileName, RTTypeClass typeClass, bool published,
-        OUString const & typeName, sal_uInt16 superTypeCount,
-        sal_uInt16 fieldCount, sal_uInt16 methodCount,
-        sal_uInt16 referenceCount):
-        m_handle(
-            typereg_writer_create(
-                version, documentation.pData, fileName.pData, typeClass,
-                published, typeName.pData, superTypeCount, fieldCount,
-                methodCount, referenceCount))
-    {
-        if (m_handle == nullptr) {
-            throw std::bad_alloc();
-        }
-    }
-
-    /**
-       Destroys this <code>Writer</code> instance.
-     */
-    ~Writer() {
-        typereg_writer_destroy(m_handle);
-    }
-
-    /**
-       Sets the type name of a super type of this type writer.
-
-       @param index a valid index into the range of super types of this type
-       writer
-
-       @param typeName the super type name
-
-       @exception std::bad_alloc is raised if an out-of-memory condition occurs
-     */
-    void setSuperTypeName(sal_uInt16 index, OUString const & typeName) {
-        if (!typereg_writer_setSuperTypeName(m_handle, index, typeName.pData)) {
-            throw std::bad_alloc();
-        }
-    }
-
-    /**
-       Sets the data of a field of this type writer.
-
-       @param index a valid index into the range of fields of this type writer
-
-       @param documentation the documentation of the field
-
-       @param fileName the file name of the field (deprecated, use an empty string)
-
-       @param flags the flags of the field
-
-       @param name the name of the field
-
-       @param typeName the type name of the field
-
-       @param value the value of the field
-
-       @exception std::bad_alloc is raised if an out-of-memory condition occurs
-     */
-    void setFieldData(
-        sal_uInt16 index, OUString const & documentation,
-        OUString const & fileName, RTFieldAccess flags, OUString const & name,
-        OUString const & typeName, RTConstValue const & value)
-    {
-        if (!typereg_writer_setFieldData(
-                m_handle, index, documentation.pData, fileName.pData, flags,
-                name.pData, typeName.pData, value.m_type, value.m_value))
-        {
-            throw std::bad_alloc();
-        }
-    }
-
-    /**
-       Sets the data of a method of this type writer.
-
-       @param index a valid index into the range of methods of this type writer
-
-       @param documentation the documentation of the method
-
-       @param flags the flags of the method
-
-       @param name the name of the method
-
-       @param returnTypeName the return type name of the method
-
-       @param parameterCount the number of parameters of the method
-
-       @param exceptionCount the number of exceptions of the method
-
-       @exception std::bad_alloc is raised if an out-of-memory condition occurs
-     */
-    void setMethodData(
-        sal_uInt16 index, OUString const & documentation,
-        RTMethodMode flags, OUString const & name,
-        OUString const & returnTypeName, sal_uInt16 parameterCount,
-        sal_uInt16 exceptionCount)
-    {
-        if (!typereg_writer_setMethodData(
-                m_handle, index, documentation.pData, flags, name.pData,
-                returnTypeName.pData, parameterCount, exceptionCount))
-        {
-            throw std::bad_alloc();
-        }
-    }
-
-    /**
-       Sets the data of a parameter of a method of this type writer.
-
-       @param methodIndex a valid index into the range of methods of this type
-       writer
-
-       @param parameterIndex a valid index into the range of parameters of the
-       given method
-
-       @param flags the flags of the parameter
-
-       @param name the name of the parameter
-
-       @param typeName the type name of the parameter
-
-       @exception std::bad_alloc is raised if an out-of-memory condition occurs
-     */
-    void setMethodParameterData(
-        sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
-        RTParamMode flags, OUString const & name,
-        OUString const & typeName) const
-    {
-        if (!typereg_writer_setMethodParameterData(
-                m_handle, methodIndex, parameterIndex, flags, name.pData,
-                typeName.pData))
-        {
-            throw std::bad_alloc();
-        }
-    }
-
-    /**
-       Sets an exception type name of a method of this type writer.
-
-       @param methodIndex a valid index into the range of methods of this type
-       writer
-
-       @param exceptionIndex a valid index into the range of exceptions of the
-       given method
-
-       @param typeName the exception type name
-
-       @exception std::bad_alloc is raised if an out-of-memory condition occurs
-     */
-    void setMethodExceptionTypeName(
-        sal_uInt16 methodIndex, sal_uInt16 exceptionIndex,
-        OUString const & typeName)
-    {
-        if (!typereg_writer_setMethodExceptionTypeName(
-                m_handle, methodIndex, exceptionIndex, typeName.pData))
-        {
-            throw std::bad_alloc();
-        }
-    }
-
-    /**
-       Sets the data of a reference of this type writer.
-
-       @param index a valid index into the range of references of this type
-       writer
-
-       @param documentation the documentation of the reference
-
-       @param sort the sort of the reference
-
-       @param flags the flags of the reference
-
-       @param typeName the type name of the reference
-
-       @exception std::bad_alloc is raised if an out-of-memory condition occurs
-     */
-    void setReferenceData(
-        sal_uInt16 index, OUString const & documentation,
-        RTReferenceType sort, RTFieldAccess flags,
-        OUString const & typeName)
-    {
-        if (!typereg_writer_setReferenceData(
-                m_handle, index, documentation.pData, sort, flags,
-                typeName.pData))
-        {
-            throw std::bad_alloc();
-        }
-    }
-
-    /**
-       Returns the blob of this type writer.
-
-       @param size an out-parameter obtaining the size of the blob
-
-       @return a (byte-aligned) pointer to the blob; the returned pointer and
-       the returned <code>size</code> remain valid until the next function is
-       called on this type writer
-
-       @exception std::bad_alloc is raised if an out-of-memory condition occurs
-       (in which case <code>size</code> is not modified
-     */
-    void const * getBlob(sal_uInt32 * size) {
-        void const * p = typereg_writer_getBlob(m_handle, size);
-        if (p == nullptr) {
-            throw std::bad_alloc();
-        }
-        return p;
-    }
-
-private:
-    Writer(Writer const &) = delete;
-    Writer& operator =(Writer const &) = delete;
-
-    void * m_handle;
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */