summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
authorDaniel Boelzle <dbo@openoffice.org>2002-11-18 08:59:15 +0000
committerDaniel Boelzle <dbo@openoffice.org>2002-11-18 08:59:15 +0000
commit16fef3ae24efa22ed893b70cc15de182c71483c7 (patch)
treeaf36faa4c6ffb95465464d8f5c17485ae2c56d2f /cppuhelper
parentdd303766199a39a3d0effe46885bdbbef8bfbde7 (diff)
#104560# outlining of msvc mapfile symbols
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/inc/cppuhelper/weak.hxx13
-rw-r--r--cppuhelper/source/weak.cxx13
2 files changed, 21 insertions, 5 deletions
diff --git a/cppuhelper/inc/cppuhelper/weak.hxx b/cppuhelper/inc/cppuhelper/weak.hxx
index 0401c82f6..102e81102 100644
--- a/cppuhelper/inc/cppuhelper/weak.hxx
+++ b/cppuhelper/inc/cppuhelper/weak.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: weak.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: dbo $ $Date: 2001-11-09 13:49:15 $
+ * last change: $Author: dbo $ $Date: 2002-11-18 09:59:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -138,12 +138,19 @@ public:
inline static void SAL_CALL operator delete( void *, void * ) SAL_THROW( () )
{}
- /** Constructor. Set the reference count to zero.
+#ifdef _MSC_VER
+ /** Default Constructor. Sets the reference count to zero.
+ Accidentally occurs in msvc mapfile = > had to be outlined.
+ */
+ OWeakObject() SAL_THROW( () );
+#else
+ /** Default Constructor. Sets the reference count to zero.
*/
inline OWeakObject() SAL_THROW( () )
: m_refCount( 0 )
, m_pWeakConnectionPoint( 0 )
{}
+#endif
/** Dummy copy constructor. Set the reference count to zero.
@param rObj dummy param
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index 233c04d54..f2c466f54 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: weak.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: dbo $ $Date: 2002-03-13 09:47:37 $
+ * last change: $Author: dbo $ $Date: 2002-11-18 09:59:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -222,6 +222,15 @@ void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference
//-- OWeakObject -------------------------------------------------------
//------------------------------------------------------------------------
+#ifdef _MSC_VER
+// Accidentally occurs in msvc mapfile = > had to be outlined.
+OWeakObject::OWeakObject() SAL_THROW( () )
+ : m_refCount( 0 ),
+ m_pWeakConnectionPoint( 0 )
+{
+}
+#endif
+
// XInterface
Any SAL_CALL OWeakObject::queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException)
{