diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-30 21:30:05 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-01-07 00:01:10 +0100 |
| commit | d7a507ab452bc84aeda00cc4d9bb7dbefde74339 (patch) | |
| tree | 87190b52a16e0620412432deb07ffa0f744264cc /sw | |
| parent | 689afb19dc399ff3fcea07a6d264b61d10313a1e (diff) | |
-Werror,-Wconstant-conversion
"implicit conversion from 'long' to 'sal_uInt16' (aka 'unsigned short') changes
value from 9223372036854775807 to 65535," and at least the call to getHandle for
the long nHand argument of SwFltControlStack::SetAttr in
SwWW8ImplReader::Read_AtnBook makes it look like it better return long?
Change-Id: I594ac3ee60a72c0eb2e13f802371ff1e8ade7676
(cherry picked from commit cf39dc339f4ba2a6fb8ce572e437fe610754eb00)
Signed-off-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index af36b28668ff..bef64ec63387 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -4346,7 +4346,7 @@ void WW8PLCFx_AtnBook::advance() } } -sal_uInt16 WW8PLCFx_AtnBook::getHandle() const +long WW8PLCFx_AtnBook::getHandle() const { if (!m_pBook[0] || !m_pBook[1]) return LONG_MAX; diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index a3bdf7861e89..ed4d4962bbfd 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -796,7 +796,7 @@ public: virtual void advance() SAL_OVERRIDE; /// Handle is the unique ID of an annotation mark. - sal_uInt16 getHandle() const; + long getHandle() const; bool getIsEnd() const; }; |