Kaydet (Commit) 81ce629c authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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/42949Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 43b02c45
...@@ -85,6 +85,9 @@ WallFloorWrapper::WallFloorWrapper( bool bWall, ...@@ -85,6 +85,9 @@ WallFloorWrapper::WallFloorWrapper( bool bWall,
m_bWall( 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() WallFloorWrapper::~WallFloorWrapper()
......
...@@ -41,6 +41,9 @@ namespace cppcanvas ...@@ -41,6 +41,9 @@ namespace cppcanvas
mxBitmap( rCanvas, mxBitmap( rCanvas,
uno::UNO_QUERY ) 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( mxBitmapCanvas.is(), "ImplBitmapCanvas::ImplBitmapCanvas(): Invalid canvas" );
OSL_ENSURE( mxBitmap.is(), "ImplBitmapCanvas::ImplBitmapCanvas(): Invalid bitmap" ); OSL_ENSURE( mxBitmap.is(), "ImplBitmapCanvas::ImplBitmapCanvas(): Invalid bitmap" );
} }
......
...@@ -49,6 +49,9 @@ namespace cppcanvas ...@@ -49,6 +49,9 @@ namespace cppcanvas
mxSpriteCanvas( rCanvas ), mxSpriteCanvas( rCanvas ),
mpTransformArbiter( new TransformationArbiter() ) 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" ); OSL_ENSURE( mxSpriteCanvas.is(), "ImplSpriteCanvas::ImplSpriteCanvas(): Invalid canvas" );
} }
......
...@@ -61,6 +61,9 @@ namespace frm ...@@ -61,6 +61,9 @@ namespace frm
ORichTextUnoWrapper::ORichTextUnoWrapper( EditEngine& _rEngine, IEngineTextChangeListener* _pTextChangeListener ) ORichTextUnoWrapper::ORichTextUnoWrapper( EditEngine& _rEngine, IEngineTextChangeListener* _pTextChangeListener )
:SvxUnoText( getTextEnginePropertySet() ) :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 ) ); SetEditSource( new RichTextEditSource( _rEngine, _pTextChangeListener ) );
} }
......
...@@ -95,6 +95,9 @@ SC_SIMPLE_SERVICE_INFO( ScHeaderFooterTextObj, "ScHeaderFooterTextObj", "stardiv ...@@ -95,6 +95,9 @@ SC_SIMPLE_SERVICE_INFO( ScHeaderFooterTextObj, "ScHeaderFooterTextObj", "stardiv
ScHeaderFooterContentObj::ScHeaderFooterContentObj() 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() {} ScHeaderFooterContentObj::~ScHeaderFooterContentObj() {}
......
...@@ -57,6 +57,9 @@ UndoTextAPIChanged::UndoTextAPIChanged(SdrModel& rModel, TextApiObject* pTextObj ...@@ -57,6 +57,9 @@ UndoTextAPIChanged::UndoTextAPIChanged(SdrModel& rModel, TextApiObject* pTextObj
, mpNewText( nullptr ) , mpNewText( nullptr )
, mxTextObj( pTextObj ) , 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() UndoTextAPIChanged::~UndoTextAPIChanged()
......
...@@ -47,6 +47,9 @@ AccessiblePageShape::AccessiblePageShape ( ...@@ -47,6 +47,9 @@ AccessiblePageShape::AccessiblePageShape (
: AccessibleShape (AccessibleShapeInfo (nullptr, rxParent), rShapeTreeInfo), : AccessibleShape (AccessibleShapeInfo (nullptr, rxParent), rShapeTreeInfo),
mxPage (rxPage) 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 // The main part of the initialization is done in the init method which
// has to be called from this constructor's caller. // has to be called from this constructor's caller.
} }
......
...@@ -36,6 +36,9 @@ AccessiblePresentationGraphicShape::AccessiblePresentationGraphicShape ( ...@@ -36,6 +36,9 @@ AccessiblePresentationGraphicShape::AccessiblePresentationGraphicShape (
const AccessibleShapeTreeInfo& rShapeTreeInfo) const AccessibleShapeTreeInfo& rShapeTreeInfo)
: AccessibleGraphicShape (rShapeInfo, 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() AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape()
......
...@@ -36,6 +36,9 @@ AccessiblePresentationOLEShape::AccessiblePresentationOLEShape ( ...@@ -36,6 +36,9 @@ AccessiblePresentationOLEShape::AccessiblePresentationOLEShape (
const AccessibleShapeTreeInfo& rShapeTreeInfo) const AccessibleShapeTreeInfo& rShapeTreeInfo)
: AccessibleOLEShape (rShapeInfo, 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() AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape()
......
...@@ -56,6 +56,9 @@ SwTextAPIObject::SwTextAPIObject( SwTextAPIEditSource* p ) ...@@ -56,6 +56,9 @@ SwTextAPIObject::SwTextAPIObject( SwTextAPIEditSource* p )
: SvxUnoText( p, ImplGetSvxTextPortionPropertySet(), uno::Reference < text::XText >() ) : SvxUnoText( p, ImplGetSvxTextPortionPropertySet(), uno::Reference < text::XText >() )
, pSource(p) , 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() SwTextAPIObject::~SwTextAPIObject() throw()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment