diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-03 17:02:27 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@centrum.cz> | 2014-05-28 11:57:10 +0200 |
commit | 40506e46ca01f812209331d60af859666bb1f931 (patch) | |
tree | 16b21df9cd10f87cc4bbbe01271df4ad4e7ac408 | |
parent | 4c8858b4a63906a5f5af009be139a8c5247c54b0 (diff) |
-Werror,-Wtautological-constant-out-of-range-compare
(If the underlying type of an unscoped enumeration is unfixed, it need not be
signed.)
Change-Id: I26a406504863512a0d3861ad8b28523b0a6dccaa
(cherry picked from commit 8899b47d2252fd1c2f58ba30558c4ec41d65e442)
Signed-off-by: Luboš Luňák <l.lunak@centrum.cz>
-rw-r--r-- | writerfilter/source/rtftok/rtfcontrolwords.hxx | 1 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx b/writerfilter/source/rtftok/rtfcontrolwords.hxx index a29b86d33f42..d38a0b499e31 100644 --- a/writerfilter/source/rtftok/rtfcontrolwords.hxx +++ b/writerfilter/source/rtftok/rtfcontrolwords.hxx @@ -15,6 +15,7 @@ namespace rtftok { enum RTFKeyword { + RTF_invalid = -1, RTF_HEXCHAR, RTF_OPTHYPH, RTF_IGNORE, diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index c672aa65b1e2..3f6ebc73c5fd 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -263,7 +263,7 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x m_aHexBuffer(), m_bMathNor(false), m_bIgnoreNextContSectBreak(false), - m_nResetBreakOnSectBreak(static_cast<RTFKeyword>(-1)), + m_nResetBreakOnSectBreak(RTF_invalid), m_bNeedSect(false), // done by checkFirstRun m_bWasInFrame(false), m_bHadPicture(false), @@ -1785,10 +1785,10 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) else { sectBreak(); - if (m_nResetBreakOnSectBreak != -1) + if (m_nResetBreakOnSectBreak != RTF_invalid) { // this should run on _second_ \sect after \page dispatchSymbol(m_nResetBreakOnSectBreak); // lazy reset - m_nResetBreakOnSectBreak = static_cast<RTFKeyword>(-1); + m_nResetBreakOnSectBreak = RTF_invalid; m_bNeedSect = false; // dispatchSymbol set it } } @@ -2157,7 +2157,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) } if (nParam >= 0) { - if (m_nResetBreakOnSectBreak != -1) + if (m_nResetBreakOnSectBreak != RTF_invalid) { m_nResetBreakOnSectBreak = nKeyword; } |