CWS-TOOLING: integrate CWS cmcfixes51

2008-12-08 10:12:55 +0100 cmc  r264975 : #i96203# protect with ifdefs to avoid unused symbol on mac
2008-12-05 12:23:47 +0100 cmc  r264898 : CWS-TOOLING: rebase CWS cmcfixes51 to trunk@264807 (milestone: DEV300:m37)
2008-12-01 14:45:17 +0100 cmc  r264606 : #i76655# ehlos apparently required
2008-11-28 17:49:30 +0100 cmc  r264567 : #i96655# remove newly unused method
2008-11-28 10:41:28 +0100 cmc  r264531 : #i96647# better ppc-bridges flushCode impl
2008-11-27 12:58:40 +0100 cmc  r264478 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 12:32:49 +0100 cmc  r264476 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 12:26:02 +0100 cmc  r264475 : #i96655# redundant old table export helpers
2008-11-27 11:49:06 +0100 cmc  r264473 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 11:38:35 +0100 cmc  r264471 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 11:14:21 +0100 cmc  r264467 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 11:06:22 +0100 cmc  r264464 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:58:18 +0100 cmc  r264462 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:41:44 +0100 cmc  r264461 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:19:24 +0100 cmc  r264460 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:13:39 +0100 cmc  r264459 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 10:06:14 +0100 cmc  r264458 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:59:54 +0100 cmc  r264457 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:52:51 +0100 cmc  r264456 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:48:26 +0100 cmc  r264454 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:40:20 +0100 cmc  r264452 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:35:26 +0100 cmc  r264451 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:31:00 +0100 cmc  r264450 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 09:24:08 +0100 cmc  r264449 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 00:26:15 +0100 cmc  r264443 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 00:21:01 +0100 cmc  r264442 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-27 00:09:40 +0100 cmc  r264441 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 23:51:56 +0100 cmc  r264440 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 23:49:09 +0100 cmc  r264439 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 18:09:54 +0100 cmc  r264432 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 18:07:40 +0100 cmc  r264431 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 17:28:02 +0100 cmc  r264429 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 17:27:39 +0100 cmc  r264428 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 17:18:36 +0100 cmc  r264426 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 16:22:16 +0100 cmc  r264415 : #i96624# make implicit braces and brackets explicit to avoid warnings
2008-11-26 16:00:23 +0100 cmc  r264409 : #i90426# remove warnings from svtools
2008-11-26 15:59:17 +0100 cmc  r264408 : #i90426# remove warnings
2008-11-26 15:47:32 +0100 cmc  r264404 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:46:57 +0100 cmc  r264394 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:19:50 +0100 cmc  r264387 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:15:26 +0100 cmc  r264386 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 14:11:26 +0100 cmc  r264384 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 13:44:23 +0100 cmc  r264380 : #i96084# comfirm existing logic with explicit brackets to remove new gcc warnings
2008-11-26 13:12:24 +0100 cmc  r264372 : #i96604# silence new warnings
2008-11-26 12:35:02 +0100 cmc  r264369 : #i96203# make qstarter work in 3-layer land
2008-11-26 12:33:04 +0100 cmc  r264368 : #i96170# ensure gtypes are up and running

11 files changed, 71 insertions, 36 deletions

diff --git a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
index 7e6ed0a498..a34eaf781e 100644
--- a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
@@ -78,9 +78,9 @@ namespace sdr
             virtual void zoomHasChanged();
 
             // data read access
-            const double getDiscreteWidth() const { return mfDiscreteWidth; }
-            const double getHatchRotation() const { return mfHatchRotation; }
-            const double getRotation() const { return mfRotation; }
+            double getDiscreteWidth() const { return mfDiscreteWidth; }
+            double getHatchRotation() const { return mfHatchRotation; }
+            double getRotation() const { return mfRotation; }
         };
     } // end of namespace overlay
 } // end of namespace sdr
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index be29ed6786..067e6bf3ab 100755
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -415,10 +415,12 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
         {
             // Merge current FOCUSED state from edit engine.
             if (mpText != NULL)
+            {
                 if (mpText->HaveFocus())
                     pStateSet->AddState (AccessibleStateType::FOCUSED);
                 else
                     pStateSet->RemoveState (AccessibleStateType::FOCUSED);
+            }
 
             // Create a copy of the state set that may be modified by the
             // caller without affecting the current state set.
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index c08ad153c1..166e663294 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -550,7 +550,13 @@ public:
     */
     inline bool operator == (const ChildDescriptor& aDescriptor)
     {
-        return (this == &aDescriptor || (mxShape.get() == aDescriptor.mxShape.get() ) && ( mxShape.is() || mxAccessibleShape.get() == aDescriptor.mxAccessibleShape.get()));
+        return (
+                this == &aDescriptor ||
+                (
+                 (mxShape.get() == aDescriptor.mxShape.get() ) && 
+                 (mxShape.is() || mxAccessibleShape.get() == aDescriptor.mxAccessibleShape.get())
+                )
+               );
     }
 
     /** The ordering defined by this operator is only used in order to be able
diff --git a/svx/source/dialog/border.cxx b/svx/source/dialog/border.cxx
index fc935406f2..1ab5a45b9e 100644
--- a/svx/source/dialog/border.cxx
+++ b/svx/source/dialog/border.cxx
@@ -739,16 +739,18 @@ BOOL SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
                 {
                     SvxBoxInfoItem* pOldBoxInfoItem = (SvxBoxInfoItem*)GetOldItem(
                                                         rCoreAttrs, SID_ATTR_BORDER_INNER );
-                    if(!pOldBoxItem ||
-                    aLeftMF  .GetText() != aLeftMF  .GetSavedValue() ||
-                    aRightMF .GetText() != aRightMF .GetSavedValue() ||
-                    aTopMF   .GetText() != aTopMF   .GetSavedValue() ||
-                    aBottomMF.GetText() != aBottomMF.GetSavedValue() ||
-                    nMinValue == aLeftMF  .GetValue() ||
-                    nMinValue == aRightMF .GetValue() ||
-                    nMinValue == aTopMF   .GetValue() ||
-                    nMinValue == aBottomMF.GetValue() ||
-                        pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(VALID_DISTANCE))
+                    if (
+                        !pOldBoxItem ||
+                        aLeftMF  .GetText() != aLeftMF  .GetSavedValue() ||
+                        aRightMF .GetText() != aRightMF .GetSavedValue() ||
+                        aTopMF   .GetText() != aTopMF   .GetSavedValue() ||
+                        aBottomMF.GetText() != aBottomMF.GetSavedValue() ||
+                        nMinValue == aLeftMF  .GetValue() ||
+                        nMinValue == aRightMF .GetValue() ||
+                        nMinValue == aTopMF   .GetValue() ||
+                        nMinValue == aBottomMF.GetValue() ||
+                        (pOldBoxInfoItem && !pOldBoxInfoItem->IsValid(VALID_DISTANCE)) 
+                       )
                     {
                         aBoxItem.SetDistance( (USHORT)GetCoreValue( aLeftMF, eCoreUnit ), BOX_LINE_LEFT  );
                         aBoxItem.SetDistance( (USHORT)GetCoreValue( aRightMF, eCoreUnit ), BOX_LINE_RIGHT );
diff --git a/svx/source/dialog/page.cxx b/svx/source/dialog/page.cxx
index cae357cdc2..06199f6752 100644
--- a/svx/source/dialog/page.cxx
+++ b/svx/source/dialog/page.cxx
@@ -1137,8 +1137,10 @@ IMPL_LINK( SvxPageDescPage, PaperSizeModify_Impl, Edit *, EMPTYARG )
 
 IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn )
 {
-    if ( !bLandscape && pBtn == &aLandscapeBtn ||
-         bLandscape  && pBtn == &aPortraitBtn )
+    if (
+        (!bLandscape && pBtn == &aLandscapeBtn) ||
+        (bLandscape  && pBtn == &aPortraitBtn)
+       )
     {
         bLandscape = aLandscapeBtn.IsChecked();
 
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 495366ead5..5e67d87e28 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -494,7 +494,7 @@ void SvxRubyDialog::Update()
                 sal_Bool bTmp = *(sal_Bool*)pProps[nProp].Value.getValue();
                 if(!nRuby)
                     nPosition = bTmp ? 0 : 1;
-                else  if(!nPosition && !bTmp || nPosition == 1 && bTmp  )
+                else if( (!nPosition && !bTmp) || (nPosition == 1 && bTmp)  )
                     nPosition = -2;
             }
             if(bCharStyleEqual &&
@@ -520,7 +520,7 @@ void SvxRubyDialog::Update()
         aAdjustLB.SetNoSelection();
     if(nPosition > -1)
         aPositionLB.SelectEntryPos(nPosition ? 1 : 0);
-    if(!nLen || bCharStyleEqual && !sCharStyleName.getLength())
+    if(!nLen || (bCharStyleEqual && !sCharStyleName.getLength()))
         sCharStyleName = C2U(cRubies);
     if(sCharStyleName.getLength())
     {
diff --git a/svx/source/editeng/eehtml.cxx b/svx/source/editeng/eehtml.cxx
index 37d0a79064..d380896531 100644
--- a/svx/source/editeng/eehtml.cxx
+++ b/svx/source/editeng/eehtml.cxx
@@ -646,7 +646,7 @@ void EditHTMLParser::ImpSetStyleSheet( USHORT nHLevel )
                 aItems.Put( aHeightItem );
 
                 // Absatzabstaende, wenn Heading:
-                if ( !nHLevel || ( nHLevel >= 1 ) && ( nHLevel <= 6 ) )
+                if ( !nHLevel || ((nHLevel >= 1) && (nHLevel <= 6)) )
                 {
                     SvxULSpaceItem aULSpaceItem( EE_PARA_ULSPACE );
                     aULSpaceItem.SetUpper( (USHORT)OutputDevice::LogicToLogic( 42, MAP_10TH_MM, eUnit ) );
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 88ede3f85e..38261ad613 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -750,10 +750,12 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r
         // script events
         Reference< XEventAttacherManager > xManager( _rxContainer, UNO_QUERY );
         if ( xManager.is() )
+        {
             if ( _bStartListening )
                 m_pScriptingEnv->registerEventAttacherManager( xManager );
             else
                 m_pScriptingEnv->revokeEventAttacherManager( xManager );
+        }
 
         // also handle all children of this element
         sal_uInt32 nCount = _rxContainer->getCount();
@@ -771,10 +773,12 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r
         Reference< XContainer > xSimpleContainer( _rxContainer, UNO_QUERY );
         OSL_ENSURE( xSimpleContainer.is(), "FmXUndoEnvironment::switchListening: how are we expected to be notified of changes in the container?" );
         if ( xSimpleContainer.is() )
+        {
             if ( _bStartListening )
                 xSimpleContainer->addContainerListener( this );
             else
                 xSimpleContainer->removeContainerListener( this );
+        }
     }
     catch( const Exception& )
     {
@@ -793,18 +797,22 @@ void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObje
         {
             Reference< XPropertySet > xProps( _rxObject, UNO_QUERY );
             if ( xProps.is() )
+            {
                 if ( _bStartListening )
                     xProps->addPropertyChangeListener( ::rtl::OUString(), this );
                 else
                     xProps->removePropertyChangeListener( ::rtl::OUString(), this );
+            }
         }
 
         Reference< XModifyBroadcaster > xBroadcaster( _rxObject, UNO_QUERY );
         if ( xBroadcaster.is() )
+        {
             if ( _bStartListening )
                 xBroadcaster->addModifyListener( this );
             else
                 xBroadcaster->removeModifyListener( this );
+        }
     }
     catch( const Exception& )
     {
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 97192fba08..5e55deff9c 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -988,8 +988,8 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( SvStrings& rList,short n
                 sal_Bool bInsFlag=sal_False;
                 if ( pNumEntry->HasNewCurrency() )
                     bInsFlag = sal_True;	// merge locale formats into currency selection
-                else if(!bTmpBanking && aNewFormNInfo.Search(rSymbol)!=STRING_NOTFOUND||
-                   bTmpBanking && aNewFormNInfo.Search(rBankSymbol)!=STRING_NOTFOUND)
+                else if( (!bTmpBanking && aNewFormNInfo.Search(rSymbol)!=STRING_NOTFOUND) ||
+                   (bTmpBanking && aNewFormNInfo.Search(rBankSymbol)!=STRING_NOTFOUND) )
                 {
                     bInsFlag=sal_True;
                 }
diff --git a/svx/source/items/numitem.cxx b/svx/source/items/numitem.cxx
index 5a4a7c916d..d4693fde03 100644
--- a/svx/source/items/numitem.cxx
+++ b/svx/source/items/numitem.cxx
@@ -446,14 +446,22 @@ BOOL  SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
         sCharStyleName      != rFormat.sCharStyleName
         )
         return FALSE;
-    if(pGraphicBrush && !rFormat.pGraphicBrush ||
-            !pGraphicBrush && rFormat.pGraphicBrush ||
-                pGraphicBrush && *pGraphicBrush != *rFormat.pGraphicBrush )
+    if (
+        (pGraphicBrush && !rFormat.pGraphicBrush) ||
+        (!pGraphicBrush && rFormat.pGraphicBrush) ||
+        (pGraphicBrush && *pGraphicBrush != *rFormat.pGraphicBrush) 
+       )
+    {
         return FALSE;
-    if(pBulletFont && !rFormat.pBulletFont ||
-            !pBulletFont && rFormat.pBulletFont ||
-                pBulletFont && *pBulletFont != *rFormat.pBulletFont)
+    }
+    if (
+        (pBulletFont && !rFormat.pBulletFont) ||
+        (!pBulletFont && rFormat.pBulletFont) ||
+        (pBulletFont && *pBulletFont != *rFormat.pBulletFont)
+       )
+    {
         return FALSE;
+    }
     return TRUE;
 }
 /* -----------------28.10.98 09:53-------------------
@@ -467,7 +475,7 @@ void SvxNumberFormat::SetGraphicBrush( const SvxBrushItem* pBrushItem,
         delete pGraphicBrush;
         pGraphicBrush = 0;
     }
-    else if(!pGraphicBrush || pGraphicBrush && !(*pBrushItem == *pGraphicBrush))
+    else if ( !pGraphicBrush || (pGraphicBrush && !(*pBrushItem == *pGraphicBrush)) )
     {
         delete pGraphicBrush;
         pGraphicBrush =  (SvxBrushItem*)pBrushItem->Clone();
@@ -947,11 +955,15 @@ int   SvxNumRule::operator==( const SvxNumRule& rCopy) const
             return FALSE;
     for(USHORT i = 0; i < nLevelCount; i++)
     {
-        if( aFmtsSet[i] != rCopy.aFmtsSet[i] ||
-            !aFmts[i] &&  rCopy.aFmts[i] ||
-            aFmts[i] &&  !rCopy.aFmts[i] ||
-            aFmts[i] && *aFmts[i] !=  *rCopy.aFmts[i] )
+        if (
+            (aFmtsSet[i] != rCopy.aFmtsSet[i]) ||
+            (!aFmts[i] && rCopy.aFmts[i]) ||
+            (aFmts[i] && !rCopy.aFmts[i]) ||
+            (aFmts[i] && *aFmts[i] !=  *rCopy.aFmts[i])
+           )
+        {
             return FALSE;
+        }
     }
     return TRUE;
 }
diff --git a/svx/source/outliner/outlvw.cxx b/svx/source/outliner/outlvw.cxx
index 6ac7d98bac..a415692ad4 100644
--- a/svx/source/outliner/outlvw.cxx
+++ b/svx/source/outliner/outlvw.cxx
@@ -1391,11 +1391,14 @@ void OutlinerView::StartTextConversion(
     INT32 nOptions, BOOL bIsInteractive, BOOL bMultipleDoc )
 {
     DBG_CHKTHIS(OutlinerView,0);
-    if (LANGUAGE_KOREAN == nSrcLang && LANGUAGE_KOREAN == nDestLang ||
-        LANGUAGE_CHINESE_SIMPLIFIED  == nSrcLang && LANGUAGE_CHINESE_TRADITIONAL == nDestLang ||
-        LANGUAGE_CHINESE_TRADITIONAL == nSrcLang && LANGUAGE_CHINESE_SIMPLIFIED  == nDestLang
-        )
+    if (
+        (LANGUAGE_KOREAN == nSrcLang && LANGUAGE_KOREAN == nDestLang) ||
+        (LANGUAGE_CHINESE_SIMPLIFIED  == nSrcLang && LANGUAGE_CHINESE_TRADITIONAL == nDestLang) ||
+        (LANGUAGE_CHINESE_TRADITIONAL == nSrcLang && LANGUAGE_CHINESE_SIMPLIFIED  == nDestLang)
+       )
+    {
         pEditView->StartTextConversion( nSrcLang, nDestLang, pDestFont, nOptions, bIsInteractive, bMultipleDoc );
+    }
     else
     {
         DBG_ERROR( "unexpected language" );