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, 42 insertions, 25 deletions

diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 905e3fff5cd5..6487d3730fed 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1913,6 +1913,7 @@ void Document::handleParagraphNotifications()
                     if (sal::static_int_cast<sal_Int32>(n) < m_nSelectionFirstPara)
                         --m_nSelectionFirstPara;
                     else if (sal::static_int_cast<sal_Int32>(n) == m_nSelectionFirstPara)
+                    {
                         if (m_nSelectionFirstPara == m_nSelectionLastPara)
                         {
                             m_nSelectionFirstPara = -1;
@@ -1925,6 +1926,7 @@ void Document::handleParagraphNotifications()
                             ++m_nSelectionFirstPara;
                             m_nSelectionFirstPos = 0;
                         }
+                    }
                     if (sal::static_int_cast<sal_Int32>(n) < m_nSelectionLastPara)
                         --m_nSelectionLastPara;
                     else if (sal::static_int_cast<sal_Int32>(n) == m_nSelectionLastPara)
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index f1d375c360fe..12fbc883964d 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -4146,7 +4146,7 @@ SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl )
         if ( !Controls::pClasses )                        // Ist static, wird also nur einmal geladen
             ReadFlatArray( Controls::arClasses, Controls::pClasses );
 
-        if ( Controls::pClasses && Controls::pClasses->Seek_Entry( &WhatName )
+        if ( (Controls::pClasses && Controls::pClasses->Seek_Entry( &WhatName ))
             || rSymbol.EqualsIgnoreCaseAscii( "ID" )
             || rSymbol.EqualsIgnoreCaseAscii( "Name" ) )
             return TT_METHOD;
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index daab0798c75e..71de2963862b 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -639,8 +639,10 @@ void BibToolBar::AdjustToolBox()
         aSize.Height() = aOldSize.Height();
 
     Size aTbSize = GetSizePixel();
-    if ( aSize.Width() && aSize.Width() != aTbSize.Width() ||
-         aSize.Height() && aSize.Height() != aTbSize.Height() )
+    if (
+        (aSize.Width() && aSize.Width() != aTbSize.Width()) ||
+        (aSize.Height() && aSize.Height() != aTbSize.Height())
+       )
     {
         SetPosSizePixel( GetPosPixel(), aSize );
         Invalidate();
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 7f2e205b74d9..8bdb3333aa02 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -344,10 +344,12 @@ namespace pcr
         void implSetBitIfAffected( sal_uInt16& _nEnabledBits, sal_Int16 _nAffectedMask, sal_Int16 _nTestBit, bool _bSet )
         {
             if ( _nAffectedMask & _nTestBit )
+            {
                 if ( _bSet )
                     _nEnabledBits |= _nTestBit;
                 else
                     _nEnabledBits &= ~_nTestBit;
+            }
         }
 
         void implEnable( Window* _pWindow, sal_uInt16 _nEnabledBits, sal_uInt16 _nMatchBits  )
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 1e54e00a5d1b..11f464a8fde4 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -1193,6 +1193,7 @@ namespace pcr
             if  (   ( PROPERTY_ID_DEFAULTCHECKED == nPropId )
                 ||  ( PROPERTY_ID_STATE == nPropId )
                 )
+            {
                 if ( impl_componentHasProperty_throw( PROPERTY_TRISTATE ) )
                 {
                     if ( !::comphelper::getBOOL( m_xComponent->getPropertyValue( PROPERTY_TRISTATE ) ) )
@@ -1203,6 +1204,7 @@ namespace pcr
                 }
                 else
                     --pEnd;
+            }
 
             if ( PROPERTY_ID_LISTSOURCETYPE == nPropId )
                 if ( FormComponentType::COMBOBOX == m_nClassId )
@@ -1643,10 +1645,12 @@ namespace pcr
                     OFormattedNumericControl* pControl = dynamic_cast< OFormattedNumericControl* >( xControl.get() );
                     DBG_ASSERT( pControl, "FormComponentPropertyHandler::actuatingPropertyChanged: invalid control!" );
                     if ( pControl )
+                    {
                         if ( bAccuracy )
                             pControl->SetDecimalDigits( nNewDigits );
                         else
                             pControl->SetThousandsSep( bUseSep );
+                    }
                 }
             }
         }
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index b4ec5c0476f7..1789ff0e9c00 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -858,10 +858,12 @@ namespace pcr
             {
                 Reference< XComponent > xComp( *loop, UNO_QUERY );
                 if ( xComp.is() )
+                {
                     if ( _bOn )
                         xComp->addEventListener( static_cast< XPropertyChangeListener* >( this ) );
                     else
                         xComp->removeEventListener( static_cast< XPropertyChangeListener* >( this ) );
+                }
             }
             catch( const Exception& )
             {
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 2d21629ca5e0..e7ca93eacc18 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -1069,6 +1069,7 @@ void SAL_CALL UpdateInformationProvider::handle( uno::Reference< task::XInteract
                             xSupplyAuthentication->setPassword( aRec.UserList[0].Passwords[0].getStr() );
                         }
                         if ( aRec.UserList[0].Passwords.getLength() > 1 )
+                        {
                             if ( aAuthenticationRequest.HasRealm )
                             {
                                 if ( xSupplyAuthentication->canSetRealm() )
@@ -1076,6 +1077,7 @@ void SAL_CALL UpdateInformationProvider::handle( uno::Reference< task::XInteract
                             }
                             else if ( xSupplyAuthentication->canSetAccount() )
                                 xSupplyAuthentication->setAccount( aRec.UserList[0].Passwords[1].getStr() );
+                        }
                         xSupplyAuthentication->select();
                         return;
                     }
@@ -1096,6 +1098,7 @@ void SAL_CALL UpdateInformationProvider::handle( uno::Reference< task::XInteract
                             if ( xSupplyAuthentication->canSetPassword() )
                                 xSupplyAuthentication->setPassword(aRec.UserList[0].Passwords[0].getStr());
                             if ( aRec.UserList[0].Passwords.getLength() > 1 )
+                            {
                                 if ( aAuthenticationRequest.HasRealm )
                                 {
                                     if ( xSupplyAuthentication->canSetRealm() )
@@ -1103,6 +1106,7 @@ void SAL_CALL UpdateInformationProvider::handle( uno::Reference< task::XInteract
                                 }
                                 else if ( xSupplyAuthentication->canSetAccount() )
                                     xSupplyAuthentication->setAccount(aRec.UserList[0].Passwords[1].getStr());
+                            }
                             xSupplyAuthentication->select();
                             return;
                         }
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 84380a0edb97..5b41b825ff9c 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -458,10 +458,12 @@ DoPropertyListening::DoPropertyListening(
 void DoPropertyListening::handleListening( const ::rtl::OUString& _rPropertyName )
 {
     if ( m_xProps.is() )
+    {
         if ( m_bStartListening )
             m_xProps->addPropertyChangeListener( _rPropertyName, m_xListener );
         else
             m_xProps->removePropertyChangeListener( _rPropertyName, m_xListener );
+    }
 }
 
 //------------------------------------------------------------------------------
diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx
index 9f6e1c05b4f2..011121bdf56e 100644
--- a/forms/source/xforms/computedexpression.cxx
+++ b/forms/source/xforms/computedexpression.cxx
@@ -168,7 +168,7 @@ bool ComputedExpression::evaluate( const EvaluationContext& rContext )
 {
     // for simple expression we don't need to re-evaluate (if we have
     // an older result); neither for empty expressions
-    if( mbIsEmpty  ||  mxResult.is() && mbIsSimple )
+    if( mbIsEmpty || (mxResult.is() && mbIsSimple) )
         return true;
 
     return _evaluate( rContext, _getExpressionForEvaluation() );
diff --git a/forms/source/xforms/xmlhelper.cxx b/forms/source/xforms/xmlhelper.cxx
index 33f92f9102a0..6dacebcdc8a2 100644
--- a/forms/source/xforms/xmlhelper.cxx
+++ b/forms/source/xforms/xmlhelper.cxx
@@ -59,33 +59,33 @@ inline sal_uInt8 lcl_getCharClass( sal_Unicode c )
     sal_uInt8 nClass = 0;
 
     // NameStartChar
-    if( c >= 'A' && c <= 'Z'
+    if( (c >= 'A' && c <= 'Z')
         || c == '_'
-        || c >=    'a' && c <=    'z'
-        || c >= 0x00C0 && c <= 0x00D6
-        || c >= 0x00D8 && c <= 0x00F6
-        || c >= 0x00F8 && c <= 0x02FF
-        || c >= 0x0370 && c <= 0x037D
-        || c >= 0x037F && c <= 0x1FFF
-        || c >= 0x200C && c <= 0x200D
-        || c >= 0x2070 && c <= 0x218F
-        || c >= 0x2C00 && c <= 0x2FEF
-        || c >= 0x3001 && c <= 0xD7FF
-        || c >= 0xF900 && c <= 0xFDCF
-        || c >= 0xFDF0 && c <= 0xFFFD
+        || (c >=    'a' && c <=    'z')
+        || (c >= 0x00C0 && c <= 0x00D6)
+        || (c >= 0x00D8 && c <= 0x00F6)
+        || (c >= 0x00F8 && c <= 0x02FF)
+        || (c >= 0x0370 && c <= 0x037D)
+        || (c >= 0x037F && c <= 0x1FFF)
+        || (c >= 0x200C && c <= 0x200D)
+        || (c >= 0x2070 && c <= 0x218F)
+        || (c >= 0x2C00 && c <= 0x2FEF)
+        || (c >= 0x3001 && c <= 0xD7FF)
+        || (c >= 0xF900 && c <= 0xFDCF)
+        || (c >= 0xFDF0 && c <= 0xFFFD)
 
         // surrogates
-        || c >= 0xD800 && c <= 0xDBFF
-        || c >= 0xDC00 && c <= 0xDFFF )
+        || (c >= 0xD800 && c <= 0xDBFF)
+        || (c >= 0xDC00 && c <= 0xDFFF) )
     {
         nClass = 15;
     }
     else if( c == '-'
              || c == '.'
-             || c >= '0' && c <= '9'
-             || c == 0x00B7
-             || c >= 0x0300 && c <= 0x036F
-             || c >= 0x203F && c <= 0x2040 )
+             || (c >= '0' && c <= '9')
+             || (c == 0x00B7)
+             || (c >= 0x0300 && c <= 0x036F)
+             || (c >= 0x203F && c <= 0x2040) )
     {
         nClass = 10;
     }
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 2afd17dfabe0..e0c27b59c3c0 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -263,8 +263,7 @@ bool DigitalSignaturesDialog::canAdd()
     // see specification
     //cvs: specs/www/appwide/security/Electronic_Signatures_and_Security.sxw
     //Paragraph 'Behavior with regard to ODF 1.2'
-    if (!bSave1_1  && bDoc1_1
-        || bSave1_1 && bDoc1_1)
+    if ( (!bSave1_1  && bDoc1_1) || (bSave1_1 && bDoc1_1) )
     {
         //#4
         ErrorBox err(NULL, XMLSEC_RES(RID_XMLSECDLG_OLD_ODF_FORMAT));