CWS-TOOLING: integrate CWS cmcfixes77

13 files changed, 84 insertions, 42 deletions

diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 8a1e8fe9ea7a..e52fc31fb0b5 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -650,9 +650,11 @@ const SwPageFrm* SwRootFrm::GetPageAtPos( const Point& rPt, const Size* pSize, b
     {
         const SwRect& rBoundRect = bExtend ? maPageRects[ nPageIdx++ ] : pPage->Frm();
 
-        if ( !pSize && rBoundRect.IsInside( rPt ) ||
-              pSize && rBoundRect.IsOver( aRect ) )
+        if ( (!pSize && rBoundRect.IsInside(rPt)) ||
+              (pSize && rBoundRect.IsOver(aRect)) )
+        {
             pRet = static_cast<const SwPageFrm*>(pPage);
+        }
 
         pPage = pPage->GetNext();
     }
@@ -1719,8 +1721,8 @@ const SwCellFrm& SwCellFrm::FindStartEndOfRowSpanCell( bool bStart, bool bCurren
                 else
                 {
                     if ( pMasterTable == pTableFrm ||
-                         (  bStart && pMasterTable->IsAnFollow( pTableFrm ) ||
-                           !bStart && pTableFrm->IsAnFollow( pMasterTable ) ) )
+                         (  (bStart && pMasterTable->IsAnFollow(pTableFrm)) ||
+                           (!bStart && pTableFrm->IsAnFollow(pMasterTable)) ) )
                     {
                         pRet = pMasterCell;
                         break;
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index b51b2efc0a51..aec3fde909f1 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1073,23 +1073,33 @@ BOOL SwLayAction::TurboAction()
 |*  Letzte Aenderung    MA 18. Jul. 96
 |*
 |*************************************************************************/
-const SwFrm *lcl_FindFirstInvaLay( const SwFrm *pFrm, long nBottom )
+static bool lcl_IsInvaLay( const SwFrm *pFrm, long nBottom )
+{
+    if (
+         !pFrm->IsValid() ||
+         (pFrm->IsCompletePaint() && pFrm->Frm().Top() < nBottom)
+       )
+    {
+        return true;
+    }
+    return false;
+}
+
+static const SwFrm *lcl_FindFirstInvaLay( const SwFrm *pFrm, long nBottom )
 {
     ASSERT( pFrm->IsLayoutFrm(), "FindFirstInvaLay, no LayFrm" );
 
-    if ( !pFrm->IsValid() || pFrm->IsCompletePaint() &&
-         pFrm->Frm().Top() < nBottom )
+    if (lcl_IsInvaLay(pFrm, nBottom))
         return pFrm;
     pFrm = ((SwLayoutFrm*)pFrm)->Lower();
     while ( pFrm )
     {
         if ( pFrm->IsLayoutFrm() )
         {
-            if ( !pFrm->IsValid() || pFrm->IsCompletePaint() &&
-                 pFrm->Frm().Top() < nBottom )
+            if (lcl_IsInvaLay(pFrm, nBottom))
                 return pFrm;
             const SwFrm *pTmp;
-            if ( 0 != (pTmp = ::lcl_FindFirstInvaLay( pFrm, nBottom )) )
+            if ( 0 != (pTmp = lcl_FindFirstInvaLay( pFrm, nBottom )) )
                 return pTmp;
         }
         pFrm = pFrm->GetNext();
@@ -1097,7 +1107,7 @@ const SwFrm *lcl_FindFirstInvaLay( const SwFrm *pFrm, long nBottom )
     return 0;
 }
 
-const SwFrm *lcl_FindFirstInvaCntnt( const SwLayoutFrm *pLay, long nBottom,
+static const SwFrm *lcl_FindFirstInvaCntnt( const SwLayoutFrm *pLay, long nBottom,
                                      const SwCntntFrm *pFirst )
 {
     const SwCntntFrm *pCnt = pFirst ? pFirst->GetNextCntntFrm() :
@@ -1144,7 +1154,7 @@ const SwFrm *lcl_FindFirstInvaCntnt( const SwLayoutFrm *pLay, long nBottom,
 }
 
 // --> OD 2005-02-21 #i37877# - consider drawing objects
-const SwAnchoredObject* lcl_FindFirstInvaObj( const SwPageFrm* _pPage,
+static const SwAnchoredObject* lcl_FindFirstInvaObj( const SwPageFrm* _pPage,
                                               long _nBottom )
 {
     ASSERT( _pPage->GetSortedObjs(), "FindFirstInvaObj, no Objs" )
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index b45f1bcb2ceb..01f09f2c41c3 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -2358,9 +2358,9 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi
                 static const long nOuterClickDiff = 1000000;
 
                 // adjust borders for these special cases:
-                if ( bFirstColumn && !bRTL || bLastColumn && bRTL )
+                if ( (bFirstColumn && !bRTL) || (bLastColumn && bRTL) )
                     aPageRectWithBorders.SubLeft( nOuterClickDiff );
-                if ( bLastColumn && !bRTL || bFirstColumn && bRTL )
+                if ( (bLastColumn && !bRTL) || (bFirstColumn && bRTL) )
                     aPageRectWithBorders.AddRight( nOuterClickDiff );
                 if ( bFirstRow )
                     aPageRectWithBorders.SubTop( nOuterClickDiff );
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index be9c84cc88af..f70caa7ea710 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -81,8 +81,8 @@ void ValidateTxt( SwFrm *pFrm )     // Freund vom Frame
 {
     if ( ( ! pFrm->IsVertical() &&
              pFrm->Frm().Width() == pFrm->GetUpper()->Prt().Width() ) ||
-             pFrm->IsVertical() &&
-             pFrm->Frm().Height() == pFrm->GetUpper()->Prt().Height() )
+         (   pFrm->IsVertical() &&
+             pFrm->Frm().Height() == pFrm->GetUpper()->Prt().Height() ) )
         pFrm->bValidSize = sal_True;
 /*
     pFrm->bValidPrtArea = sal_True;
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 60b476839705..36eaed83795c 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -916,12 +916,20 @@ USHORT SwTxtNode::GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd )
         while( nStop < nEnd && nStop < nNextChg )
         {
             cChar = m_Text.GetChar( nStop );
-            if( CH_TAB == cChar || CH_BREAK == cChar ||
-                CHAR_HARDBLANK == cChar || CHAR_HARDHYPHEN == cChar ||
+            if (
+                CH_TAB == cChar ||
+                CH_BREAK == cChar ||
+                CHAR_HARDBLANK == cChar ||
+                CHAR_HARDHYPHEN == cChar ||
                 CHAR_SOFTHYPHEN == cChar ||
-               ( CH_TXTATR_BREAKWORD == cChar ||  CH_TXTATR_INWORD == cChar ) &&
-               ( 0 == ( pHint = aIter.GetAttr( nStop ) ) ) )
+                (
+                  (CH_TXTATR_BREAKWORD == cChar || CH_TXTATR_INWORD == cChar) &&
+                  (0 == (pHint = aIter.GetAttr(nStop)))
+                )
+               )
+            {
                 break;
+            }
             else
                 ++nStop;
         }
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 0ae80fb5306f..8ce4f6523ba0 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1593,8 +1593,8 @@ xub_StrLen SwTxtFormatter::FormatLine( const xub_StrLen nStartPos )
         }
         else
         {
-            bBuild = ( GetInfo().GetTxtFly()->IsOn() && ChkFlyUnderflow( GetInfo() )
-                     || GetInfo().CheckFtnPortion( pCurr ) );
+            bBuild = ( GetInfo().GetTxtFly()->IsOn() && ChkFlyUnderflow(GetInfo()) )
+                     || GetInfo().CheckFtnPortion(pCurr);
             if( bBuild )
             {
                 GetInfo().SetNumDone( bOldNumDone );
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 2bd7a46ac09f..50dbe9fdc451 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -495,7 +495,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
                 if( ( nDiff > 0 &&
                       ( GetEnd() < GetInfo().GetTxt().Len() ||
                         ( nDiff > nTmpHeight/2 && GetPrevLine() ) ) ) ||
-                    nDiff >= 0 && bNextUndersized )
+                    (nDiff >= 0 && bNextUndersized) )
 
                 {
                     SwArrowPortion aArrow( GetInfo() );
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index db245de1e28b..df915fc7192b 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -2027,10 +2027,10 @@ sal_Bool SwTxtFly::ForEach( const SwRect &rRect, SwRect* pRect, sal_Bool bAvoid
                     // <--
                     if( aFly.IsEmpty() || !aFly.IsOver( rRect ) )
                         continue;
-                    if( !bRet ||
+                    if( !bRet || (
                         ( !pCurrFrm->IsRightToLeft() &&
                           ( (aFly.*fnRect->fnGetLeft)() <
-                            (pRect->*fnRect->fnGetLeft)() ) ||
+                            (pRect->*fnRect->fnGetLeft)() ) ) ||
                         ( pCurrFrm->IsRightToLeft() &&
                           ( (aFly.*fnRect->fnGetRight)() >
                             (pRect->*fnRect->fnGetRight)() ) ) ) )
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index f793a7f854b7..c93409441be9 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -238,9 +238,13 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
         EnableItem( MN_READONLY_COPY, FALSE );
 
     eState = pVFrame->GetBindings().QueryState( SID_EDITDOC, pState );
-    if(eState < SFX_ITEM_DEFAULT ||
-        rSh.IsGlobalDoc() && rView.GetDocShell()->IsReadOnlyUI())
+    if (
+        eState < SFX_ITEM_DEFAULT ||
+        (rSh.IsGlobalDoc() && rView.GetDocShell()->IsReadOnlyUI())
+       )
+    {
         EnableItem( MN_READONLY_EDITDOC, FALSE );
+    }
 
     if ( !sURL.Len() )
     {
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 95001f897702..2088ce591bbe 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -559,10 +559,10 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill)
                        (nTypeId == TYP_SEQFLD && nWhich == RES_SETEXPFLD  &&
                        (((SwSetExpFieldType*)pFldType)->GetType() & nsSwGetSetExpType::GSE_SEQ)) ||
 
-                       ((nTypeId == TYP_INPUTFLD  || nTypeId == TYP_FORMELFLD) &&
+                       ((nTypeId == TYP_INPUTFLD || nTypeId == TYP_FORMELFLD) &&
                          (nWhich == RES_USERFLD ||
-                          nWhich == RES_SETEXPFLD &&
-                          !(((SwSetExpFieldType*)pFldType)->GetType() & nsSwGetSetExpType::GSE_SEQ)) ) )
+                          (nWhich == RES_SETEXPFLD &&
+                          !(((SwSetExpFieldType*)pFldType)->GetType() & nsSwGetSetExpType::GSE_SEQ))) ) )
                     {
                         String* pNew = new String(pFldType->GetName());
                         rToFill.Insert(pNew, rToFill.Count());
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index f5ad209d195a..d8e1eed0f3fc 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1539,7 +1539,7 @@ BOOL  SwTextFlowPage::FillItemSet( SfxItemSet& rSet )
     if ( bState != aPageCollCB.GetSavedValue() ||
          ( bState &&
            aPageCollLB.GetSelectEntryPos() != aPageCollLB.GetSavedValue() )
-           || aPageNoNF.IsEnabled() && aPageNoNF.IsValueModified())
+           || (aPageNoNF.IsEnabled() && aPageNoNF.IsValueModified()) )
     {
         String sPage;
 
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index e9b8fdf6feef..e221cf01376e 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -1241,11 +1241,20 @@ BOOL    SwGlobalTree::Update(BOOL bHard)
                     GlobalDocContentType eType = pLeft->GetType();
                     SvLBoxEntry* pEntry = GetEntry(i);
                     String sTemp = GetEntryText(pEntry);
-                    if(eType != pRight->GetType() ||
-                        eType == GLBLDOC_SECTION &&
-                            (pLeft->GetSection()->GetSectionName() != sTemp) ||
-                        eType == GLBLDOC_TOXBASE && pLeft->GetTOX()->GetTitle() != sTemp)
-                            bCopy = bRet = TRUE;
+                    if (
+                         eType != pRight->GetType() ||
+                         (
+                           eType == GLBLDOC_SECTION &&
+                           pLeft->GetSection()->GetSectionName() != sTemp
+                         ) ||
+                         (
+                           eType == GLBLDOC_TOXBASE &&
+                           pLeft->GetTOX()->GetTitle() != sTemp
+                         )
+                       )
+                    {
+                        bCopy = bRet = TRUE;
+                    }
                 }
             }
             if(bCopy || bHard)
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index baf059c51c32..b059c12a4a50 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/ui/utlui/numfmtlb.cxx
@@ -368,13 +368,22 @@ void NumFormatListBox::SetDefFormat(const ULONG nDefFmt)
     ULONG nShortDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysShortDateFmt, LANGUAGE_SYSTEM );
     ULONG nLongDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysLongDateFmt, LANGUAGE_SYSTEM );
 
-    if(nDefFmt == nSysNumFmt||
-        nDefFmt == nSysShortDateFmt||
-        nDefFmt == nSysLongDateFmt||
-        bSysLang && (nDefFmt == nNumFormatForLanguage ||
-        nDefFmt == nShortDateFormatForLanguage ||
-        nDefFmt == nLongDateFormatForLanguage ))
+    if (
+         nDefFmt == nSysNumFmt ||
+         nDefFmt == nSysShortDateFmt ||
+         nDefFmt == nSysLongDateFmt ||
+         (
+           bSysLang &&
+           (
+             nDefFmt == nNumFormatForLanguage ||
+             nDefFmt == nShortDateFormatForLanguage ||
+             nDefFmt == nLongDateFormatForLanguage
+           )
+         )
+       )
+    {
         sValue += String(SW_RES(RID_STR_SYSTEM));
+    }
 
     nPos = InsertEntry(sValue, nPos);   // Als ersten numerischen Eintrag einfuegen
     SetEntryData(nPos, (void*)nDefFmt);