From 03faef951a0dd4352a371ead89ca79040359234b Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Fri, 24 Dec 2021 14:42:00 +0100 Subject: mergelibs: fix duplicate aSfxInt16Item_Impl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The callgrind / mergelibs build fails with: /svx/source/form/typemap.o: in function `aSvxColorItem_Impl´: \ multiple definition of `aSfxInt16Item_Impl´; \ /sfx2/source/appl/appbas.o: first defined here Regression from commit 60d7796624f1c56eb036d3e73d7f8a8216cce2a4 ("sd theme: allow setting color effects in the sidebar"). Change-Id: Ibe382e2e12d3359caa3e853e264de0ede6a5e601 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127429 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski --- idl/source/objects/types.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 57d62c49c24c..46262e7b98d9 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -231,6 +231,7 @@ void SvMetaType::WriteSfxItem( bool bExport = false, bReturn = false; // these are exported from sfx library if (rItemName == "SfxBoolItem" || + rItemName == "SfxInt16Item" || rItemName == "SfxStringItem" || rItemName == "SfxUInt16Item" || rItemName == "SfxUInt32Item" || -- cgit v1.2.3