From 177f5c2e505b7978fc232a891577a448e49b290d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sun, 5 Mar 2017 13:19:41 +0100 Subject: Proper fix for multiply defined SfxEnumItem with MSVC With --disable-pch the original hack from f091259ad2ec1590714645839668580cd7b8c7c4 "convert SfxEnumItem to type-safe template class" doesn't happen to work: When linking sd, the occurrences of SfxEnumItem in sd/inc/sdattr.hxx clash with those from editeng (where LanguageType is a typedef for sal_uInt16) and svl (as the respective include files from editeng and svl happen to not be included). For whatever reason, the explicit instantiation declaration without a __declspec(...) in include/svl/eitem.hxx doesn't seem to make a difference (at least with MSVC 2015 Update 3). Change-Id: I51b5943fe19a7184db9414192c6364f7c26b79eb Reviewed-on: https://gerrit.libreoffice.org/34903 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann --- editeng/source/items/textitem.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'editeng/source/items') diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 4cf3b832109d..2b62129853d8 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -2345,7 +2345,7 @@ bool SvxEscapementItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) // class SvxLanguageItem ------------------------------------------------- SvxLanguageItem::SvxLanguageItem( const LanguageType eLang, const sal_uInt16 nId ) - : SfxEnumItem( nId , eLang ) + : SvxLanguageItem_Base( nId , eLang ) { } -- cgit