Drop MSVC special-casing for OWeakObject ctor
It was introduced in commit0c38ca4412author Daniel Boelzle <dbo@openoffice.org> date Mon Nov 18 08:59:15 2002 +0000 #104560# outlining of msvc mapfile symbols cppuhelper/source/msvc_win32_intel.map was dropped in commitb222aa8fffauthor Matúš Kukan <matus.kukan@gmail.com> date Tue Aug 23 15:03:09 2011 +0200 cppuhelper: convert to gbuild The symbol '??0OWeakObject@cppu@@QEAA@XZ' is still exported from cppuhelper3MSC.dll (checked using dumpbin, that number and names of exported symbols are the same), thanks to the CPPUHELPER_DLLPUBLIC macro at the class, that expands to __declspec(dllexport) [1], [2]. Hence, this patch is expected to not cause an ABI change. [1] https://docs.microsoft.com/en-us/cpp/cpp/dllexport-dllimport [2] https://docs.microsoft.com/en-us/cpp/build/exporting-from-a-dll-using-declspec-dllexport Change-Id: I895c350970f0e4e0adc1ba90f60925f8d4ba3941 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127471 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
committed by
Stephan Bergmann
parent
492a64a694
commit
745dcdb1e7
@@ -205,16 +205,6 @@ void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference
|
||||
|
||||
//-- OWeakObject -------------------------------------------------------
|
||||
|
||||
|
||||
#ifdef _MSC_VER
|
||||
// Accidentally occurs in msvc mapfile = > had to be outlined.
|
||||
OWeakObject::OWeakObject()
|
||||
: m_refCount( 0 ),
|
||||
m_pWeakConnectionPoint( nullptr )
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
// XInterface
|
||||
Any SAL_CALL OWeakObject::queryInterface( const Type & rType )
|
||||
{
|
||||
|
||||
@@ -95,12 +95,6 @@ public:
|
||||
{}
|
||||
/// @endcond
|
||||
|
||||
#ifdef _MSC_VER
|
||||
/** Default Constructor. Sets the reference count to zero.
|
||||
Accidentally occurs in msvc mapfile = > had to be outlined.
|
||||
*/
|
||||
OWeakObject();
|
||||
#else
|
||||
/** Default Constructor. Sets the reference count to zero.
|
||||
*/
|
||||
OWeakObject()
|
||||
@@ -108,7 +102,7 @@ public:
|
||||
, m_pWeakConnectionPoint( NULL )
|
||||
, m_pReserved(NULL)
|
||||
{}
|
||||
#endif
|
||||
|
||||
/** Dummy copy constructor. Set the reference count to zero.
|
||||
*/
|
||||
OWeakObject( const OWeakObject & )
|
||||
|
||||
Reference in New Issue
Block a user