diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-03-12 15:09:03 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-03-13 14:14:12 +0100 |
| commit | 6ab9f0cfcd28124caf8e02219a39c753bce7d1ea (patch) | |
| tree | ea0aaba740057b096959183294ba9927a5e4c747 /sfx2 | |
| parent | fe6da2feb57c3d5e355a36f6b8ac09b48412ff39 (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 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appmisc.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/module.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 2 |
5 files changed, 5 insertions, 6 deletions
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> |