diff options
| author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2015-04-06 12:23:09 +0300 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-05-03 23:23:00 +0200 |
| commit | bc9d02b0ca6244b46c9e2c59b7cc3618eb0f0148 (patch) | |
| tree | 21e5b9f00dd0e3f75fee093748a41cebc6a9f38e /sw/inc/docary.hxx | |
| parent | f7bed502ff0dc43f5a24f8e35c5573bdd76eed65 (diff) | |
tdf#89783: sal_uInt16 replacement by size_t: sections
These replacements allow LO to load, save and mail merge documents having
more than 65536 sections in total.
Change-Id: I0e70889b1edc6e472a39f1f2638ac3c70a0d7058
Signed-off-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'sw/inc/docary.hxx')
| -rw-r--r-- | sw/inc/docary.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 93590f6408a6..386bf5135442 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -99,10 +99,10 @@ public: this->erase( begin() + aStartIdx, begin() + aEndIdx); } - sal_uInt16 GetPos(Value const& p) const + size_t GetPos(Value const& p) const { const_iterator const it = std::find(begin(), end(), p); - return it == end() ? USHRT_MAX : it - begin(); + return it == end() ? SIZE_MAX : it - begin(); } bool Contains(Value const& p) const @@ -126,7 +126,7 @@ public: virtual Value GetFmt(size_t idx) const SAL_OVERRIDE { return std::vector<Value>::operator[](idx); } - inline sal_uInt16 GetPos(const SwFmt *p) const + inline size_t GetPos(const SwFmt *p) const { return SwVectorModifyBase<Value>::GetPos( static_cast<Value>( const_cast<SwFmt*>( p ) ) ); } inline bool Contains(const SwFmt *p) const { Value p2 = dynamic_cast<Value>(const_cast<SwFmt*>(p)); |