[Libreoffice-commits] core.git: chart2/source forms/source sc/source sd/source sw/source

[Stephan Bergmann]

 chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx     |    3 ---
 forms/source/richtext/richtextunowrapper.cxx                      |    3 ---
 sc/source/ui/unoobj/textuno.cxx                                   |    3 ---
 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 ---
 sw/source/core/fields/textapi.cxx                                 |    3 ---
 8 files changed, 24 deletions(-)

New commits:
commit 6325d571cae03357ea13354deea9df279377c730
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Apr 20 08:59:55 2018 +0200

    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.

diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index 73d57841c1fd..a05b3965b174 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -85,9 +85,6 @@ 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/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx
index 34a6fb48568c..ce5c15a58253 100644
--- a/forms/source/richtext/richtextunowrapper.cxx
+++ b/forms/source/richtext/richtextunowrapper.cxx
@@ -61,9 +61,6 @@ 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 c1071f85d57c..d868dffd3a84 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -96,9 +96,6 @@ 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 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()
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index 5813ecc832cc..05372f70faff 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -56,9 +56,6 @@ 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()