summaryrefslogtreecommitdiff
path: root/sd/source/ui/docshell
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 /sd/source/ui/docshell
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 'sd/source/ui/docshell')
-rw-r--r--sd/source/ui/docshell/docshell.cxx2
-rw-r--r--sd/source/ui/docshell/grdocsh.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 9f4f5665a9c6..42d01a87db2b 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -79,7 +79,7 @@
#include <sfx2/notebookbar/SfxNotebookBar.hxx>
using namespace sd;
-#define DrawDocShell
+#define ShellClass_DrawDocShell
#include <sdslots.hxx>
SFX_IMPL_SUPERCLASS_INTERFACE(DrawDocShell, SfxObjectShell);
diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx
index fe533b17a5ad..c3d43db80d78 100644
--- a/sd/source/ui/docshell/grdocsh.cxx
+++ b/sd/source/ui/docshell/grdocsh.cxx
@@ -35,7 +35,7 @@
#include <sdresid.hxx>
using namespace sd;
-#define GraphicDocShell
+#define ShellClass_GraphicDocShell
#include <sdgslots.hxx>
namespace sd