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>

13 files changed, 14 insertions, 14 deletions

diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 9d9eaa53aecb..d442e6c50357 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -53,7 +53,7 @@
 #include <strings.hrc>
 #include <errhdl.hrc>
 
-#define SdModule
+#define ShellClass_SdModule
 #include <sdslots.hxx>
 
 SFX_IMPL_INTERFACE(SdModule, SfxModule)
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
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index abbeea3919b7..18e1c8001a23 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -69,7 +69,7 @@
 #include <comphelper/processfactory.hxx>
 
 using namespace ::sd::slidesorter;
-#define SlideSorterViewShell
+#define ShellClass_SlideSorterViewShell
 #include <sdslots.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 599d7275627c..50ec33d0e884 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -54,7 +54,7 @@
 using namespace sd;
 using namespace sd::ui::table;
 
-#define TableObjectBar
+#define ShellClass_TableObjectBar
 #include <sdslots.hxx>
 
 namespace sd { namespace ui { namespace table {
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index 64105642182e..479da5229d91 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -46,7 +46,7 @@
 #include <drawdoc.hxx>
 
 using namespace sd;
-#define GraphicObjectBar
+#define ShellClass_GraphicObjectBar
 #include <sdslots.hxx>
 
 namespace sd {
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index 7799126d04e9..ae9554124df3 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -42,7 +42,7 @@
 
 using namespace sd;
 
-#define MediaObjectBar
+#define ShellClass_MediaObjectBar
 #include <sdslots.hxx>
 
 namespace sd {
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index e43556891e61..5097f86ff6e6 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -84,7 +84,7 @@
 #include <drawview.hxx>
 
 using namespace sd;
-#define ViewShellBase
+#define ShellClass_ViewShellBase
 #include <sdslots.hxx>
 
 using ::sd::framework::FrameworkHelper;
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index 84ad36bee586..877f0f7b1022 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -45,7 +45,7 @@
 #include <fuconbez.hxx>
 
 using namespace sd;
-#define BezierObjectBar
+#define ShellClass_BezierObjectBar
 #include <sdslots.hxx>
 
 namespace sd {
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index a0233250a0d6..b494aad50db6 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -68,7 +68,7 @@
 using namespace sd;
 using namespace ::com::sun::star;
 
-#define TextObjectBar
+#define ShellClass_TextObjectBar
 #include <sdslots.hxx>
 
 namespace sd {
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index d718f091a0c4..bed0b32b7ab8 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -48,9 +48,9 @@
 #include <NavigatorChildWindow.hxx>
 
 using namespace sd;
-#define DrawViewShell
+#define ShellClass_DrawViewShell
 #include <sdslots.hxx>
-#define GraphicViewShell
+#define ShellClass_GraphicViewShell
 #include <sdgslots.hxx>
 
 namespace sd {
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 5dca63524be0..0cf769ead03d 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -93,7 +93,7 @@ using namespace ::com::sun::star::linguistic2;
 
 using namespace sd;
 
-#define OutlineViewShell
+#define ShellClass_OutlineViewShell
 #include <sdslots.hxx>
 
 namespace sd {
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index 198585551382..cc757cbba596 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -45,7 +45,7 @@
 #include <fupoor.hxx>
 #include <Window.hxx>
 
-#define PresentationViewShell
+#define ShellClass_PresentationViewShell
 using namespace sd;
 #include <sdslots.hxx>