summaryrefslogtreecommitdiff
path: root/sw/source/uibase/web
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-01-26 14:57:05 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-01-26 15:17:28 +0100
commit598d8194b0ea1a64e0ebba28a86c128bafa57c7c (patch)
treec81c2a85795c6218327d2c40dc2a52850a7d22ef /sw/source/uibase/web
parent64235bc9896911b4abfca47089ac1e71056afea7 (diff)
Visible function type RTTI for Clang -fsanitize=function
...by adding some further SAL_DLLPUBLIC_RTTI type annotations (cf. b4f6b26b5a1a78fecfa95ec2eb7ac8b80495d8aa "SAL_DLLPUBLIC_RTTI for proper RTTI visibility for LLVM") and by making sure relevant function types do not use incomplete types in their parameter and return types (which would make the RTTI hidden). Change-Id: Id7aadcbc0704b9759968ae36266fc9ce11a2e340
Diffstat (limited to 'sw/source/uibase/web')
-rw-r--r--sw/source/uibase/web/wdocsh.cxx3
-rw-r--r--sw/source/uibase/web/wformsh.cxx3
-rw-r--r--sw/source/uibase/web/wfrmsh.cxx3
-rw-r--r--sw/source/uibase/web/wgrfsh.cxx3
-rw-r--r--sw/source/uibase/web/wlistsh.cxx3
-rw-r--r--sw/source/uibase/web/wtabsh.cxx3
-rw-r--r--sw/source/uibase/web/wtextsh.cxx3
-rw-r--r--sw/source/uibase/web/wview.cxx3
8 files changed, 24 insertions, 0 deletions
diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx
index afe87184981f..275fbb0b4617 100644
--- a/sw/source/uibase/web/wdocsh.cxx
+++ b/sw/source/uibase/web/wdocsh.cxx
@@ -33,6 +33,9 @@
#include "wdocsh.hxx"
#include "web.hrc"
+#include <sfx2/request.hxx>
+ // needed for -fsanitize=function visibility of typeinfo for functions of
+ // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
#define SwWebDocShell
#include "swslots.hxx"
diff --git a/sw/source/uibase/web/wformsh.cxx b/sw/source/uibase/web/wformsh.cxx
index 2d1c24f2aa7e..6daf3022188d 100644
--- a/sw/source/uibase/web/wformsh.cxx
+++ b/sw/source/uibase/web/wformsh.cxx
@@ -33,6 +33,9 @@
#include "popup.hrc"
#include "shells.hrc"
+#include <sfx2/request.hxx>
+ // needed for -fsanitize=function visibility of typeinfo for functions of
+ // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
#define SwWebDrawFormShell
#include "swslots.hxx"
diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx
index cb49a405a11f..f455f57db584 100644
--- a/sw/source/uibase/web/wfrmsh.cxx
+++ b/sw/source/uibase/web/wfrmsh.cxx
@@ -31,6 +31,9 @@
#include "web.hrc"
// STATIC DATA
+#include <sfx2/request.hxx>
+ // needed for -fsanitize=function visibility of typeinfo for functions of
+ // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
#define 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 24e83a5a7cff..58a32bd39b27 100644
--- a/sw/source/uibase/web/wgrfsh.cxx
+++ b/sw/source/uibase/web/wgrfsh.cxx
@@ -35,6 +35,9 @@
#include "web.hrc"
#include "wgrfsh.hxx"
+#include <sfx2/request.hxx>
+ // needed for -fsanitize=function visibility of typeinfo for functions of
+ // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
#define SwWebGrfShell
#include "swslots.hxx"
diff --git a/sw/source/uibase/web/wlistsh.cxx b/sw/source/uibase/web/wlistsh.cxx
index ad487d4c5c27..e41c8ad5b8be 100644
--- a/sw/source/uibase/web/wlistsh.cxx
+++ b/sw/source/uibase/web/wlistsh.cxx
@@ -31,6 +31,9 @@
#include "uinums.hxx"
#include "wlistsh.hxx"
+#include <sfx2/request.hxx>
+ // needed for -fsanitize=function visibility of typeinfo for functions of
+ // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
#define SwWebListShell
#include "swslots.hxx"
diff --git a/sw/source/uibase/web/wtabsh.cxx b/sw/source/uibase/web/wtabsh.cxx
index c42fab259d00..a50e56617ca7 100644
--- a/sw/source/uibase/web/wtabsh.cxx
+++ b/sw/source/uibase/web/wtabsh.cxx
@@ -33,6 +33,9 @@
#include "wrtsh.hxx"
#include "wtabsh.hxx"
+#include <sfx2/request.hxx>
+ // needed for -fsanitize=function visibility of typeinfo for functions of
+ // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
#define SwWebTableShell
#include <sfx2/msg.hxx>
#include "svx/svxids.hrc"
diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx
index b45bdc17e395..a572f85b1361 100644
--- a/sw/source/uibase/web/wtextsh.cxx
+++ b/sw/source/uibase/web/wtextsh.cxx
@@ -37,6 +37,9 @@
#include <unomid.h>
// STATIC DATA
+#include <sfx2/request.hxx>
+ // needed for -fsanitize=function visibility of typeinfo for functions of
+ // type void(SfxShell*,SfxRequest&) defined in swslots.hxx
#define 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 c8dffd7261a2..eff5f9b6c713 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -60,6 +60,9 @@
#include <web.hrc>
#include <shells.hrc>
+#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 TextInTable