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 --- basctl/source/basicide/basdoc.cxx | 2 +- basctl/source/basicide/basidesh.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'basctl') diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index 30ee6af0bca6..2c4654751908 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -27,7 +27,7 @@ #include "unomodel.hxx" #include "basdoc.hxx" -#define basctl_DocShell // This CANNOT come before basdoc apparently +#define ShellClass_basctl_DocShell #include #include #include diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 58b4d42c50c7..db948900610a 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -45,7 +45,7 @@ #define aSfxDocumentInfoItem_Impl basctl_source_basicide_basidesh_aSfxDocumentInfoItem_Impl #endif -#define basctl_Shell +#define ShellClass_basctl_Shell #define SFX_TYPEMAP #include -- cgit