diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-17 11:39:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-17 11:57:51 +0100 |
| commit | 912a78c2c8c493af2997a657d41a6897a70a7ea4 (patch) | |
| tree | 3cc86a03b8fa94cae29b214c6555df8c5cbf1c53 | |
| parent | 87432aeecdfa7194bb5050f912656e03294cf6c7 (diff) | |
Be explicit when using bool as integral value
Change-Id: Ia5b787a4c02792eb47b7a8eea7af6234f8a2c6b2
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 9b4f852281d8..d04698fa86d9 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2340,7 +2340,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_WIDCTLPAR: case RTF_NOWIDCTLPAR: { - RTFValue::Pointer_t pValue(new RTFValue(nKeyword == RTF_WIDCTLPAR)); + RTFValue::Pointer_t pValue(new RTFValue(int(nKeyword == RTF_WIDCTLPAR))); m_aStates.top().aParagraphSprms.set(NS_sprm::LN_PFWidowControl, pValue); } break; @@ -2505,7 +2505,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) } case RTF_SECTUNLOCKED: { - RTFValue::Pointer_t pValue(new RTFValue(!nParam)); + RTFValue::Pointer_t pValue(new RTFValue(int(!nParam))); m_aStates.top().aSectionSprms.set(NS_ooxml::LN_EG_SectPrContents_formProt, pValue); } case RTF_PGNDEC: @@ -3081,7 +3081,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) break; case RTF_HORZVERT: { - RTFValue::Pointer_t pValue(new RTFValue(true)); + RTFValue::Pointer_t pValue(new RTFValue(int(true))); m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_EastAsianLayout_vert, pValue); if (nParam) // rotate fits to a single line @@ -3096,7 +3096,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) break; case RTF_TWOINONE: { - RTFValue::Pointer_t pValue(new RTFValue(true)); + RTFValue::Pointer_t pValue(new RTFValue(int(true))); m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_EastAsianLayout_combine, pValue); if (nParam > 0) m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_EastAsianLayout_combineBrackets, pIntValue); @@ -3695,7 +3695,7 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam setNeedSect(); RTFSkipDestination aSkip(*this); int nSprm = -1; - RTFValue::Pointer_t pBoolValue(new RTFValue(!bParam || nParam != 0)); + RTFValue::Pointer_t pBoolValue(new RTFValue(int(!bParam || nParam != 0))); // Map all underline toggles to a single sprm. switch (nKeyword) |