Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/calc

6 files changed, 12 insertions, 11 deletions

diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index 4fd4ba6fb..d755572c1 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -739,7 +739,7 @@ bool hasUnhiddenData( const uno::Reference< chart2::XDataSeries >& xSeries )
 
 struct lcl_LessIndex
 {
-    inline bool operator() ( const sal_Int32& first, const sal_Int32& second )
+    inline bool operator() ( const sal_Int32& first, const sal_Int32& second ) const
     {
         return ( first < second );
     }
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 631b77133..6ed4ab7ed 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2105,7 +2105,6 @@ void XclExpRowBuffer::Save( XclExpStream& rStrm )
     for (itr = itrBeg; itr != itrEnd; ++itr)
     {
         // find end of row block
-        ++itrBlkEnd;
         while( (itrBlkEnd != itrEnd) && (itrBlkEnd->second->GetXclRow() - nStartXclRow < EXC_ROW_ROWBLOCKSIZE) )
             ++itrBlkEnd;
 
@@ -2118,7 +2117,7 @@ void XclExpRowBuffer::Save( XclExpStream& rStrm )
         for( itRow = itrBlkStart; itRow != itrBlkEnd; ++itRow )
              itRow->second->WriteCellList( rStrm );
 
-        itrBlkStart = itrBlkEnd;
+        itrBlkStart = (itrBlkEnd == itrEnd) ? itrBlkEnd : itrBlkEnd++;
         nStartXclRow += EXC_ROW_ROWBLOCKSIZE;
     }
 }
diff --git a/sc/source/filter/xml/XMLExportSharedData.cxx b/sc/source/filter/xml/XMLExportSharedData.cxx
index c3de04075..79263118b 100644
--- a/sc/source/filter/xml/XMLExportSharedData.cxx
+++ b/sc/source/filter/xml/XMLExportSharedData.cxx
@@ -69,7 +69,7 @@ void ScMySharedData::SetLastColumn(const sal_Int32 nTable, const sal_Int32 nCol)
     if(nCol > nLastColumns[nTable]) nLastColumns[nTable] = nCol;
 }
 
-sal_Int32 ScMySharedData::GetLastColumn(const sal_Int32 nTable)
+sal_Int32 ScMySharedData::GetLastColumn(const sal_Int32 nTable) const
 {
     return nLastColumns[nTable];
 }
@@ -79,7 +79,7 @@ void ScMySharedData::SetLastRow(const sal_Int32 nTable, const sal_Int32 nRow)
     if(nRow > nLastRows[nTable]) nLastRows[nTable] = nRow;
 }
 
-sal_Int32 ScMySharedData::GetLastRow(const sal_Int32 nTable)
+sal_Int32 ScMySharedData::GetLastRow(const sal_Int32 nTable) const
 {
     return nLastRows[nTable];
 }
diff --git a/sc/source/filter/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxx
index 48497b530..e4967751e 100644
--- a/sc/source/filter/xml/XMLExportSharedData.hxx
+++ b/sc/source/filter/xml/XMLExportSharedData.hxx
@@ -68,12 +68,12 @@ public:
 
     void SetLastColumn(const sal_Int32 nTable, const sal_Int32 nCol);
     void SetLastRow(const sal_Int32 nTable, const sal_Int32 nRow);
-    sal_Int32 GetLastColumn(const sal_Int32 nTable);
-    sal_Int32 GetLastRow(const sal_Int32 nTable);
+    sal_Int32 GetLastColumn(const sal_Int32 nTable) const;
+    sal_Int32 GetLastRow(const sal_Int32 nTable) const;
     void AddDrawPage(const ScMyDrawPage& aDrawPage, const sal_Int32 nTable);
     void SetDrawPageHasForms(const sal_Int32 nTable, sal_Bool bHasForms);
     com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> GetDrawPage(const sal_Int32 nTable);
-    sal_Bool HasDrawPage() { return pDrawPages != NULL; }
+    sal_Bool HasDrawPage() const { return pDrawPages != NULL; }
     sal_Bool HasForm(const sal_Int32 nTable, com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage>& xDrawPage);
     void AddNewShape(const ScMyShape& aMyShape);
     void SortShapesContainer();
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index da1e5c2e2..0a9d61fdb 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -61,14 +61,16 @@ struct Func_SetType
 {
     sal_Int32                   mnType;
     inline                      Func_SetType( sal_Int32 nType ) : mnType( nType ) {}
-    inline void                 operator()( ScCsvColState& rState ) { rState.mnType = mnType; }
+    inline void                 operator()( ScCsvColState& rState ) const
+        { rState.mnType = mnType; }
 };
 
 struct Func_Select
 {
     bool                        mbSelect;
     inline                      Func_Select( bool bSelect ) : mbSelect( bSelect ) {}
-    inline void                 operator()( ScCsvColState& rState ) { rState.Select( mbSelect ); }
+    inline void                 operator()( ScCsvColState& rState ) const
+        { rState.Select( mbSelect ); }
 };
 
 
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index fa82ab054..e62fdb45e 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -467,7 +467,7 @@ public:
         else
             mbArgError = true;
     }
-    bool hasArgError() { return mbArgError; }
+    bool hasArgError() const { return mbArgError; }
 };
     
 template< class seq >