diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-26 14:57:05 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-26 15:17:28 +0100 |
| commit | 598d8194b0ea1a64e0ebba28a86c128bafa57c7c (patch) | |
| tree | c81c2a85795c6218327d2c40dc2a52850a7d22ef /sd | |
| parent | 64235bc9896911b4abfca47089ac1e71056afea7 (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 'sd')
| -rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 3 | ||||
| -rw-r--r-- | sd/source/filter/html/HtmlOptionsDialog.cxx | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index c66192f7e2fa..f4b4d8238fa0 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -55,6 +55,9 @@ #include <oox/ole/olehelper.hxx> #include <rtl/math.hxx> +#include <sfx2/objsh.hxx> + // complete SfxObjectShell for SaveVBA under -fsanitize=function + using namespace com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::presentation; diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index 2945f525af73..d837d87730c8 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/document/XViewDataSupplier.hpp> #include <com/sun/star/container/XIndexAccess.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Any.h> |