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

5 files changed, 28 insertions, 6 deletions

diff --git a/ucb/source/inc/regexpmap.tpt b/ucb/source/inc/regexpmap.tpt
index f1bd7dfa0d6f..084867e07f06 100644
--- a/ucb/source/inc/regexpmap.tpt
+++ b/ucb/source/inc/regexpmap.tpt
@@ -418,7 +418,9 @@ bool RegexpMap< Val >::add(rtl::OUString const & rKey, Val const & rValue,
 
 		typename List< Val >::iterator aEnd(rTheList.end());
 		for (typename List< Val >::iterator aIt(rTheList.begin()); aIt != aEnd; ++aIt)
+		{
 			if (aIt->m_aRegexp == aRegexp)
+			{
 				if (bOverwrite)
 				{
 					rTheList.erase(aIt);
@@ -426,6 +428,8 @@ bool RegexpMap< Val >::add(rtl::OUString const & rKey, Val const & rValue,
 				}
 				else
 					return false;
+			}
+		}
 
 		rTheList.push_back(Entry< Val >(aRegexp, rValue));
 	}
@@ -472,6 +476,7 @@ template< typename Val >
 void RegexpMap< Val >::erase(iterator const & rPos)
 {
 	if (rPos.m_pImpl->getMap() == m_pImpl)
+	{
 		if (rPos.m_pImpl->getList() == -1)
 		{
 			if (m_pImpl->m_pDefault)
@@ -483,6 +488,7 @@ void RegexpMap< Val >::erase(iterator const & rPos)
 		else
 			m_pImpl->m_aList[rPos.m_pImpl->getList()].
 				         erase(rPos.m_pImpl->getIndex());
+	}
 }
 
 //============================================================================
diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx
index f2bafa1f3b4e..d035cf523aff 100644
--- a/ucb/source/regexp/regexp.cxx
+++ b/ucb/source/regexp/regexp.cxx
@@ -158,6 +158,7 @@ bool Regexp::matches(rtl::OUString const & rString,
         }
 
         if (bMatches)
+        {
             if (m_bTranslation)
             {
                 if (pTranslation)
@@ -178,6 +179,7 @@ bool Regexp::matches(rtl::OUString const & rString,
                 if (pTranslated)
                     *pTranslated = false;
             }
+        }
     }
 
     return bMatches;
@@ -188,7 +190,7 @@ namespace unnamed_ucb_regexp {
 
 inline bool isAlpha(sal_Unicode c)
 {
-    return c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z';
+    return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z');
 }
 
 inline bool isDigit(sal_Unicode c)
@@ -447,7 +449,7 @@ Regexp Regexp::parse(rtl::OUString const & rRegexp)
         if (!matchString(&p, pEnd, RTL_CONSTASCII_STRINGPARAM("[^/?#]")))
             throw lang::IllegalArgumentException();
 
-        if (p == pEnd || *p != '*' && *p != '+')
+        if (p == pEnd || (*p != '*' && *p != '+'))
             throw lang::IllegalArgumentException();
         bool bEmptyDomain = *p++ == '*';
 
diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx
index ba66a6b8fa52..2b281e73319d 100644
--- a/ucb/source/ucp/ftp/ftpdirp.cxx
+++ b/ucb/source/ucp/ftp/ftpdirp.cxx
@@ -349,7 +349,7 @@ sal_Bool FTPDirectoryParser::parseDOS (
             case STATE_2_SIZE_LWS:
                 if (*p == 'd' || *p == 'D')
                     eState = STATE_2_D;
-                else if (*p >= 'a' && *p <= 'z' || *p >= 'A' && *p <= 'Z')
+                else if ((*p >= 'a' && *p <= 'z') || (*p >= 'A' && *p <= 'Z'))
                     eState = STATE_2_ATTRIB;
                 else if (*p >= '0' && *p <= '9')
                 {
@@ -603,10 +603,12 @@ sal_Bool FTPDirectoryParser::parseVMS (
                 ++p;
 
             if (*p != '.' || p == pFileName || p - pFileName > 39)
+            {
                 if (aFirstLineName.getLength())
                     continue;
                 else
                     return sal_False;
+            }
 
             // Parse <filetype ";"> part:
             const sal_Char *pFileType = ++p;
@@ -617,10 +619,12 @@ sal_Bool FTPDirectoryParser::parseVMS (
                 ++p;
 
             if (*p != ';' || p == pFileName || p - pFileName > 39)
+            {
                 if (aFirstLineName.getLength())
                     continue;
                 else
                     return sal_False;
+            }
             ++p;
 
             // Set entry's name and mode (ISDIR flag):
@@ -640,10 +644,12 @@ sal_Bool FTPDirectoryParser::parseVMS (
 
             // Skip <version> part:
             if (*p < '1' || *p > '9')
+            {
                 if (aFirstLineName.getLength())
                     continue;
                 else
                     return sal_False;
+            }
             ++p;
             while (*p >= '0' && *p <= '9')
                 ++p;
@@ -658,10 +664,12 @@ sal_Bool FTPDirectoryParser::parseVMS (
             if (*p)
             {
                 if (!bLWS)
+                {
                     if (aFirstLineName.getLength())
                         continue;
                     else
                         return sal_False;
+                }
             }
             else
             {
@@ -740,10 +748,10 @@ sal_Bool FTPDirectoryParser::parseVMS (
         // Parse <month "-"> part and set entry date's month:
         sal_Char const * pMonth = p;
         sal_Int32 const monthLen = 3;
-        for (int i = 0; i < monthLen; ++i) {
-            if (!(*p >= 'A' && *p <= 'Z' || *p >= 'a' && *p <= 'z')) {
+        for (int i = 0; i < monthLen; ++i)
+        {
+            if (!((*p >= 'A' && *p <= 'Z') || (*p >= 'a' && *p <= 'z')))
                 return sal_False;
-            }
             ++p;
         }
         if (rtl_str_compareIgnoreAsciiCase_WithLength(
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index 77718a82da9b..8d5aa9c1fbd6 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -163,6 +163,8 @@ extern "C" void * SAL_CALL component_getFactory( const sal_Char *pImplName,
         (reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
     uno::Reference< lang::XSingleServiceFactory > xFactory;
 
+    g_type_init();
+
     if ( !::gio::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) )
         xFactory = ::gio::ContentProvider::createServiceFactory( xSMgr );
 
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 2ba94c78a8ac..033a29d9335f 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -274,6 +274,7 @@ void SAL_CALL CommandEnvironment_Impl::handle(
                             setPassword(aRec.UserList[0].Passwords[0].getStr());
                     }
                     if (aRec.UserList[0].Passwords.getLength() > 1)
+                    {
                         if (rRequest.HasRealm)
                         {
                             if (xSupplyAuthentication->canSetRealm())
@@ -285,6 +286,7 @@ void SAL_CALL CommandEnvironment_Impl::handle(
                             xSupplyAuthentication->
                                 setAccount(aRec.UserList[0].Passwords[1].
                                            getStr());
+                    }
                     xSupplyAuthentication->select();
                     return;
                 }
@@ -310,6 +312,7 @@ void SAL_CALL CommandEnvironment_Impl::handle(
                                 setPassword(aRec.UserList[0].Passwords[0].
                                             getStr());
                         if (aRec.UserList[0].Passwords.getLength() > 1)
+                        {
                             if (rRequest.HasRealm)
                             {
                                 if (xSupplyAuthentication->canSetRealm())
@@ -321,6 +324,7 @@ void SAL_CALL CommandEnvironment_Impl::handle(
                                 xSupplyAuthentication->
                                     setAccount(aRec.UserList[0].Passwords[1].
                                                getStr());
+                        }
                         xSupplyAuthentication->select();
                         return;
                     }