summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-12-01 10:06:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-09-30 11:11:43 +0200
commit81ce629c9e8a4fc26ded9d49157e3f3263991e03 (patch)
treeaf1cb9246ad613403b84cd15fd3852d1c615a710
parent43b02c4532d88ef24c688ecd32bc8bfd6e1f57ff (diff)
work around clang-cl ABI bug PR25641
<https://bugs.llvm.org/show_bug.cgi?id=25641> "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 <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx3
-rw-r--r--cppcanvas/source/wrapper/implbitmapcanvas.cxx3
-rw-r--r--cppcanvas/source/wrapper/implspritecanvas.cxx3
-rw-r--r--forms/source/richtext/richtextunowrapper.cxx3
-rw-r--r--sc/source/ui/unoobj/textuno.cxx3
-rw-r--r--sd/source/core/text/textapi.cxx3
-rw-r--r--sd/source/ui/accessibility/AccessiblePageShape.cxx3
-rw-r--r--sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx3
-rw-r--r--sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx3
-rw-r--r--sw/source/core/fields/textapi.cxx3
10 files changed, 30 insertions, 0 deletions
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index ba9aa9978ec7..07dfd5bb46f6 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -85,6 +85,9 @@ WallFloorWrapper::WallFloorWrapper( bool bWall,
m_bWall( bWall )
{
+#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641
+ css::uno::Sequence<css::beans::PropertyState> dummy; (void) dummy;
+#endif
}
WallFloorWrapper::~WallFloorWrapper()
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.cxx b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
index fee1cf357706..67eed7d94163 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.cxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
@@ -41,6 +41,9 @@ namespace cppcanvas
mxBitmap( rCanvas,
uno::UNO_QUERY )
{
+#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641
+ (void) (ColorSharedPtr());
+#endif
OSL_ENSURE( mxBitmapCanvas.is(), "ImplBitmapCanvas::ImplBitmapCanvas(): Invalid canvas" );
OSL_ENSURE( mxBitmap.is(), "ImplBitmapCanvas::ImplBitmapCanvas(): Invalid bitmap" );
}
diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx
index 9d720cdef5b0..8aa875b2a491 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.cxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.cxx
@@ -49,6 +49,9 @@ namespace cppcanvas
mxSpriteCanvas( rCanvas ),
mpTransformArbiter( new TransformationArbiter() )
{
+#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641
+ (void) (ColorSharedPtr());
+#endif
OSL_ENSURE( mxSpriteCanvas.is(), "ImplSpriteCanvas::ImplSpriteCanvas(): Invalid canvas" );
}
diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx
index c363a9ee98d8..a168361d2950 100644
--- a/forms/source/richtext/richtextunowrapper.cxx
+++ b/forms/source/richtext/richtextunowrapper.cxx
@@ -61,6 +61,9 @@ namespace frm
ORichTextUnoWrapper::ORichTextUnoWrapper( EditEngine& _rEngine, IEngineTextChangeListener* _pTextChangeListener )
:SvxUnoText( getTextEnginePropertySet() )
{
+#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641
+ css::uno::Sequence<css::beans::PropertyState> dummy; (void) dummy;
+#endif
SetEditSource( new RichTextEditSource( _rEngine, _pTextChangeListener ) );
}
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 5634752685ea..a119a0d85056 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -95,6 +95,9 @@ SC_SIMPLE_SERVICE_INFO( ScHeaderFooterTextObj, "ScHeaderFooterTextObj", "stardiv
ScHeaderFooterContentObj::ScHeaderFooterContentObj()
{
+#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641
+ css::uno::Sequence<css::beans::PropertyState> dummy; (void) dummy;
+#endif
}
ScHeaderFooterContentObj::~ScHeaderFooterContentObj() {}
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<css::beans::PropertyState> 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<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 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<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 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<css::uno::Type> dummy; (void) dummy;
+#endif
}
AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape()
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index 2bffe90f0f0c..0c8b8f233ddc 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -56,6 +56,9 @@ SwTextAPIObject::SwTextAPIObject( SwTextAPIEditSource* p )
: SvxUnoText( p, ImplGetSvxTextPortionPropertySet(), uno::Reference < text::XText >() )
, pSource(p)
{
+#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641
+ css::uno::Sequence<css::beans::PropertyState>dummy; (void) dummy;
+#endif
}
SwTextAPIObject::~SwTextAPIObject() throw()