CWS-TOOLING: integrate CWS cmcfixes49

7 files changed, 18 insertions, 18 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;
diff --git a/tools/inc/bootstrp/command.hxx b/tools/inc/bootstrp/command.hxx
index e80f07adbeba..3b481371908b 100644
--- a/tools/inc/bootstrp/command.hxx
+++ b/tools/inc/bootstrp/command.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: command.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.40.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -136,7 +136,7 @@ public:
                     /** Spawns the Process
                         @return 0 when spawned without errors, otherwise a error code
                     */
-    operator const  int();
+    operator int();
 
     ByteString          GetCommandLine_() { return aCommandLine; }
     ByteString          GetCommand() { return aCommand; }
@@ -162,7 +162,7 @@ class CCommandd : public CCommand
 public:
                     CCommandd( ByteString &rString, CommandBits nBits );
                     CCommandd( const char *pChar, CommandBits nBits );
-    operator const  int();
+    operator int();
 };
 
 #endif
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 2b74cf3fce80..8223d77106e3 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fsys.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.24.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -294,7 +294,7 @@ private:
 protected:
     void                ImpTrim( FSysPathStyle eStyle );
     const ByteString&   ImpTheName() const;
-    const DirEntryFlag  ImpTheFlag() const { return eFlag; };
+    DirEntryFlag        ImpTheFlag() const { return eFlag; };
     DirEntry*           ImpChangeParent( DirEntry* pNewParent, BOOL bNormalize = TRUE );
     DirEntry*           ImpGetParent() { return pParent; }
 #ifdef FEAT_FSYS_DOUBLESPEED
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 190f59262e17..f8c30ec21aa3 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: urlobj.cxx,v $
- * $Revision: 1.63 $
+ * $Revision: 1.63.36.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1571,7 +1571,7 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef,
         && getSchemeInfo().m_bHierarchical)
     {
         hasScheme = false;
-        while (p != pEnd && *p++ != ':');
+        while (p != pEnd && *p++ != ':') ;
     }
     rWasAbsolute = hasScheme;