diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-24 14:42:00 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-24 19:21:29 +0100 |
| commit | 03faef951a0dd4352a371ead89ca79040359234b (patch) | |
| tree | 21b8ed0cd54fdd92c56fcc03135b3b0349fa427a /idl | |
| parent | ac511d90cdf9d28eb8809c30be9fa08b42ea0bd3 (diff) | |
mergelibs: fix duplicate aSfxInt16Item_Impl
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 <glogow@fbihome.de>
Diffstat (limited to 'idl')
| -rw-r--r-- | idl/source/objects/types.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
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" || |