summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-03-12 15:09:03 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-03-13 14:14:12 +0100
commit6ab9f0cfcd28124caf8e02219a39c753bce7d1ea (patch)
treeea0aaba740057b096959183294ba9927a5e4c747 /basctl
parentfe6da2feb57c3d5e355a36f6b8ac09b48412ff39 (diff)
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 <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/basicide/basdoc.cxx2
-rw-r--r--basctl/source/basicide/basidesh.cxx2
2 files changed, 2 insertions, 2 deletions
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 <basslots.hxx>
#include <sfx2/sfxmodelfactory.hxx>
#include <svl/itemset.hxx>
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 <basslots.hxx>