From 6ab9f0cfcd28124caf8e02219a39c753bce7d1ea Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Mon, 12 Mar 2018 15:09:03 +0300 Subject: SDI: don't #define/#undef names of actual classes for slot headers Visual Studio 2015/2017 cannot handle that correctly, and emits a lot of intellisense errors. So, just prepend the define with "ShellClass_" Change-Id: I473ceb7e0a88e114b92e6342fd4ae63015cafd3e Reviewed-on: https://gerrit.libreoffice.org/51135 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- idl/source/objects/object.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'idl') diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 5aeb87066185..fd77df3a3a16 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -265,9 +265,9 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) { WriteStars( rOutStm ); // define class - rOutStm.WriteCharPtr( "#ifdef " ).WriteOString( GetName() ) << endl; + rOutStm.WriteCharPtr( "#ifdef ShellClass_" ).WriteOString( GetName() ) << endl; rOutStm.WriteCharPtr( "#undef ShellClass" ) << endl; - rOutStm.WriteCharPtr( "#undef " ).WriteOString( GetName() ) << endl; + rOutStm.WriteCharPtr( "#undef ShellClass_" ).WriteOString( GetName() ) << endl; rOutStm.WriteCharPtr( "#define ShellClass " ).WriteOString( GetName() ) << endl; // no slotmaps get written for interfaces -- cgit