CWS-TOOLING: integrate CWS cmcfixes49

4 files changed, 11 insertions, 11 deletions

diff --git a/tools/bootstrp/addexes2/mkfilt.cxx b/tools/bootstrp/addexes2/mkfilt.cxx
index 18dcaa28a6fc..329e9d97c696 100644
--- a/tools/bootstrp/addexes2/mkfilt.cxx
+++ b/tools/bootstrp/addexes2/mkfilt.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: mkfilt.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.34.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -213,7 +213,7 @@ void MkFilter::Filter()
                 {
                     MkLine *pMkLine = pLine->pPrivateTnrLst->GetObject(i);
                     ByteString aLine = pMkLine->aLine;
-                    while( aLine.SearchAndReplace( aTnr, ByteString::CreateFromInt32( n )) != (USHORT)-1 );
+                    while( aLine.SearchAndReplace( aTnr, ByteString::CreateFromInt32( n )) != (USHORT)-1 ) ;
                     fputs( aLine.GetBuffer(), pOut );
                     fprintf( stderr, "o" );
                 }
diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx
index f22a8282fff6..05e981b64a0e 100644
--- a/tools/bootstrp/command.cxx
+++ b/tools/bootstrp/command.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: command.cxx,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.40.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -440,7 +440,7 @@ void CCommand::ImplInit()
 }
 
 /*****************************************************************************/
-CCommand::operator const int()
+CCommand::operator int()
 /*****************************************************************************/
 {
     int nRet;
@@ -589,7 +589,7 @@ CCommandd::CCommandd( const char *pChar, CommandBits nBits )
 }
 
 /*****************************************************************************/
-CCommandd::operator const int()
+CCommandd::operator int()
 /*****************************************************************************/
 {
     int nRet = 0;
diff --git a/tools/bootstrp/inimgr.cxx b/tools/bootstrp/inimgr.cxx
index e6fded69348b..90b7f8ae26bf 100644
--- a/tools/bootstrp/inimgr.cxx
+++ b/tools/bootstrp/inimgr.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: inimgr.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -110,14 +110,14 @@ ByteString IniManager::ToLocal( ByteString &rPath )
 
     sTmp.SearchAndReplace( sIni, sLocalPath );
 
-    while ( sTmp.SearchAndReplace( "\\\\", "\\" ) != STRING_NOTFOUND );
+    while ( sTmp.SearchAndReplace( "\\\\", "\\" ) != STRING_NOTFOUND ) ;
 #else
     sTmp.SearchAndReplace( sGlobalDir, sLocalPath );
 
     ByteString sOldGlobalDir( GetIniRootOld() );
     sTmp.SearchAndReplace( sOldGlobalDir, sLocalPath );
 
-    while ( sTmp.SearchAndReplace( "//", "/" ) != STRING_NOTFOUND );
+    while ( sTmp.SearchAndReplace( "//", "/" ) != STRING_NOTFOUND ) ;
 #endif
 
     return sTmp;
diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index cb65a930a2f5..dfe86daac73e 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: prj.cxx,v $
- * $Revision: 1.29 $
+ * $Revision: 1.29.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -88,7 +88,7 @@ ByteString SimpleConfig::GetNext()
     ByteString aString;
 
     if ( aStringBuffer =="" )
-      while ((aStringBuffer = GetNextLine()) == "\t"); //solange bis != "\t"
+      while ((aStringBuffer = GetNextLine()) == "\t") ; //solange bis != "\t"
     if ( aStringBuffer =="" )
         return ByteString();
 
@@ -112,7 +112,7 @@ ByteString  SimpleConfig::GetNextLine()
         return "\t";
     aTmpStr = aTmpStr.EraseLeadingChars();
     aTmpStr = aTmpStr.EraseTrailingChars();
-    while ( aTmpStr.SearchAndReplace(ByteString(' '),ByteString('\t') ) != STRING_NOTFOUND );
+    while ( aTmpStr.SearchAndReplace(ByteString(' '),ByteString('\t') ) != STRING_NOTFOUND ) ;
     int nLength = aTmpStr.Len();
     BOOL bFound = FALSE;
     ByteString aEraseString;