Kaydet (Commit) cf39dc33 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

-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
üst 54bd92d7
...@@ -4346,7 +4346,7 @@ void WW8PLCFx_AtnBook::advance() ...@@ -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]) if (!m_pBook[0] || !m_pBook[1])
return LONG_MAX; return LONG_MAX;
......
...@@ -796,7 +796,7 @@ public: ...@@ -796,7 +796,7 @@ public:
virtual void advance() SAL_OVERRIDE; virtual void advance() SAL_OVERRIDE;
/// Handle is the unique ID of an annotation mark. /// Handle is the unique ID of an annotation mark.
sal_uInt16 getHandle() const; long getHandle() const;
bool getIsEnd() const; bool getIsEnd() const;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment