From 25fc5f91ab7e6fd410ccd403ba19741a16eaab49 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 17 Sep 2021 13:37:42 +0200 Subject: [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 --- solenv/clang-format/excludelist | 4 ---- 1 file changed, 4 deletions(-) (limited to 'solenv/clang-format') diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 5fc99e274eb6..2b02626215d5 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -5506,8 +5506,6 @@ include/registry/reader.hxx include/registry/registry.hxx include/registry/typereg_reader.hxx include/registry/version.h -include/registry/writer.h -include/registry/writer.hxx include/rtl/alloc.h include/rtl/bootstrap.h include/rtl/bootstrap.hxx @@ -7386,9 +7384,7 @@ registry/source/keyimpl.cxx registry/source/keyimpl.hxx registry/source/reflcnst.hxx registry/source/reflread.cxx -registry/source/reflread.hxx registry/source/reflwrit.cxx -registry/source/reflwrit.hxx registry/source/regimpl.cxx registry/source/regimpl.hxx registry/source/registry.cxx -- cgit