diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2011-05-09 23:47:24 -0400 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2011-05-09 23:47:24 -0400 |
commit | eac91db8a23223e456fb2f17e13e2cc328b2b7cf (patch) | |
tree | ccd4fa51769a489c85f423765b1a7eab9d46c47d /sc/inc/rangenam.hxx | |
parent | remove unused member variable (diff) | |
parent | fdo#36933: Fixed array comparison with external references. (diff) | |
download | core-eac91db8a23223e456fb2f17e13e2cc328b2b7cf.tar.gz core-eac91db8a23223e456fb2f17e13e2cc328b2b7cf.zip |
Merge branch 'libreoffice-3-4'
Conflicts:
sc/CppunitTest_sc_ucalc.mk
sc/Module_sc.mk
sc/qa/unit/ucalc.cxx
sc/source/core/tool/dbcolect.cxx
sc/source/filter/excel/excimp8.cxx
sc/source/filter/inc/excimp8.hxx
sc/source/ui/docshell/impex.cxx
sc/source/ui/unoobj/datauno.cxx
Diffstat (limited to 'sc/inc/rangenam.hxx')
-rw-r--r-- | sc/inc/rangenam.hxx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index db50fe0d6aa4..ebf2769e2baf 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -176,7 +176,6 @@ class ScRangeName private: typedef ::boost::ptr_set<ScRangeData> DataType; DataType maData; - sal_uInt16 mnSharedMaxIndex; public: /// Map that manages stored ScRangeName instances. @@ -203,8 +202,6 @@ public: void UpdateTabRef(SCTAB nTable, sal_uInt16 nFlag, SCTAB nNewTable = 0); void UpdateTranspose(const ScRange& rSource, const ScAddress& rDest); void UpdateGrow(const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY); - sal_uInt16 GetSharedMaxIndex(); - void SetSharedMaxIndex(sal_uInt16 nInd); SC_DLLPUBLIC const_iterator begin() const; SC_DLLPUBLIC const_iterator end() const; |