[Libreoffice-commits] core.git: basctl/source idl/source sc/source sd/source sfx2/source starmath/source svx/source sw/source

Mike Kaganski mike.kaganski at collabora.com
Tue Mar 13 13:14:38 UTC 2018 

 basctl/source/basicide/basdoc.cxx                       |    2 +-
 basctl/source/basicide/basidesh.cxx                     |    2 +-
 idl/source/objects/object.cxx                           |    4 ++--
 sc/source/ui/app/scmod.cxx                              |    2 +-
 sc/source/ui/docshell/docsh.cxx                         |    2 +-
 sc/source/ui/drawfunc/chartsh.cxx                       |    2 +-
 sc/source/ui/drawfunc/drawsh.cxx                        |    2 +-
 sc/source/ui/drawfunc/drformsh.cxx                      |    2 +-
 sc/source/ui/drawfunc/drtxtob.cxx                       |    2 +-
 sc/source/ui/drawfunc/graphsh.cxx                       |    2 +-
 sc/source/ui/drawfunc/mediash.cxx                       |    2 +-
 sc/source/ui/drawfunc/oleobjsh.cxx                      |    2 +-
 sc/source/ui/view/auditsh.cxx                           |    2 +-
 sc/source/ui/view/cellsh.cxx                            |    4 ++--
 sc/source/ui/view/editsh.cxx                            |    2 +-
 sc/source/ui/view/formatsh.cxx                          |    6 +++---
 sc/source/ui/view/pgbrksh.cxx                           |    2 +-
 sc/source/ui/view/pivotsh.cxx                           |    2 +-
 sc/source/ui/view/prevwsh.cxx                           |    2 +-
 sc/source/ui/view/tabvwsh.cxx                           |    2 +-
 sd/source/ui/app/sdmod.cxx                              |    2 +-
 sd/source/ui/docshell/docshell.cxx                      |    2 +-
 sd/source/ui/docshell/grdocsh.cxx                       |    2 +-
 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |    2 +-
 sd/source/ui/table/tableobjectbar.cxx                   |    2 +-
 sd/source/ui/view/GraphicObjectBar.cxx                  |    2 +-
 sd/source/ui/view/MediaObjectBar.cxx                    |    2 +-
 sd/source/ui/view/ViewShellBase.cxx                     |    2 +-
 sd/source/ui/view/drbezob.cxx                           |    2 +-
 sd/source/ui/view/drtxtob.cxx                           |    2 +-
 sd/source/ui/view/drvwshrg.cxx                          |    4 ++--
 sd/source/ui/view/outlnvsh.cxx                          |    2 +-
 sd/source/ui/view/presvish.cxx                          |    2 +-
 sfx2/source/appl/appmisc.cxx                            |    2 +-
 sfx2/source/appl/module.cxx                             |    2 +-
 sfx2/source/doc/objserv.cxx                             |    2 +-
 sfx2/source/view/viewfrm.cxx                            |    3 +--
 sfx2/source/view/viewsh.cxx                             |    2 +-
 starmath/source/document.cxx                            |    2 +-
 starmath/source/smmod.cxx                               |    2 +-
 starmath/source/view.cxx                                |    2 +-
 svx/source/form/fmshell.cxx                             |    2 +-
 sw/source/uibase/app/apphdl.cxx                         |    2 +-
 sw/source/uibase/app/docsh.cxx                          |    2 +-
 sw/source/uibase/misc/glshell.cxx                       |    4 ++--
 sw/source/uibase/shells/annotsh.cxx                     |    2 +-
 sw/source/uibase/shells/basesh.cxx                      |    2 +-
 sw/source/uibase/shells/beziersh.cxx                    |    2 +-
 sw/source/uibase/shells/drawsh.cxx                      |    2 +-
 sw/source/uibase/shells/drformsh.cxx                    |    2 +-
 sw/source/uibase/shells/drwbassh.cxx                    |    2 +-
 sw/source/uibase/shells/drwtxtsh.cxx                    |    2 +-
 sw/source/uibase/shells/frmsh.cxx                       |    2 +-
 sw/source/uibase/shells/grfsh.cxx                       |    2 +-
 sw/source/uibase/shells/listsh.cxx                      |    2 +-
 sw/source/uibase/shells/mediash.cxx                     |    2 +-
 sw/source/uibase/shells/navsh.cxx                       |    2 +-
 sw/source/uibase/shells/olesh.cxx                       |    2 +-
 sw/source/uibase/shells/tabsh.cxx                       |    2 +-
 sw/source/uibase/shells/textsh.cxx                      |    2 +-
 sw/source/uibase/uiview/pview.cxx                       |    2 +-
 sw/source/uibase/uiview/srcview.cxx                     |    2 +-
 sw/source/uibase/uiview/view0.cxx                       |    6 +++---
 sw/source/uibase/web/wdocsh.cxx                         |    2 +-
 sw/source/uibase/web/wformsh.cxx                        |    2 +-
 sw/source/uibase/web/wfrmsh.cxx                         |    2 +-
 sw/source/uibase/web/wgrfsh.cxx                         |    2 +-
 sw/source/uibase/web/wlistsh.cxx                        |    2 +-
 sw/source/uibase/web/wolesh.cxx                         |    2 +-
 sw/source/uibase/web/wtabsh.cxx                         |    2 +-
 sw/source/uibase/web/wtextsh.cxx                        |    2 +-
 sw/source/uibase/web/wview.cxx                          |    4 ++--
 72 files changed, 81 insertions(+), 82 deletions(-)

New commits:
commit 6ab9f0cfcd28124caf8e02219a39c753bce7d1ea
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Mon Mar 12 15:09:03 2018 +0300

    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 at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

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>
 
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 5aeb87066185..fd77df3a3a16 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -265,9 +265,9 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
 {
     WriteStars( rOutStm );
     // define class
-    rOutStm.WriteCharPtr( "#ifdef " ).WriteOString( GetName() ) << endl;
+    rOutStm.WriteCharPtr( "#ifdef ShellClass_" ).WriteOString( GetName() ) << endl;
     rOutStm.WriteCharPtr( "#undef ShellClass" ) << endl;
-    rOutStm.WriteCharPtr( "#undef " ).WriteOString( GetName() ) << endl;
+    rOutStm.WriteCharPtr( "#undef ShellClass_" ).WriteOString( GetName() ) << endl;
     rOutStm.WriteCharPtr( "#define ShellClass " ).WriteOString( GetName() ) << endl;
 
     // no slotmaps get written for interfaces
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>
 
 
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>
 
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index df09c343d3e3..4369ea4c887d 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -76,7 +76,7 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 
-#define SfxApplication
+#define ShellClass_SfxApplication
 #include <sfxslots.hxx>
 
 SFX_IMPL_INTERFACE(SfxApplication,SfxShell)
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 38e9db653104..dbdc3ba1bcb3 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -35,7 +35,7 @@
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 
-#define SfxModule
+#define ShellClass_SfxModule
 #include <sfxslots.hxx>
 #include <childwinimpl.hxx>
 #include <ctrlfactoryimpl.hxx>
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 5af4ef033706..c8c6a06f7540 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -113,7 +113,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::task;
 
-#define SfxObjectShell
+#define ShellClass_SfxObjectShell
 #include <sfxslots.hxx>
 
 SFX_IMPL_SUPERCLASS_INTERFACE(SfxObjectShell, SfxShell)
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index dd37efc0016e..5fd26b8ae751 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -136,9 +136,8 @@ using ::com::sun::star::container::XIndexContainer;
 #include "impviewframe.hxx"
 #include <vcl/svapp.hxx>
 
-#define SfxViewFrame
+#define ShellClass_SfxViewFrame
 #include <sfxslots.hxx>
-#undef SfxViewFrame
 
 SFX_IMPL_SUPERCLASS_INTERFACE(SfxViewFrame,SfxShell)
 
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index cdb960c9bed9..e17dfacb7deb 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -95,7 +95,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 using namespace ::cppu;
 
-#define SfxViewShell
+#define ShellClass_SfxViewShell
 #include <sfxslots.hxx>
 
 
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 877625b83ae2..dc2e5fffd255 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -84,7 +84,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::uno;
 
-#define SmDocShell
+#define ShellClass_SmDocShell
 #include <smslots.hxx>
 
 
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 02a8fec7a572..ba52877e6e21 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -37,7 +37,7 @@
 #include <svx/modctrl.hxx>
 
 
-#define SmModule
+#define ShellClass_SmModule
 #include <smslots.hxx>
 
 OUString SmResId(const char* pId)
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 4dc0db132ec5..87aff89a864f 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -80,7 +80,7 @@
 #define CMD_BOX_PADDING 4
 #define CMD_BOX_PADDING_TOP 10
 
-#define SmViewShell
+#define ShellClass_SmViewShell
 #include <smslots.hxx>
 
 using namespace css;
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 6fce0e94f774..cd0f68e815b3 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -80,7 +80,7 @@
 
 #include <svx/sdrobjectfilter.hxx>
 
-#define FmFormShell
+#define ShellClass_FmFormShell
 #include <svxslots.hxx>
 
 #include <tbxform.hxx>
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index adb9b4366c23..b7c9ff0c8b0a 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -109,7 +109,7 @@ using namespace ::com::sun::star;
 
 // here are the SlotID's being included
 // see Idl-file
-#define SwModule
+#define ShellClass_SwModule
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index aa6dc0c65ab6..073a6dc760cb 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -108,7 +108,7 @@
 #include <sfx2/objface.hxx>
 #include <comphelper/storagehelper.hxx>
 
-#define SwDocShell
+#define ShellClass_SwDocShell
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 #include <com/sun/star/document/UpdateDocMode.hpp>
diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx
index f5757699e130..6a0cca3eb80c 100644
--- a/sw/source/uibase/misc/glshell.cxx
+++ b/sw/source/uibase/misc/glshell.cxx
@@ -47,8 +47,8 @@
 #include <swerror.h>
 #include <strings.hrc>
 
-#define SwWebGlosDocShell
-#define SwGlosDocShell
+#define ShellClass_SwWebGlosDocShell
+#define ShellClass_SwGlosDocShell
 
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index fbe9f2273269..63f7b1a191e6 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -129,7 +129,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::i18n;
 
-#define SwAnnotationShell
+#define ShellClass_SwAnnotationShell
 
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 017e65c3fd70..ef2d61b7c73a 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -127,7 +127,7 @@ static sal_uInt8 nPagePos;
 static sal_uInt8 nHeaderPos;
 static sal_uInt8 nFooterPos;
 
-#define SwBaseShell
+#define ShellClass_SwBaseShell
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index 83c6219712cc..5aba0fca58a1 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -35,7 +35,7 @@
 #include <drawbase.hxx>
 #include <beziersh.hxx>
 #include <strings.hrc>
-#define SwBezierShell
+#define ShellClass_SwBezierShell
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 4d6fad3248cd..d3876b4efc58 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -58,7 +58,7 @@
 #include <drwbassh.hxx>
 #include <drawsh.hxx>
 
-#define SwDrawShell
+#define ShellClass_SwDrawShell
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 #include <swabstdlg.hxx>
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index b392aac7e5b4..05c8ca93c7de 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -47,7 +47,7 @@
 #include <sfx2/docfile.hxx>
 #include <docsh.hxx>
 
-#define SwDrawFormShell
+#define ShellClass_SwDrawFormShell
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 0e5254e41049..d5f1f42066c7 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -49,7 +49,7 @@
 #include <svx/svdpage.hxx>
 #include <svx/svditer.hxx>
 #include <strings.hrc>
-#define SwDrawBaseShell
+#define ShellClass_SwDrawBaseShell
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 #include <svx/svxdlg.hxx>
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index a8763fc819ad..9087ec1f006b 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -58,7 +58,7 @@
 #include <globals.hrc>
 #include <strings.hrc>
 
-#define SwDrawTextShell
+#define ShellClass_SwDrawTextShell
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 #include <uitool.hxx>
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index e1bad7bff1d0..a9777a88b800 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -81,7 +81,7 @@
 #include <svx/drawitem.hxx>
 #include <memory>
 
-#define SwFrameShell
+#define ShellClass_SwFrameShell
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 #include <grfatr.hxx>
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index e536f5bab523..aede5a6798f5 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -70,7 +70,7 @@
 #include <IDocumentDrawModelAccess.hxx>
 //#include <svx/svxids.hrc>
 #include <svx/drawitem.hxx>
-#define SwGrfShell
+#define ShellClass_SwGrfShell
 
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index e2276b99a71e..5dc107eb4740 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -44,7 +44,7 @@
 #include <view.hxx>
 #include <edtwin.hxx>
 
-#define SwListShell
+#define ShellClass_SwListShell
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 
diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx
index 297d0363d234..fe8c8d5c9157 100644
--- a/sw/source/uibase/shells/mediash.cxx
+++ b/sw/source/uibase/shells/mediash.cxx
@@ -62,7 +62,7 @@
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 #include <avmedia/mediaitem.hxx>
 
-#define SwMediaShell
+#define ShellClass_SwMediaShell
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 #include <swabstdlg.hxx>
diff --git a/sw/source/uibase/shells/navsh.cxx b/sw/source/uibase/shells/navsh.cxx
index f5da1b0c448a..625d7c7055b4 100644
--- a/sw/source/uibase/shells/navsh.cxx
+++ b/sw/source/uibase/shells/navsh.cxx
@@ -22,7 +22,7 @@
 #include <globals.hrc>
 #include <navsh.hxx>
 #include <strings.hrc>
-#define SwNavigationShell
+#define ShellClass_SwNavigationShell
 #include <swslots.hxx>
 #include <unomid.h>
 #include <navmgr.hxx>
diff --git a/sw/source/uibase/shells/olesh.cxx b/sw/source/uibase/shells/olesh.cxx
index f62a704cb23a..2e6123fec73d 100644
--- a/sw/source/uibase/shells/olesh.cxx
+++ b/sw/source/uibase/shells/olesh.cxx
@@ -31,7 +31,7 @@
 #include <cmdid.h>
 #include <strings.hrc>
 
-#define SwOleShell
+#define ShellClass_SwOleShell
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index ff6216d68d8b..87cc52214879 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -77,7 +77,7 @@
 #include <globals.hrc>
 #include <unobaseclass.hxx>
 
-#define SwTableShell
+#define ShellClass_SwTableShell
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index fc3a0799d15d..901323446dcf 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -93,7 +93,7 @@
 
 #include <chartins.hxx>
 
-#define SwTextShell
+#define ShellClass_SwTextShell
 #include <sfx2/msg.hxx>
 #include <vcl/EnumContext.hxx>
 #include <swslots.hxx>
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 6d8c4e14c27e..c4cbbe55b15e 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -69,7 +69,7 @@
 #include <globals.hrc>
 #include <strings.hrc>
 
-#define SwPagePreview
+#define ShellClass_SwPagePreview
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 #include <pagepreviewlayout.hxx>
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index f61582c26ecc..9dbe6d1fa265 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -76,7 +76,7 @@
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <sfx2/filedlghelper.hxx>
-#define SwSrcView
+#define ShellClass_SwSrcView
 #include <swslots.hxx>
 
 #include <unomid.h>
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 311235097dbc..ba847a61a0ec 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -57,9 +57,9 @@
 #include <wview.hxx>
 #include <strings.hrc>
 
-#define SwView
-#define Text
-#define TextDrawText
+#define ShellClass_SwView
+#define ShellClass_Text
+#define ShellClass_TextDrawText
 
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx
index 80ddc0d32933..215583d1e7a6 100644
--- a/sw/source/uibase/web/wdocsh.cxx
+++ b/sw/source/uibase/web/wdocsh.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
-#define SwWebDocShell
+#define ShellClass_SwWebDocShell
 #include <swslots.hxx>
 
 #include <unomid.h>
diff --git a/sw/source/uibase/web/wformsh.cxx b/sw/source/uibase/web/wformsh.cxx
index 0e767b016e1f..7989d1c6749c 100644
--- a/sw/source/uibase/web/wformsh.cxx
+++ b/sw/source/uibase/web/wformsh.cxx
@@ -34,7 +34,7 @@
 #include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
-#define SwWebDrawFormShell
+#define ShellClass_SwWebDrawFormShell
 #include <swslots.hxx>
 
 SFX_IMPL_SUPERCLASS_INTERFACE(SwWebDrawFormShell, SwDrawFormShell)
diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx
index 9e6bef1fa834..af2f8b02a3c0 100644
--- a/sw/source/uibase/web/wfrmsh.cxx
+++ b/sw/source/uibase/web/wfrmsh.cxx
@@ -31,7 +31,7 @@
 #include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
-#define SwWebFrameShell
+#define ShellClass_SwWebFrameShell
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 
diff --git a/sw/source/uibase/web/wgrfsh.cxx b/sw/source/uibase/web/wgrfsh.cxx
index 551a40f6bc16..d62c0f0ef700 100644
--- a/sw/source/uibase/web/wgrfsh.cxx
+++ b/sw/source/uibase/web/wgrfsh.cxx
@@ -36,7 +36,7 @@
 #include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
-#define SwWebGrfShell
+#define ShellClass_SwWebGrfShell
 #include <swslots.hxx>
 
 SFX_IMPL_INTERFACE(SwWebGrfShell, SwGrfShell)
diff --git a/sw/source/uibase/web/wlistsh.cxx b/sw/source/uibase/web/wlistsh.cxx
index 39135b1c3eee..60b048eb69ca 100644
--- a/sw/source/uibase/web/wlistsh.cxx
+++ b/sw/source/uibase/web/wlistsh.cxx
@@ -34,7 +34,7 @@
 #include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
-#define SwWebListShell
+#define ShellClass_SwWebListShell
 #include <swslots.hxx>
 
 SFX_IMPL_INTERFACE(SwWebListShell, SwListShell)
diff --git a/sw/source/uibase/web/wolesh.cxx b/sw/source/uibase/web/wolesh.cxx
index 779dcb81dd76..a6f6b0ded4d9 100644
--- a/sw/source/uibase/web/wolesh.cxx
+++ b/sw/source/uibase/web/wolesh.cxx
@@ -29,7 +29,7 @@
 #include <wolesh.hxx>
 #include <cmdid.h>
 
-#define SwWebOleShell
+#define ShellClass_SwWebOleShell
 #include <swslots.hxx>
 
 SFX_IMPL_INTERFACE(SwWebOleShell, SwOleShell)
diff --git a/sw/source/uibase/web/wtabsh.cxx b/sw/source/uibase/web/wtabsh.cxx
index 2000532d3ab6..d1006fa08e34 100644
--- a/sw/source/uibase/web/wtabsh.cxx
+++ b/sw/source/uibase/web/wtabsh.cxx
@@ -33,7 +33,7 @@
 #include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
-#define SwWebTableShell
+#define ShellClass_SwWebTableShell
 #include <sfx2/msg.hxx>
 #include <svx/svxids.hrc>
 #include <swslots.hxx>
diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx
index 50f2ce498bf3..71717f601000 100644
--- a/sw/source/uibase/web/wtextsh.cxx
+++ b/sw/source/uibase/web/wtextsh.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
-#define SwWebTextShell
+#define ShellClass_SwWebTextShell
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 
diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index 3ce256aafaf8..937dd898257d 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -62,8 +62,8 @@
 #include <sfx2/request.hxx>
     // needed for -fsanitize=function visibility of typeinfo for functions of
     // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
-#define SwWebView
-#define Text
+#define ShellClass_SwWebView
+#define ShellClass_Text
 #include <swslots.hxx>
 
 SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default")

More information about the Libreoffice-commits mailing list