diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-04-20 08:59:55 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-04-24 07:52:48 +0200 |
| commit | 6325d571cae03357ea13354deea9df279377c730 (patch) | |
| tree | 7fda7c5427c597d61b3223ce77beee087bee52fa /sd | |
| parent | 930a3cbaeeaf6bca594f8651c4d5dffc1e5391d4 (diff) | |
Revert "work around clang-cl ABI bug PR25641"
This reverts commit 81ce629c9e8a4fc26ded9d49157e3f3263991e03, now that
<https://bugs.llvm.org/show_bug.cgi?id=25641> "clang-cl: vtordisp thunks not
emitted for functions with class template specializations in their signatures"
is fixed.
Diffstat (limited to 'sd')
4 files changed, 0 insertions, 12 deletions
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 40e40dc3fb3b..785bd0d9bca7 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -55,9 +55,6 @@ UndoTextAPIChanged::UndoTextAPIChanged(SdrModel& rModel, TextApiObject* pTextObj , mpOldText( pTextObj->CreateText() ) , mxTextObj( pTextObj ) { -#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641 - css::uno::Sequence<css::beans::PropertyState> dummy; (void) dummy; -#endif } void UndoTextAPIChanged::Undo() diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 041cd8c4dc8a..e7ee451cd3e2 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -47,9 +47,6 @@ AccessiblePageShape::AccessiblePageShape ( : AccessibleShape (AccessibleShapeInfo (nullptr, rxParent), rShapeTreeInfo), mxPage (rxPage) { -#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641 - css::uno::Sequence<css::uno::Type> 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 26c218d3f9a4..90a1734dcff3 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -36,9 +36,6 @@ AccessiblePresentationGraphicShape::AccessiblePresentationGraphicShape ( const AccessibleShapeTreeInfo& rShapeTreeInfo) : AccessibleGraphicShape (rShapeInfo, rShapeTreeInfo) { -#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641 - css::uno::Sequence<css::uno::Type> dummy; (void) dummy; -#endif } AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape() diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index 93ae1da313d3..7a8d78fc2e3b 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -36,9 +36,6 @@ AccessiblePresentationOLEShape::AccessiblePresentationOLEShape ( const AccessibleShapeTreeInfo& rShapeTreeInfo) : AccessibleOLEShape (rShapeInfo, rShapeTreeInfo) { -#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641 - css::uno::Sequence<css::uno::Type> dummy; (void) dummy; -#endif } AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape() |