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>

17 files changed, 20 insertions, 20 deletions

diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 84f95950744c..8cd2725c67d5 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -110,7 +110,7 @@
 
 #include <svx/xmlsecctrl.hxx>
 
-#define ScModule
+#define ShellClass_ScModule
 #include <scslots.hxx>
 
 #include <scabstdlg.hxx>
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 33a59ab41e5a..ec9505da8840 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -163,7 +163,7 @@ static const sal_Char pFilterHtml[]     = "HTML (StarCalc)";
 static const sal_Char pFilterHtmlWebQ[] = "calc_HTML_WebQuery";
 static const sal_Char pFilterRtf[]      = "Rich Text Format (StarCalc)";
 
-#define ScDocShell
+#define ShellClass_ScDocShell
 #include <scslots.hxx>
 
 SFX_IMPL_INTERFACE(ScDocShell,SfxObjectShell)
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index 9cf7d8a99916..45abd51082d4 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -39,7 +39,7 @@
 #include <gridwin.hxx>
 #include <scresid.hxx>
 
-#define ScChartShell
+#define ShellClass_ScChartShell
 #include <scslots.hxx>
 
 using namespace css::uno;
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 99174788dc9d..8310001948f1 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -50,7 +50,7 @@
 #include <gridwin.hxx>
 #include <sfx2/bindings.hxx>
 
-#define ScDrawShell
+#define ShellClass_ScDrawShell
 #include <scslots.hxx>
 
 #include <userdat.hxx>
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index a1b4b6f13b9a..b6a0b619869b 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -37,7 +37,7 @@
 #include <svx/svdobj.hxx>
 #include <vcl/EnumContext.hxx>
 
-#define ScDrawFormShell
+#define ShellClass_ScDrawFormShell
 #include <scslots.hxx>
 
 SFX_IMPL_INTERFACE(ScDrawFormShell, ScDrawShell)
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index dfdd03576e77..5f7a48e882d4 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -75,7 +75,7 @@
 #include <tabvwsh.hxx>
 #include <gridwin.hxx>
 
-#define ScDrawTextObjectBar
+#define ShellClass_ScDrawTextObjectBar
 #include <scslots.hxx>
 
 #include <memory>
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 90e408290f40..49feeb8c90b9 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -39,7 +39,7 @@
 #include <svx/extedit.hxx>
 #include <tabvwsh.hxx>
 
-#define ScGraphicShell
+#define ShellClass_ScGraphicShell
 #include <scslots.hxx>
 
 SFX_IMPL_INTERFACE(ScGraphicShell, ScDrawShell)
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index 2e102b496f83..0515b38bfe19 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -33,7 +33,7 @@
 #include <drawview.hxx>
 #include <scresid.hxx>
 
-#define ScMediaShell
+#define ShellClass_ScMediaShell
 #include <scslots.hxx>
 
 SFX_IMPL_INTERFACE(ScMediaShell, ScDrawShell)
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index 70d4e2bfc4f4..53d11055f13b 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -37,7 +37,7 @@
 #include <svx/svdobj.hxx>
 #include <vcl/EnumContext.hxx>
 
-#define ScOleObjectShell
+#define ShellClass_ScOleObjectShell
 #include <scslots.hxx>
 
 SFX_IMPL_INTERFACE(ScOleObjectShell, ScDrawShell)
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index ca50b45ae63b..2eedca4f6144 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -31,7 +31,7 @@
 #include <sc.hrc>
 #include <document.hxx>
 
-#define ScAuditingShell
+#define ShellClass_ScAuditingShell
 #include <scslots.hxx>
 
 
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index daf883084096..4fa7eb1c9a73 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -59,8 +59,8 @@
 #include <markdata.hxx>
 #include <gridwin.hxx>
 
-#define ScCellShell
-#define CellMovement
+#define ShellClass_ScCellShell
+#define ShellClass_CellMovement
 #include <scslots.hxx>
 
 
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 762dfb4757ce..18673f262192 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -73,7 +73,7 @@
 #include <globstr.hrc>
 #include <gridwin.hxx>
 
-#define ScEditShell
+#define ShellClass_ScEditShell
 #include <scslots.hxx>
 
 #include <scui_def.hxx>
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 6c735a9a4362..0e10b9646efe 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -76,9 +76,9 @@
 #include <markarr.hxx>
 #include <attrib.hxx>
 
-#define ScFormatShell
-#define TableFont
-#define FormatForSelection
+#define ShellClass_ScFormatShell
+#define ShellClass_TableFont
+#define ShellClass_FormatForSelection
 #include <scslots.hxx>
 
 #include <scabstdlg.hxx>
diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx
index 2652031ba337..b3a7b4714844 100644
--- a/sc/source/ui/view/pgbrksh.cxx
+++ b/sc/source/ui/view/pgbrksh.cxx
@@ -31,7 +31,7 @@
 #include <document.hxx>
 #include <sc.hrc>
 
-#define ScPageBreakShell
+#define ShellClass_ScPageBreakShell
 #include <scslots.hxx>
 
 
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index 27171ed5560f..83fd8990283e 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -39,7 +39,7 @@
 #include <uiitems.hxx>
 #include <scabstdlg.hxx>
 
-#define ScPivotShell
+#define ShellClass_ScPivotShell
 #include <scslots.hxx>
 #include <memory>
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 761d0ea51ff9..4acbaf1d8796 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -78,7 +78,7 @@
 
 using namespace com::sun::star;
 
-#define ScPreviewShell
+#define ShellClass_ScPreviewShell
 #include <scslots.hxx>
 
 #include <memory>
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 395e030c989c..81be622b0a21 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -45,7 +45,7 @@
 #include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in scslots.hxx
-#define ScTabViewShell
+#define ShellClass_ScTabViewShell
 #include <scslots.hxx>