CWS-TOOLING: integrate CWS cmcfixes49

3 files changed, 13 insertions, 13 deletions

diff --git a/xmloff/inc/xmloff/txtstyli.hxx b/xmloff/inc/xmloff/txtstyli.hxx
index 4acc0908ea..7a5af22902 100644
--- a/xmloff/inc/xmloff/txtstyli.hxx
+++ b/xmloff/inc/xmloff/txtstyli.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: txtstyli.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.102.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -93,7 +93,7 @@ public:
 
     const ::rtl::OUString& GetListStyle() const { return sListStyleName; }
     // --> OD 2006-10-13 #i69629#
-    inline const sal_Bool IsListStyleSet() const
+    sal_Bool IsListStyleSet() const
     {
         return mbListStyleSet;
     }
diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx
index c1b0a6439b..e9c07993c8 100644
--- a/xmloff/inc/xmloff/xmlexp.hxx
+++ b/xmloff/inc/xmloff/xmlexp.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: xmlexp.hxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.48.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -551,14 +551,14 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceFactory();
 
     // --> OD 2006-03-10 #i51726#
-    inline const SvtModuleOptions::EFactory GetModelType() const
+    SvtModuleOptions::EFactory GetModelType() const
     {
         return meModelType;
     }
     // <--
 
     // --> OD 2006-09-27 #i69627#
-    const sal_Bool writeOutlineStyleAsNormalListStyle() const;
+    sal_Bool writeOutlineStyleAsNormalListStyle() const;
     // <--
        bool isExperimentalOdfExportEnabled() const { return mbEnableExperimentalOdfExport; }
 
diff --git a/xmloff/inc/xmloff/xmlprmap.hxx b/xmloff/inc/xmloff/xmlprmap.hxx
index 8b7d52781c..4e443de5a1 100644
--- a/xmloff/inc/xmloff/xmlprmap.hxx
+++ b/xmloff/inc/xmloff/xmlprmap.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: xmlprmap.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.74.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -99,17 +99,17 @@ public:
     void AddMapperEntry( const UniReference < XMLPropertySetMapper >& rMapper );
 
     /** Return number of entries in input-array */
-    const sal_Int32	GetEntryCount() const { return aMapEntries.size(); }
+    sal_Int32	GetEntryCount() const { return aMapEntries.size(); }
 
     /** Returns the flags of an entry */
-    const sal_uInt32 GetEntryFlags( sal_Int32 nIndex ) const
+    sal_uInt32 GetEntryFlags( sal_Int32 nIndex ) const
     {
         DBG_ASSERT( (nIndex >= 0) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" );
         return aMapEntries[nIndex].nType & ~MID_FLAG_MASK;
     }
 
     /** Returns the type of an entry */
-    const sal_uInt32 GetEntryType( sal_Int32 nIndex,
+    sal_uInt32 GetEntryType( sal_Int32 nIndex,
                                    sal_Bool bWithFlags = sal_True ) const
     {
         DBG_ASSERT( (nIndex >= 0) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" );
@@ -120,7 +120,7 @@ public:
     }
 
     /** Returns the namespace-key of an entry */
-    const sal_uInt16 GetEntryNameSpace( sal_Int32 nIndex ) const
+    sal_uInt16 GetEntryNameSpace( sal_Int32 nIndex ) const
     {
         DBG_ASSERT( (nIndex >= 0) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" );
         return aMapEntries[nIndex].nXMLNameSpace;
@@ -141,14 +141,14 @@ public:
     }
 
     /** returns the entry context id. -1 is a valid index here. */
-    const sal_Int16 GetEntryContextId( sal_Int32 nIndex ) const
+    sal_Int16 GetEntryContextId( sal_Int32 nIndex ) const
     {
         DBG_ASSERT( (nIndex >= -1) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" );
         return nIndex == -1 ? 0 : aMapEntries[nIndex].nContextId;
     }
 
     /** returns the earliest odf version for which this property should be exported. */
-    const SvtSaveOptions::ODFDefaultVersion GetEarliestODFVersionForExport( sal_Int32 nIndex ) const
+    SvtSaveOptions::ODFDefaultVersion GetEarliestODFVersionForExport( sal_Int32 nIndex ) const
     {
         DBG_ASSERT( (nIndex >= -1) && (nIndex < (sal_Int32)aMapEntries.size() ), "illegal access to invalid entry!" );
         return nIndex == -1 ? SvtSaveOptions::ODFVER_UNKNOWN : aMapEntries[nIndex].nEarliestODFVersionForExport;
@@ -156,7 +156,7 @@ public:
 
     /** Returns the index of an entry with the given XML-name and namespace
         If there is no matching entry the method returns -1 */
-    const sal_Int32 GetEntryIndex( sal_uInt16 nNamespace,
+    sal_Int32 GetEntryIndex( sal_uInt16 nNamespace,
                                    const ::rtl::OUString& rStrName,
                                    sal_uInt32 nPropType,
                                    sal_Int32 nStartAt = -1 ) const;