diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-28 13:36:31 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-29 11:37:47 +0100 |
| commit | f801b7f07d73d973c2a34662626a4a0e033fa6e6 (patch) | |
| tree | 067999fe915391bc0531fee67800890ee6f2423f | |
| parent | 31ca7f6d71432081764782ce576cec1fd79e703f (diff) | |
sw: translate "Rekursiv"
Change-Id: Ib40dcbda3b2b9c8c196303f3f0c49e0ab05e0404
| -rw-r--r-- | sw/source/core/bastyp/swcache.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/doc/tblrwcl.cxx | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx index 7b2d4e205fc9..7c1c3e1253ce 100644 --- a/sw/source/core/bastyp/swcache.cxx +++ b/sw/source/core/bastyp/swcache.cxx @@ -33,7 +33,7 @@ void SwCache::Check() sal_uInt16 nCnt = 0; bool bFirstFound = false; SwCacheObj *pObj = pRealFirst; - SwCacheObj *pRekursive = pObj; + SwCacheObj *const pOldRealFirst = pRealFirst; while ( pObj ) { // the object must be found also when moving backwards @@ -48,7 +48,7 @@ void SwCache::Check() if ( !pObj->GetNext() ) SAL_WARN_IF( pObj != pLast, "sw.core", "Last not Found." ); pObj = pObj->GetNext(); - SAL_WARN_IF( pObj == pRekursive, "sw.core", "Recursion in SwCache." ); + SAL_WARN_IF(pObj == pOldRealFirst, "sw.core", "Recursion in SwCache."); } SAL_WARN_IF( !bFirstFound, "sw.core", "First not Found." ); SAL_WARN_IF( nCnt + aFreePositions.size() != size(), "sw.core", "Lost Chain." ); diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 2565bf0d008f..95bb03d0f6e5 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -3047,7 +3047,7 @@ static void lcl_ChgBoxSize( SwTableBox& rBox, CR_SetBoxWidth& rParam, } } -static bool lcl_DeleteBox_Rekursiv( CR_SetBoxWidth& rParam, SwTableBox& rBox, +static bool lcl_DeleteBox_Recursive( CR_SetBoxWidth& rParam, SwTableBox& rBox, bool bCheck ) { bool bRet = true; @@ -3075,9 +3075,13 @@ static bool lcl_DeleteBox_Rekursiv( CR_SetBoxWidth& rParam, SwTableBox& rBox, { SwTableLine& rLine = *rBox.GetTabLines()[ --i ]; for( sal_uInt16 n = rLine.GetTabBoxes().size(); n; ) - if( !::lcl_DeleteBox_Rekursiv( rParam, + { + if (!::lcl_DeleteBox_Recursive( rParam, *rLine.GetTabBoxes()[ --n ], bCheck )) + { return false; + } + } } } return bRet; @@ -3203,15 +3207,17 @@ static bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam, COLFUZZY > std::abs( rParam.bLeft ? nWidth - nDist : (nDist + nWidth - rParam.nTblWidth ))) - || !::lcl_DeleteBox_Rekursiv( rParam, *pBox, bCheck ) ) + || !::lcl_DeleteBox_Recursive(rParam, *pBox, bCheck)) + { return false; + } if( pFmt->GetProtect().IsCntntProtected() ) return false; } else { - ::lcl_DeleteBox_Rekursiv( rParam, *pBox, bCheck ); + ::lcl_DeleteBox_Recursive(rParam, *pBox, bCheck); if( !rParam.bLeft ) --n, --nCntEnd; |