CWS-TOOLING: integrate CWS swunolocking1

5 files changed, 55 insertions, 24 deletions

diff --git a/cppuhelper/inc/cppuhelper/weakref.hxx b/cppuhelper/inc/cppuhelper/weakref.hxx
index 01a4c7c6e0df..5ed14743a520 100644
--- a/cppuhelper/inc/cppuhelper/weakref.hxx
+++ b/cppuhelper/inc/cppuhelper/weakref.hxx
@@ -79,13 +79,15 @@ public:
     */
     WeakReferenceHelper & SAL_CALL operator = ( const WeakReferenceHelper & rWeakRef ) SAL_THROW( () );
 
-    /** Releases this reference and takes over hard reference xInt. If the implementation behind
-        xInt does not support XWeak or XInt is null, than this reference is null.
+    /** Releases this reference and takes over hard reference xInt.
+        If the implementation behind xInt does not support XWeak
+        or XInt is null, then this reference is null.
 
         @param xInt another hard reference
     */
-    inline WeakReferenceHelper & SAL_CALL operator = ( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xInt ) SAL_THROW( () )
-        { return operator = ( WeakReferenceHelper( xInt ) ); }
+    WeakReferenceHelper & SAL_CALL operator = (
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::uno::XInterface > & xInt ) SAL_THROW( () );
 
     /** Returns true if both weak refs reference to the same object.
 
@@ -107,6 +109,12 @@ public:
     inline SAL_CALL operator Reference< XInterface > () const SAL_THROW( () )
         { return get(); }
 
+    /** Releases this reference.
+
+        @since UDK 3.2.12
+    */
+    void SAL_CALL clear() SAL_THROW( () );
+
 protected:
     /** @internal */
     OWeakRefListener * m_pImpl;
@@ -135,6 +143,19 @@ public:
         : WeakReferenceHelper( rRef )
         {}
 
+    /** Releases this reference and takes over hard reference xInt.
+        If the implementation behind xInt does not support XWeak
+        or XInt is null, then this reference is null.
+
+        @param xInt another hard reference
+
+        @since UDK 3.2.12
+    */
+    WeakReference & SAL_CALL operator = (
+            const ::com::sun::star::uno::Reference< interface_type > & xInt )
+        SAL_THROW( () )
+        { WeakReferenceHelper::operator=(xInt); return *this; }
+
     /**  Gets a hard reference to the object.
 
          @return hard reference or null, if the weakly referenced interface has gone
diff --git a/cppuhelper/source/cc5_solaris_sparc.map b/cppuhelper/source/cc5_solaris_sparc.map
index 0961c6830d1f..941465519a08 100755
--- a/cppuhelper/source/cc5_solaris_sparc.map
+++ b/cppuhelper/source/cc5_solaris_sparc.map
@@ -383,4 +383,6 @@ UDK_3.6 { # OOo 3.0
 UDK_3.7 { # OOo 3.3
     global:
         __1cEcppuLOWeakObjectbAdisposeWeakConnectionPoint6M_v_;
+        __1cDcomDsunEstarDunoTWeakReferenceHelper2G6Mrkn0DJReference4n0DKXInterface____r4_;
+        __1cDcomDsunEstarDunoTWeakReferenceHelperFclear6M_v_;
 } UDK_3.6;
diff --git a/cppuhelper/source/gcc3.map b/cppuhelper/source/gcc3.map
index 9348e91525c0..099373b2e220 100644
--- a/cppuhelper/source/gcc3.map
+++ b/cppuhelper/source/gcc3.map
@@ -377,5 +377,7 @@ UDK_3.5 { # OOo 3.0
 UDK_3.6 { # OOo 3.3
     global:
         _ZN4cppu11OWeakObject26disposeWeakConnectionPointEv;
+        _ZN3com3sun4star3uno19WeakReferenceHelperaSERKNS2_9ReferenceINS2_10XInterfaceEEE;
+        _ZN3com3sun4star3uno19WeakReferenceHelper5clearEv;
 } UDK_3.5;
 
diff --git a/cppuhelper/source/msvc_win32_intel.map b/cppuhelper/source/msvc_win32_intel.map
index c999ae200ac2..6bc10cb175c2 100644
--- a/cppuhelper/source/msvc_win32_intel.map
+++ b/cppuhelper/source/msvc_win32_intel.map
@@ -275,4 +275,5 @@ UDK_3.5 { # OOo 3.0
 UDK_3.6 { # OOo 3.3
     global:
         ?disposeWeakConnectionPoint@OWeakObject@cppu@@IAEXXZ;
+        ?clear@WeakReferenceHelper@uno@star@sun@com@@QAAXXZ;
 } UDK_3.5;
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index b518d2526e3b..1fbfb3fa96ad 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -479,50 +479,55 @@ WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef) SA
     }
 }
 
-WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& rWeakRef) SAL_THROW( () )
+void WeakReferenceHelper::clear() SAL_THROW( () )
 {
     try
     {
-    if (this != &rWeakRef)
-    {
-        Reference< XInterface > xInt( rWeakRef.get() );
         if (m_pImpl)
         {
             if (m_pImpl->m_XWeakConnectionPoint.is())
             {
-                m_pImpl->m_XWeakConnectionPoint->removeReference((XReference*)m_pImpl);
+                m_pImpl->m_XWeakConnectionPoint->removeReference(
+                        (XReference*)m_pImpl);
                 m_pImpl->m_XWeakConnectionPoint.clear();
             }
             m_pImpl->release();
             m_pImpl = 0;
         }
+    }
+    catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
+}
+
+WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& rWeakRef) SAL_THROW( () )
+{
+    if (this == &rWeakRef)
+    {
+        return *this;
+    }
+    Reference< XInterface > xInt( rWeakRef.get() );
+    return operator = ( xInt );
+}
+
+WeakReferenceHelper & SAL_CALL
+WeakReferenceHelper::operator= (const Reference< XInterface > & xInt)
+SAL_THROW( () )
+{
+    try
+    {
+        clear();
         if (xInt.is())
         {
             m_pImpl = new OWeakRefListener(xInt);
             m_pImpl->acquire();
         }
     }
-    }
     catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
     return *this;
 }
 
 WeakReferenceHelper::~WeakReferenceHelper() SAL_THROW( () )
 {
-    try
-    {
-    if (m_pImpl)
-    {
-        if (m_pImpl->m_XWeakConnectionPoint.is())
-        {
-            m_pImpl->m_XWeakConnectionPoint->removeReference((XReference*)m_pImpl);
-            m_pImpl->m_XWeakConnectionPoint.clear();
-        }
-        m_pImpl->release();
-        m_pImpl = 0; // for safety
-    }
-    }
-    catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
+    clear();
 }
 
 Reference< XInterface > WeakReferenceHelper::get() const SAL_THROW( () )