From 81ce629c9e8a4fc26ded9d49157e3f3263991e03 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 1 Dec 2015 10:06:58 +0100 Subject: work around clang-cl ABI bug PR25641 "clang-cl: vtordisp thunks not emitted for functions with class template specializations in their signatures". Change-Id: I4f9a9777ba7486a026cb3b34340fa5b78f210f05 Reviewed-on: https://gerrit.libreoffice.org/42949 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- sd/source/core/text/textapi.cxx | 3 +++ sd/source/ui/accessibility/AccessiblePageShape.cxx | 3 +++ sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx | 3 +++ sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx | 3 +++ 4 files changed, 12 insertions(+) (limited to 'sd') diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 782eee7bd46d..3eb52b381f2c 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -57,6 +57,9 @@ UndoTextAPIChanged::UndoTextAPIChanged(SdrModel& rModel, TextApiObject* pTextObj , mpNewText( nullptr ) , mxTextObj( pTextObj ) { +#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641 + css::uno::Sequence dummy; (void) dummy; +#endif } UndoTextAPIChanged::~UndoTextAPIChanged() diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index c19d6a40a4c6..f45eec219f24 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -47,6 +47,9 @@ AccessiblePageShape::AccessiblePageShape ( : AccessibleShape (AccessibleShapeInfo (nullptr, rxParent), rShapeTreeInfo), mxPage (rxPage) { +#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641 + css::uno::Sequence dummy; (void) dummy; +#endif // The main part of the initialization is done in the init method which // has to be called from this constructor's caller. } diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index 67d9bc73533c..4ed4bc079a22 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -36,6 +36,9 @@ AccessiblePresentationGraphicShape::AccessiblePresentationGraphicShape ( const AccessibleShapeTreeInfo& rShapeTreeInfo) : AccessibleGraphicShape (rShapeInfo, rShapeTreeInfo) { +#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641 + css::uno::Sequence dummy; (void) dummy; +#endif } AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape() diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index c06f1e4de365..e8b04873da0d 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -36,6 +36,9 @@ AccessiblePresentationOLEShape::AccessiblePresentationOLEShape ( const AccessibleShapeTreeInfo& rShapeTreeInfo) : AccessibleOLEShape (rShapeInfo, rShapeTreeInfo) { +#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641 + css::uno::Sequence dummy; (void) dummy; +#endif } AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape() -- cgit