sw/source/core/ole/ndole.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 7a3485a62f9da2e0a7a7c26d8673815185511188
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jul 14 13:58:23 2016 +0200
Disambiguate DeflateThread classes
...in package/source/zippackage/ZipPackageStream.cxx and
sw/source/core/ole/ndole.cxx. The -fvisibility-ms-compat used under
-fsanitze=*
(cf. gb__visibility_hidden in solenv/gbuild/platform/com_GCC_defs.mk)
causes the
vtables of both classes to each be exported weakly from the package2 and sw
libraries, respectively, and e.g. CppunitTest_chart2_export under ASan
happend
to erroneously use the vtable from sw in package2, causing a bogus error.
Change-Id: I4e3ca96f1fd9a423b8df9fb1d9682dab8cb63192
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index e569ade..35f51fa 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -672,6 +672,8 @@ comphelper::ThreadPool* getLocalThreadPool()
return pLocalPool;
}
+namespace { class DeflateThread; }
+
/// Holder for local data for a parallely-executed task to load a chart model
class DeflateData
{
@@ -730,6 +732,8 @@ public:
}
};
+namespace {
+
/// Task for parallely-executed task to load a chart model
class DeflateThread : public comphelper::ThreadTask
{
@@ -768,6 +772,8 @@ private:
}
};
+}
+
//////////////////////////////////////////////////////////////////////////////
SwOLEObj::SwOLEObj( const svt::EmbeddedObjectRef& xObj ) :
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
