[Libreoffice-commits] .: sw/source

Joren De Cuyper joren.libreoffice at telenet.be
Sat Feb 2 05:42:09 PST 2013


 sw/source/core/txtnode/ndtxt.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 0cd3e819ecef72df2d586facd4e3f635fb95146a
Author: Joren De Cuyper <joren.libreoffice at telenet.be>
Date:   Sat Feb 2 02:59:30 2013 +0100

    fix if statement and translate German OSL_ENSURE
    
    Change-Id: I3eefa563e00e6a4dcb3f1e5726bdf6d27f536624
    Reviewed-on: https://gerrit.libreoffice.org/1960
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index ab4cd3c..703e632 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1071,10 +1071,9 @@ void SwTxtNode::_ChgTxtCollUpdateNum( const SwTxtFmtColl *pOldColl,
     {
         SetAttrListLevel(nNewLevel);
     }
-
+    if (pDoc)
     {
-        if (pDoc)
-            pDoc->GetNodes().UpdateOutlineNode(*this);
+        pDoc->GetNodes().UpdateOutlineNode(*this);
     }
 
 
@@ -3575,9 +3574,9 @@ void SwTxtNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewVal
 
 SwFmtColl* SwTxtNode::ChgFmtColl( SwFmtColl *pNewColl )
 {
-    OSL_ENSURE( pNewColl,"ChgFmtColl: Collectionpointer ist 0." );
+    OSL_ENSURE( pNewColl,"ChgFmtColl: Collectionpointer has value 0." );
     OSL_ENSURE( HAS_BASE( SwTxtFmtColl, pNewColl ),
-                "ChgFmtColl: ist kein Text-Collectionpointer." );
+                "ChgFmtColl: is not a Text Collection pointer." );
 
     SwTxtFmtColl *pOldColl = GetTxtColl();
     if( pNewColl != pOldColl )


More information about the Libreoffice-commits mailing list