[Libreoffice-commits] .: 3 commits - sw/source

[David Tardon]

 sw/source/core/unocore/unotext.cxx |    7 ++-----
 sw/source/ui/index/cnttab.cxx      |    2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 925080cf0d23dd25f7bec0875d92f6b66e231da0
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Feb 22 07:28:11 2011 +0100

    add SolarMutexGuard

diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 4608466..68a5cdc 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1793,6 +1793,8 @@ void SwXText::copyText(
     const uno::Reference< text::XTextCopy >& xSource )
         throw ( uno::RuntimeException )
 {
+    SolarMutexGuard aGuard;
+
     uno::Reference< text::XText > xText( xSource, uno::UNO_QUERY_THROW );
     uno::Reference< text::XTextCursor > xCursor = xText->createTextCursor( );
     xCursor->gotoEnd( sal_True );
commit b5a3e3de0edb4f3bad4863ade7bc7630fc78dd23
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Feb 22 07:26:53 2011 +0100

    fix assertion

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index ef61648..add255a 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3117,7 +3117,7 @@ void	SwTokenWindow::InsertAtSelection(
 
         if(bPreEndLinkFound)
         {
-            OSL_ENSURE(iterExchange != aControlList.end(), "no control to exchange?");
+            OSL_ENSURE(pExchange, "no control to exchange?");
 
             if(pExchange)
             {
commit af9b33ca9184d6036d198ba4cb6149df166b716b
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Feb 22 07:26:37 2011 +0100

    WaE: unused variable

diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 78952cf..4608466 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1793,11 +1793,6 @@ void SwXText::copyText(
     const uno::Reference< text::XTextCopy >& xSource )
         throw ( uno::RuntimeException )
 {
-    uno::Reference< lang::XUnoTunnel > xTTunnel( xSource, uno::UNO_QUERY_THROW );
-    SwXText* pText = 0;
-    pText = reinterpret_cast< SwXText* >(
-                   sal::static_int_cast< sal_IntPtr >( xTTunnel->getSomething( SwXText::getUnoTunnelId()) ));
-    
     uno::Reference< text::XText > xText( xSource, uno::UNO_QUERY_THROW );
     uno::Reference< text::XTextCursor > xCursor = xText->createTextCursor( );
     xCursor->gotoEnd( sal_True );