[Libreoffice-commits] .: 2 commits - oox/inc oox/source writerfilter/source

[Lubos Lunak]

 oox/inc/oox/core/filterbase.hxx                 |    2 +-
 oox/source/core/filterbase.cxx                  |    2 +-
 writerfilter/source/dmapper/StyleSheetTable.cxx |   10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit b452ea180a55e477b8e4dee44673a0f1651884c0
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Mar 1 15:14:30 2011 +0100

    FilterBase::getVersion() -> const

diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx
index 2dc89c9..98390c5 100644
--- a/oox/inc/oox/core/filterbase.hxx
+++ b/oox/inc/oox/core/filterbase.hxx
@@ -105,7 +105,7 @@ public:
     /** Returns true, if filter is an export filter. */
     bool                isExportFilter() const;
 
-    OoxmlVersion getVersion( );
+    OoxmlVersion getVersion() const;
 
     /** Derived classes implement import of the entire document. */
     virtual bool        importDocument() = 0;
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 6890ad4..33b744b 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -241,7 +241,7 @@ bool FilterBase::isExportFilter() const
     return mxImpl->meDirection == FILTERDIRECTION_EXPORT;
 }
 
-OoxmlVersion FilterBase::getVersion( )
+OoxmlVersion FilterBase::getVersion() const
 {
     return mxImpl->meVersion;
 }
commit ddc89adc0f9058deb74e758640bf1a5e3c1c7602
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Feb 23 15:31:11 2011 +0100

    mark static readonly data also as const

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index b8ba2d2..b426973 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -136,7 +136,7 @@ void TableStyleSheetEntry::AddTblStylePr( TblStyleType nType, PropertyMapPtr pPr
     dmapper_logger->endElement();
 #endif
 
-    static TblStyleType pTypesToFix[] =
+    static const TblStyleType pTypesToFix[] =
     {
         TBL_STYLE_FIRSTROW,
         TBL_STYLE_LASTROW,
@@ -144,7 +144,7 @@ void TableStyleSheetEntry::AddTblStylePr( TblStyleType nType, PropertyMapPtr pPr
         TBL_STYLE_LASTCOL
     };
 
-    static PropertyIds pPropsToCheck[] =
+    static const PropertyIds pPropsToCheck[] =
     {
         PROP_BOTTOM_BORDER,
         PROP_TOP_BORDER,
@@ -237,7 +237,7 @@ void TableStyleSheetEntry::dumpXml( const TagLogger::Pointer_t pLogger )
 
 void lcl_mergeProps( PropertyMapPtr pToFill,  PropertyMapPtr pToAdd, TblStyleType nStyleId )
 {
-    static PropertyIds pPropsToCheck[] =
+    static const PropertyIds pPropsToCheck[] =
     {
         PROP_BOTTOM_BORDER,
         PROP_TOP_BORDER,
@@ -280,7 +280,7 @@ void lcl_mergeProps( PropertyMapPtr pToFill,  PropertyMapPtr pToAdd, TblStyleTyp
 PropertyMapPtr TableStyleSheetEntry::GetLocalPropertiesFromMask( sal_Int32 nMask )
 {
     // Order from right to left
-    static TblStyleType aBitsOrder[] = 
+    static const TblStyleType aBitsOrder[] =
     {
         TBL_STYLE_SWCELL,
         TBL_STYLE_SECELL,
@@ -1086,7 +1086,7 @@ const StyleSheetEntryPtr StyleSheetTable::FindParentStyleSheet(::rtl::OUString s
 }
 
 
-static const sal_Char *aStyleNamePairs[] =
+static const sal_Char* const aStyleNamePairs[] =
 {
     "Normal",                     "Standard",               
     "heading 1",                  "Heading 1",