CWS-TOOLING: integrate CWS cmcfixes49

3 files changed, 15 insertions, 9 deletions

diff --git a/autodoc/source/display/html/pm_base.hxx b/autodoc/source/display/html/pm_base.hxx
index fbb9fcb1985e..156ccd7fcf24 100644
--- a/autodoc/source/display/html/pm_base.hxx
+++ b/autodoc/source/display/html/pm_base.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: pm_base.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.18.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -42,7 +42,13 @@
 
 
 class OuputPage_Environment;
-class csi::xml::Element;
+namespace csi
+{
+    namespace xml
+    {
+        class Element;
+    }
+}
 class PageDisplay;
 
 
diff --git a/autodoc/source/parser/cpp/defdescr.cxx b/autodoc/source/parser/cpp/defdescr.cxx
index e4615633f9d9..fc0ece01cda5 100644
--- a/autodoc/source/parser/cpp/defdescr.cxx
+++ b/autodoc/source/parser/cpp/defdescr.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: defdescr.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.18.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -178,7 +178,7 @@ Do_bConcatenate( csv::StreamStr &    o_rText,
         uintt nPos;
         for ( nPos = o_rText.tellp() - 1;
               nPos > 0 ? o_rText.c_str()[nPos] == ' ' : false;
-              --nPos );
+              --nPos ) ;
         o_rText.seekp(nPos+1);
         io_bConcatenate = false;
     }
diff --git a/cosv/source/strings/streamstr.cxx b/cosv/source/strings/streamstr.cxx
index a46d4eb5ee41..86c5aa64146e 100644
--- a/cosv/source/strings/streamstr.cxx
+++ b/cosv/source/strings/streamstr.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: streamstr.cxx,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.10.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -568,7 +568,7 @@ StreamStr::strip_front(char i_cToRemove)
     const_iterator it = begin();
     for ( ;
           it != end() ? *it == i_cToRemove : false;
-          ++it );
+          ++it ) ;
     pop_front(it - begin());
 }
 
@@ -578,7 +578,7 @@ StreamStr::strip_back(char i_cToRemove)
     const_iterator it = end();
     for ( ;
           it != begin() ? *(it-1) == i_cToRemove : false;
-          --it );
+          --it ) ;
     pop_back(end() - it);
 }
 
@@ -595,7 +595,7 @@ StreamStr::strip_front_whitespace()
     const_iterator it = begin();
     for ( ;
           it != end() ? *it < 33 : false;
-          ++it );
+          ++it ) ;
     pop_front(it - begin());
 }
 
@@ -605,7 +605,7 @@ StreamStr::strip_back_whitespace()
     const_iterator it = end();
     for ( ;
           it != begin() ? *(it-1) < 33 : false;
-          --it );
+          --it ) ;
     pop_back(end() - it);
 }