summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-08-18 01:36:43 +0200
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2015-01-09 18:41:34 +0100
commit3ffac303c73d4ca3fbf32d93d2b5efabeb037b4b (patch)
treed4385e66bb8052c6572b39628f0809d0c70cec0a
parentabd5e25b2863d829588cca098a35fbe483f3f6a4 (diff)
make these types future proof
Our core already supports more than 32k sheets and we should not use sal_Int16 anymore for sheets. Change-Id: Ifeb321cba044b255ef2e7d34da0908c27877d6ae
-rw-r--r--sc/source/filter/inc/worksheethelper.hxx2
-rw-r--r--sc/source/filter/oox/worksheethelper.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx
index 27bb7e3a69ca..22b4c0c3c429 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -193,7 +193,7 @@ public:
/** Returns the type of this sheet. */
WorksheetType getSheetType() const;
/** Returns the index of the current sheet. */
- sal_Int16 getSheetIndex() const;
+ sal_Int32 getSheetIndex() const;
/** Returns the XSpreadsheet interface of the current sheet. */
const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >&
getSheet() const;
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index aaa45a9b79ba..3f0b584b6fa6 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -218,7 +218,7 @@ public:
/** Returns the type of this sheet. */
inline WorksheetType getSheetType() const { return meSheetType; }
/** Returns the index of the current sheet. */
- inline sal_Int16 getSheetIndex() const { return maUsedArea.Sheet; }
+ inline sal_Int32 getSheetIndex() const { return maUsedArea.Sheet; }
/** Returns the XSpreadsheet interface of the current sheet. */
inline const Reference< XSpreadsheet >& getSheet() const { return mxSheet; }
@@ -1386,7 +1386,7 @@ WorksheetType WorksheetHelper::getSheetType() const
return mrSheetGlob.getSheetType();
}
-sal_Int16 WorksheetHelper::getSheetIndex() const
+sal_Int32 WorksheetHelper::getSheetIndex() const
{
return mrSheetGlob.getSheetIndex();
}