diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-24 12:35:07 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-24 12:36:31 +0200 |
commit | b919eeaa2f59cd36b87f80b8922d32c23e09b764 (patch) | |
tree | 14944f70d92486ca2ab8ee79ed60244453b23747 /writerfilter/source | |
parent | a9a4d46ce74fc3c4ff1b7399ea6be6ffeeeb8863 (diff) |
loplugin:simplifybool
Change-Id: Ie145292074b39fae5da40a7337737dd753b4d2ea
Diffstat (limited to 'writerfilter/source')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 16 | ||||
-rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/SettingsTable.cxx | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 9a8dca19f066..70a59ed21df5 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -526,7 +526,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) break; case NS_ooxml::LN_CT_EastAsianLayout_combine: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_IS_ON, uno::makeAny ( nIntValue ? true : false )); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMBINE_IS_ON, uno::makeAny ( nIntValue != 0 )); break; case NS_ooxml::LN_CT_EastAsianLayout_combineBrackets: if (m_pImpl->GetTopContext()) @@ -546,7 +546,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) break; case NS_ooxml::LN_CT_EastAsianLayout_vertCompress: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_CHAR_ROTATION_IS_FIT_TO_LINE, uno::makeAny ( nIntValue ? true : false)); + m_pImpl->GetTopContext()->Insert(PROP_CHAR_ROTATION_IS_FIT_TO_LINE, uno::makeAny ( nIntValue != 0 )); break; case NS_ooxml::LN_CT_PageSz_code: @@ -1171,10 +1171,10 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) handleParaJustification(nIntValue, rContext, ExchangeLeftRight( rContext, m_pImpl )); break; case NS_ooxml::LN_CT_PPrBase_keepLines: - rContext->Insert(PROP_PARA_SPLIT, uno::makeAny(nIntValue ? false : true)); + rContext->Insert(PROP_PARA_SPLIT, uno::makeAny(nIntValue == 0)); break; case NS_ooxml::LN_CT_PPrBase_keepNext: - rContext->Insert(PROP_PARA_KEEP_TOGETHER, uno::makeAny( nIntValue ? true : false) ); + rContext->Insert(PROP_PARA_KEEP_TOGETHER, uno::makeAny( nIntValue != 0 ) ); break; case NS_ooxml::LN_CT_PPrBase_pageBreakBefore: rContext->Insert(PROP_BREAK_TYPE, uno::makeAny(nIntValue ? style::BreakType_PAGE_BEFORE : style::BreakType_NONE)); @@ -1235,7 +1235,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) } break; case NS_ooxml::LN_CT_PPrBase_suppressLineNumbers: - rContext->Insert(PROP_PARA_LINE_NUMBER_COUNT, uno::makeAny( nIntValue ? false : true) ); + rContext->Insert(PROP_PARA_LINE_NUMBER_COUNT, uno::makeAny( nIntValue == 0 ) ); break; case NS_ooxml::LN_inTbl: break; @@ -1301,7 +1301,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) case NS_ooxml::LN_CT_PBdr_bar: break; case NS_ooxml::LN_CT_PPrBase_suppressAutoHyphens: - rContext->Insert(PROP_PARA_IS_HYPHENATION, uno::makeAny( nIntValue ? false : true )); + rContext->Insert(PROP_PARA_IS_HYPHENATION, uno::makeAny( nIntValue == 0 )); break; case NS_ooxml::LN_CT_FramePr_h: break; @@ -1340,7 +1340,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) } break; // sprmPFWidowControl case NS_ooxml::LN_CT_PPrBase_overflowPunct: - rContext->Insert(PROP_PARA_IS_HANGING_PUNCTUATION, uno::makeAny( nIntValue ? false : true )); + rContext->Insert(PROP_PARA_IS_HANGING_PUNCTUATION, uno::makeAny( nIntValue == 0 )); break; case NS_ooxml::LN_CT_PPrBase_topLinePunct: break; @@ -1552,7 +1552,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) case NS_ooxml::LN_EG_RPrBase_shadow: case NS_ooxml::LN_EG_RPrBase_vanish: case NS_ooxml::LN_EG_RPrBase_webHidden: - rContext->Insert(ePropertyId, uno::makeAny( nIntValue ? true : false )); + rContext->Insert(ePropertyId, uno::makeAny( nIntValue != 0 )); break; case NS_ooxml::LN_EG_RPrBase_smallCaps: // If smallcaps would be just disabled and an other casemap is already inserted, don't do anything. diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 7d31cd217b1b..f2099c9a0b5c 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -551,7 +551,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineDistance = nIntValue; break; case NS_ooxml::LN_CT_Border_shadow: - m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].bHasShadow = nIntValue ? true : false; + m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].bHasShadow = nIntValue != 0; break; case NS_ooxml::LN_CT_Border_frame: break; diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx index fd04dce9740c..cd73226959a9 100644 --- a/writerfilter/source/dmapper/SettingsTable.cxx +++ b/writerfilter/source/dmapper/SettingsTable.cxx @@ -219,13 +219,13 @@ void SettingsTable::lcl_sprm(Sprm& rSprm) m_pImpl->m_bEvenAndOddHeaders = nIntValue; break; case NS_ooxml::LN_CT_Settings_noPunctuationKerning: // 92526; - m_pImpl->m_bNoPunctuationKerning = nIntValue ? true : false; + m_pImpl->m_bNoPunctuationKerning = nIntValue != 0; break; case NS_ooxml::LN_CT_Settings_characterSpacingControl: // 92527; m_pImpl->m_sCharacterSpacing = sStringValue; // doNotCompress, compressPunctuation, compressPunctuationAndJapaneseKana break; case NS_ooxml::LN_CT_Settings_doNotIncludeSubdocsInStats: // 92554; // Do Not Include Content in Text Boxes, Footnotes, and Endnotes in Document Statistics) - m_pImpl->m_doNotIncludeSubdocsInStats = nIntValue ? true : false; + m_pImpl->m_doNotIncludeSubdocsInStats = nIntValue != 0; break; case NS_ooxml::LN_CT_Settings_decimalSymbol: // 92562; m_pImpl->m_sDecimalSymbol = sStringValue; |