From ebfc9d5fed1f88b72aca718fc0092bf26b6dc8bd Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sat, 29 Dec 2012 14:52:30 +0900 Subject: sal_Bool to bool Change-Id: I68cbf5f58eb5e8d1595d4c2a0e5656a154df3b0e --- sw/source/filter/xml/xmlexpit.cxx | 90 +++++++++++++++++++-------------------- sw/source/filter/xml/xmlexpit.hxx | 2 +- sw/source/filter/xml/xmlfmt.cxx | 44 +++++++++---------- 3 files changed, 68 insertions(+), 68 deletions(-) (limited to 'sw/source') diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 3db269c65d40..bdada36ed32c 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -227,7 +227,7 @@ void SvXMLExportItemMapper::exportElementItems( { const sal_uInt16 nCount = rIndexArray.size(); - sal_Bool bItemsExported = sal_False; + bool bItemsExported = false; for( sal_uInt16 nIndex = 0; nIndex < nCount; nIndex++ ) { const sal_uInt16 nElement = rIndexArray[ nIndex ]; @@ -242,7 +242,7 @@ void SvXMLExportItemMapper::exportElementItems( rExport.IgnorableWhitespace(); handleElementItem( rExport, *pEntry, *pItem, rUnitConverter, rSet, nFlags); - bItemsExported = sal_True; + bItemsExported = true; } } @@ -373,13 +373,13 @@ static bool lcl_isOdfDoubleLine( const SvxBorderLine* pLine ) return bIsOdfDouble; } -sal_Bool SvXMLExportItemMapper::QueryXMLValue( +bool SvXMLExportItemMapper::QueryXMLValue( const SfxPoolItem& rItem, OUString& rValue, sal_uInt16 nMemberId, const SvXMLUnitConverter& rUnitConverter ) { - sal_Bool bOk = sal_False; + bool bOk = false; OUStringBuffer aOut; switch ( rItem.Which() ) @@ -390,7 +390,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( const SvxLRSpaceItem* pLRSpace = PTR_CAST(SvxLRSpaceItem, &rItem); OSL_ENSURE( pLRSpace != NULL, "Wrong Which-ID!" ); - bOk = sal_True; + bOk = true; switch( nMemberId ) { case MID_L_MARGIN: @@ -426,7 +426,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( aOut, pLRSpace->IsAutoFirst() ); } else - bOk = sal_False; + bOk = false; break; case MID_FIRST_LINE_INDENT: @@ -444,12 +444,12 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( } } else - bOk = sal_False; + bOk = false; break; default: OSL_FAIL( "unknown member id!"); - bOk = sal_False; + bOk = false; break; } } @@ -492,7 +492,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( OSL_FAIL("unknown MemberId"); }; - bOk = sal_True; + bOk = true; } break; @@ -519,7 +519,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( case SVX_SHADOW_NONE: default: rValue = GetXMLToken(XML_NONE); - return sal_True; + return true; } nX *= pShadow->GetWidth(); @@ -531,7 +531,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( aOut.append( sal_Unicode(' ') ); rUnitConverter.convertMeasureToXML( aOut, nY ); - bOk = sal_True; + bOk = true; } break; @@ -581,14 +581,14 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( case TOP_BORDER_PADDING: case BOTTOM_BORDER_PADDING: { - sal_Bool bEqual = nLeftDist == nRightDist && + bool bEqual = nLeftDist == nRightDist && nLeftDist == nTopDist && nLeftDist == nBottomDist; // don't export individual paddings if all paddings are equal and // don't export all padding if some paddings are not equal if( (bEqual && ALL_BORDER_PADDING != nMemberId) || (!bEqual && ALL_BORDER_PADDING == nMemberId) ) - return sal_False; + return false; } break; case ALL_BORDER: @@ -597,7 +597,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( case TOP_BORDER: case BOTTOM_BORDER: { - sal_Bool bEqual = ( NULL == pTop && NULL == pBottom && + bool bEqual = ( NULL == pTop && NULL == pBottom && NULL == pLeft && NULL == pRight ) || ( pTop && pBottom && pLeft && pRight && *pTop == *pBottom && *pTop == *pLeft && @@ -607,7 +607,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( // don't export all borders if some are not equal if( (bEqual && ALL_BORDER != nMemberId) || (!bEqual && ALL_BORDER == nMemberId) ) - return sal_False; + return false; } break; case ALL_BORDER_LINE_WIDTH: @@ -618,9 +618,9 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( { // if no line is set, there is nothing to export if( !pTop && !pBottom && !pLeft && !pRight ) - return sal_False; + return false; - sal_Bool bEqual = NULL != pTop && + bool bEqual = NULL != pTop && NULL != pBottom && NULL != pLeft && NULL != pRight; @@ -651,31 +651,31 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( case ALL_BORDER_LINE_WIDTH: if( !bEqual || pTop->GetDistance() == 0 || !lcl_isOdfDoubleLine( pTop ) ) - return sal_False; + return false; break; case LEFT_BORDER_LINE_WIDTH: if( bEqual || NULL == pLeft || 0 == pLeft->GetDistance() || !lcl_isOdfDoubleLine( pLeft ) ) - return sal_False; + return false; break; case RIGHT_BORDER_LINE_WIDTH: if( bEqual || NULL == pRight || 0 == pRight->GetDistance() || !lcl_isOdfDoubleLine( pRight ) ) - return sal_False; + return false; break; case TOP_BORDER_LINE_WIDTH: if( bEqual || NULL == pTop || 0 == pTop->GetDistance() || !lcl_isOdfDoubleLine( pTop ) ) - return sal_False; + return false; break; case BOTTOM_BORDER_LINE_WIDTH: if( bEqual || NULL == pBottom || 0 == pBottom->GetDistance() || !lcl_isOdfDoubleLine( pBottom ) ) - return sal_False; + return false; break; } } @@ -812,7 +812,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( pLine = pBottom; break; default: - return sal_False; + return false; } rUnitConverter.convertMeasureToXML( aOut, pLine->GetInWidth() ); aOut.append( sal_Unicode( ' ' ) ); @@ -822,7 +822,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( break; } - bOk = sal_True; + bOk = true; } break; @@ -848,7 +848,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( eEnum = 0; break; default: - return sal_False; + return false; } break; case MID_BREAK_AFTER: @@ -864,7 +864,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( eEnum = 0; break; default: - return sal_False; + return false; } break; } @@ -881,7 +881,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( aOut.append( pFmtKeep->GetValue() ? GetXMLToken( XML_ALWAYS ) : GetXMLToken( XML_AUTO ) ); - bOk = sal_True; + bOk = true; } break; @@ -904,7 +904,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( ::sax::Converter::convertColor(aOut, pBrush->GetColor().GetColor()); } - bOk = sal_True; + bOk = true; break; case MID_GRAPHIC_LINK: @@ -915,7 +915,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( OUString sTmp; aAny >>= sTmp; aOut.append( sTmp ); - bOk = sal_True; + bOk = true; } break; @@ -926,19 +926,19 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( case GPOS_MT: case GPOS_RT: aOut.append( GetXMLToken(XML_TOP) ); - bOk = sal_True; + bOk = true; break; case GPOS_LM: case GPOS_MM: case GPOS_RM: aOut.append( GetXMLToken(XML_CENTER) ); - bOk = sal_True; + bOk = true; break; case GPOS_LB: case GPOS_MB: case GPOS_RB: aOut.append( GetXMLToken(XML_BOTTOM) ); - bOk = sal_True; + bOk = true; break; default: ; @@ -977,12 +977,12 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( if( GPOS_AREA == eGraphicPos ) { aOut.append( GetXMLToken(XML_BACKGROUND_STRETCH) ); - bOk = sal_True; + bOk = true; } else if( GPOS_NONE != eGraphicPos && GPOS_TILED != eGraphicPos ) { aOut.append( GetXMLToken(XML_BACKGROUND_NO_REPEAT) ); - bOk = sal_True; + bOk = true; } } break; @@ -992,7 +992,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( pBrush->GetGraphicFilter() ) { aOut.append( pBrush->GetGraphicFilter()->GetBuffer() ); - bOk = sal_True; + bOk = true; } break; } @@ -1015,7 +1015,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( { ::sax::Converter::convertNumber(aOut, number); } - bOk = sal_True; + bOk = true; } } break; @@ -1027,7 +1027,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( OSL_ENSURE( pSplit != NULL, "Wrong Which-ID" ); ::sax::Converter::convertBool( aOut, pSplit->GetValue() ); - bOk = sal_True; + bOk = true; } break; @@ -1038,7 +1038,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( rUnitConverter.convertEnum( aOut, pHoriOrient->GetHoriOrient(), aXMLTableAlignMap ); - bOk = sal_True; + bOk = true; } break; @@ -1049,7 +1049,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( rUnitConverter.convertEnum( aOut, pVertOrient->GetVertOrient(), aXMLTableVAlignMap ); - bOk = sal_True; + bOk = true; } break; @@ -1058,7 +1058,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( SwFmtFrmSize* pFrmSize = PTR_CAST(SwFmtFrmSize, &rItem); OSL_ENSURE( pFrmSize != NULL, "Wrong Which-ID" ); - sal_Bool bOutHeight = sal_False; + bool bOutHeight = false; switch( nMemberId ) { case MID_FRMSIZE_REL_WIDTH: @@ -1066,23 +1066,23 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( { ::sax::Converter::convertPercent( aOut, pFrmSize->GetWidthPercent() ); - bOk = sal_True; + bOk = true; } break; case MID_FRMSIZE_MIN_HEIGHT: if( ATT_MIN_SIZE == pFrmSize->GetHeightSizeType() ) - bOutHeight = sal_True; + bOutHeight = true; break; case MID_FRMSIZE_FIX_HEIGHT: if( ATT_FIX_SIZE == pFrmSize->GetHeightSizeType() ) - bOutHeight = sal_True; + bOutHeight = true; break; } if( bOutHeight ) { rUnitConverter.convertMeasureToXML(aOut, pFrmSize->GetHeight()); - bOk = sal_True; + bOk = true; } } break; @@ -1115,7 +1115,7 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( aOut.append( pBorders->GetValue() ? GetXMLToken( XML_COLLAPSING ) : GetXMLToken( XML_SEPARATING ) ); - bOk = sal_True; + bOk = true; } break; diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx index 4ae74ca3e553..39e195d15ed1 100644 --- a/sw/source/filter/xml/xmlexpit.hxx +++ b/sw/source/filter/xml/xmlexpit.hxx @@ -113,7 +113,7 @@ public: inline void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ); - static sal_Bool QueryXMLValue( const SfxPoolItem& rItem, + static bool QueryXMLValue( const SfxPoolItem& rItem, ::rtl::OUString& rValue, sal_uInt16 nMemberId, const SvXMLUnitConverter& rUnitConverter ); }; diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index dc53cb9e9eb9..819c64b09607 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -75,7 +75,7 @@ public: SwXMLConditionParser_Impl( const OUString& rInp ); - sal_Bool IsValid() const { return 0 != nCondition; } + bool IsValid() const { return 0 != nCondition; } sal_uInt32 GetCondition() const { return nCondition; } sal_uInt32 GetSubCondition() const { return nSubCondition; } @@ -136,14 +136,14 @@ SwXMLConditionParser_Impl::SwXMLConditionParser_Impl( const OUString& rInp ) : nLength( rInp.getLength() ) { OUString sFunc; - sal_Bool bHasSub = sal_False; + bool bHasSub = false; sal_uInt32 nSub = 0; sal_Bool bOK = SkipWS() && MatchName( sFunc ) && SkipWS() && MatchChar( '(' ) && SkipWS() && MatchChar( ')' ) && SkipWS(); if( bOK && MatchChar( '=' ) ) { bOK = SkipWS() && MatchNumber( nSub ) && SkipWS(); - bHasSub = sal_True; + bHasSub = true; } bOK &= nPos == nLength; @@ -210,7 +210,7 @@ public: TYPEINFO(); - sal_Bool IsValid() const { return 0 != nCondition; } + bool IsValid() const { return 0 != nCondition; } sal_uInt32 GetCondition() const { return nCondition; } sal_uInt32 GetSubCondition() const { return nSubCondition; } @@ -438,9 +438,9 @@ class SwXMLItemSetStyleContext_Impl : public SvXMLStyleContext OUString sDataStyleName; - sal_Bool bHasMasterPageName : 1; - sal_Bool bPageDescConnected : 1; - sal_Bool bDataStyleIsResolved; + bool bHasMasterPageName : 1; + bool bPageDescConnected : 1; + bool bDataStyleIsResolved; SvXMLImportContext *CreateItemSetContext( sal_uInt16 nPrefix, @@ -480,12 +480,12 @@ public: const SfxItemSet *GetItemSet() const { return pItemSet; } const OUString& GetMasterPageName() const { return sMasterPageName; } - sal_Bool HasMasterPageName() const { return bHasMasterPageName; } + bool HasMasterPageName() const { return bHasMasterPageName; } - sal_Bool IsPageDescConnected() const { return bPageDescConnected; } + bool IsPageDescConnected() const { return bPageDescConnected; } void ConnectPageDesc(); - sal_Bool ResolveDataStyleName(); + bool ResolveDataStyleName(); }; void SwXMLItemSetStyleContext_Impl::SetAttribute( sal_uInt16 nPrefixKey, @@ -497,7 +497,7 @@ void SwXMLItemSetStyleContext_Impl::SetAttribute( sal_uInt16 nPrefixKey, if ( IsXMLToken( rLocalName, XML_MASTER_PAGE_NAME ) ) { sMasterPageName = rValue; - bHasMasterPageName = sal_True; + bHasMasterPageName = true; } else if ( IsXMLToken( rLocalName, XML_DATA_STYLE_NAME ) ) { @@ -505,7 +505,7 @@ void SwXMLItemSetStyleContext_Impl::SetAttribute( sal_uInt16 nPrefixKey, if (!rValue.isEmpty()) { sDataStyleName = rValue; - bDataStyleIsResolved = sal_False; // needs to be resolved + bDataStyleIsResolved = false; // needs to be resolved } } else @@ -574,9 +574,9 @@ SwXMLItemSetStyleContext_Impl::SwXMLItemSetStyleContext_Impl( SwXMLImport& rImpo pItemSet( 0 ), pTextStyle( 0 ), rStyles( rStylesC ), - bHasMasterPageName( sal_False ), - bPageDescConnected( sal_False ), - bDataStyleIsResolved( sal_True ) + bHasMasterPageName( false ), + bPageDescConnected( false ), + bDataStyleIsResolved( true ) { } @@ -636,7 +636,7 @@ void SwXMLItemSetStyleContext_Impl::ConnectPageDesc() { if( bPageDescConnected || !HasMasterPageName() ) return; - bPageDescConnected = sal_True; + bPageDescConnected = true; SwDoc *pDoc = SwImport::GetDocFromXMLImport( GetSwImport() ); @@ -687,7 +687,7 @@ void SwXMLItemSetStyleContext_Impl::ConnectPageDesc() } } -sal_Bool SwXMLItemSetStyleContext_Impl::ResolveDataStyleName() +bool SwXMLItemSetStyleContext_Impl::ResolveDataStyleName() { // resolve, if not already done if (! bDataStyleIsResolved) @@ -711,13 +711,13 @@ sal_Bool SwXMLItemSetStyleContext_Impl::ResolveDataStyleName() } // now resolved - bDataStyleIsResolved = sal_True; - return sal_True; + bDataStyleIsResolved = true; + return true; } else { // was already resolved; nothing to do - return sal_False; + return false; } } @@ -1045,7 +1045,7 @@ void SwXMLImport::UpdateTxtCollConditions( SwDoc *pDoc ) { const SwFmtCollConditions& rConditions = ((const SwConditionTxtFmtColl *)pColl)->GetCondColls(); - sal_Bool bSendModify = sal_False; + bool bSendModify = false; for( sal_uInt16 j=0; j < rConditions.size() && !bSendModify; j++ ) { const SwCollCondition& rCond = rConditions[j]; @@ -1055,7 +1055,7 @@ void SwXMLImport::UpdateTxtCollConditions( SwDoc *pDoc ) case PARA_IN_TABLEBODY: case PARA_IN_FOOTER: case PARA_IN_HEADER: - bSendModify = sal_True; + bSendModify = true; break; } } -- cgit