sw/source/filter/ww8/ww8scan.cxx | 2 +-
sw/source/filter/ww8/ww8scan.hxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit cf39dc339f4ba2a6fb8ce572e437fe610754eb00
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Dec 30 21:30:05 2014 +0100
-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
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 3c5675a..e68818c 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 3c36336..28b9419 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;
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
