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

6 files changed, 21 insertions, 13 deletions

diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 14a608368..ca40f51af 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -739,10 +739,12 @@ sal_Bool SAL_CALL ORowSetBase::isLast(  ) throw(SQLException, RuntimeException)
         return sal_False;
 
     if ( rowDeleted() )
+    {
         if ( !m_pCache->m_bRowCountFinal )
             return sal_False;
         else
             return ( m_nDeletedPosition == impl_getRowCount() );
+    }
 
     positionCache( MOVE_NONE_REFRESH_ONLY );
     sal_Bool bIsLast = m_pCache->isLast();
diff --git a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx
index d255b7171..cf245d3b1 100644
--- a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx
+++ b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx
@@ -36,11 +36,12 @@ namespace adabasui
     //------------------------------------------------------------------
     sal_Bool isCharOk(sal_Unicode _cChar)
     {
-        return	(_cChar >= 'A' && _cChar <= 'Z'		||
-                 _cChar == '_'						||
-                 (_cChar >= '0' && _cChar <= '9')	||
-                 (_cChar >= 'a' && _cChar <= 'z'));
-
+        return (
+                (_cChar >= 'A' && _cChar <= 'Z') ||
+                _cChar == '_' ||
+                ((_cChar >= '0' && _cChar <= '9')) ||
+                ((_cChar >= 'a' && _cChar <= 'z'))
+               );
     }
     //------------------------------------------------------------------
     sal_Bool OSQLNameChecker::checkString(	const ::rtl::OUString& _sOldValue,
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index 918704157..91a994897 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -436,10 +436,12 @@ namespace sdbtools
 
         String sBaseName( _BaseName );
         if ( sBaseName.Len() == 0 )
+        {
             if ( _CommandType == CommandType::TABLE )
                 sBaseName = String( SdbtRes( STR_BASENAME_TABLE ) );
             else
                 sBaseName = String( SdbtRes( STR_BASENAME_QUERY ) );
+        }
 
         ::rtl::OUString sName( sBaseName );
         sal_Int32 i = 1;
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 04752b2bb..bf9e2b4af 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2358,10 +2358,12 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn
     {
         Reference< XInterface >  xCurrent(aColumnControls->getByIndex(nViewPos),UNO_QUERY);
         if (IsSearchableControl(xCurrent))
+        {
             if (pInfo->nFieldPos)
                 --pInfo->nFieldPos;
             else
                 break;
+        }
     }
 
     Reference< ::com::sun::star::form::XGrid >	xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx
index 45dbb7500..dce6c4bd3 100644
--- a/dbaccess/source/ui/control/SqlNameEdit.cxx
+++ b/dbaccess/source/ui/control/SqlNameEdit.cxx
@@ -38,12 +38,13 @@ namespace dbaui
     //------------------------------------------------------------------
     sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const ::rtl::OUString& _sAllowedChars)
     {
-        return	(_cChar >= 'A' && _cChar <= 'Z'						||
-                 _cChar == '_'										||
-                 _sAllowedChars.indexOf(_cChar) != -1				||
-                 (!_bFirstChar && (_cChar >= '0' && _cChar <= '9'))	||
-                 (!_bUpperCase && (_cChar >= 'a' && _cChar <= 'z')));
-
+        return	(
+                 (_cChar >= 'A' && _cChar <= 'Z') ||
+                 _cChar == '_' ||
+                 _sAllowedChars.indexOf(_cChar) != -1 ||
+                 (!_bFirstChar && (_cChar >= '0' && _cChar <= '9')) ||
+                 (!_bUpperCase && (_cChar >= 'a' && _cChar <= 'z'))
+                );
     }
     //------------------------------------------------------------------
     sal_Bool OSQLNameChecker::checkString(	const ::rtl::OUString& _sOldValue,
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 5d7768a16..2e93f9b31 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1301,8 +1301,8 @@ void adjustToolBoxSize(ToolBox* _pToolBox)
         aSize.Height() = aOldSize.Height();
 
     Size aTbSize = _pToolBox->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()) )
     {
         _pToolBox->SetPosSizePixel( _pToolBox->GetPosPixel(), aSize );
         _pToolBox->Invalidate();