From de5f128cb394baea1e4e67552b8c30709c596334 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Fri, 14 Dec 2012 22:19:32 +0900 Subject: sal_Bool to bool Change-Id: I43a98cfaf0a508e99f7f6b413e67d4c1ebdacfba --- sw/inc/unocrsrhelper.hxx | 4 +-- sw/source/core/unocore/unocrsrhelper.cxx | 16 +++++------ sw/source/core/unocore/unodraw.cxx | 48 ++++++++++++++++---------------- sw/source/core/unocore/unofield.cxx | 16 +++++------ sw/source/core/unocore/unoidx.cxx | 12 ++++---- sw/source/core/unocore/unoobj.cxx | 6 ++-- sw/source/core/unocore/unoobj2.cxx | 4 +-- sw/source/core/unocore/unoport.cxx | 2 +- sw/source/core/unocore/unoredline.cxx | 2 +- sw/source/core/unocore/unorefmk.cxx | 2 +- sw/source/core/unocore/unosect.cxx | 10 +++---- sw/source/core/unocore/unosett.cxx | 36 ++++++++++++------------ 12 files changed, 79 insertions(+), 79 deletions(-) (limited to 'sw') diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index 016238f83512..a5892f6cf75b 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -77,7 +77,7 @@ namespace SwUnoCursorHelper GetNestedTextContent(SwTxtNode & rTextNode, xub_StrLen const nIndex, bool const bParent); - sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry + bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry , SwPaM& rPam , com::sun::star::uno::Any *pAny , com::sun::star::beans::PropertyState& eState @@ -110,7 +110,7 @@ namespace SwUnoCursorHelper SwPaM& rPam, com::sun::star::beans::PropertyState& eState); - sal_Bool DocInsertStringSplitCR( SwDoc &rDoc, + bool DocInsertStringSplitCR( SwDoc &rDoc, const SwPaM &rNewCursor, const String &rText, const bool bForceExpandHints ); void makeRedline( SwPaM& rPaM, const ::rtl::OUString& RedlineType, diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index d165d4bc4207..584b2d746436 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -120,7 +120,7 @@ GetNestedTextContent(SwTxtNode & rTextNode, xub_StrLen const nIndex, /* -------------------------------------------------- * Read the special properties of the cursor * --------------------------------------------------*/ -sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry +bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry , SwPaM& rPam , Any *pAny , PropertyState& eState @@ -129,7 +129,7 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry PropertyState eNewState = PropertyState_DIRECT_VALUE; // PropertyState_DEFAULT_VALUE // PropertyState_AMBIGUOUS_VALUE - sal_Bool bDone = sal_True; + bool bDone = true; switch(rEntry.nWID) { case FN_UNO_PARA_CONT_PREV_SUBTREE: @@ -540,7 +540,7 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry break; case RES_TXTATR_CHARFMT: // no break here! - default: bDone = sal_False; + default: bDone = false; } if( bDone ) eState = eNewState; @@ -910,12 +910,12 @@ void InsertFile(SwUnoCrsr* pUnoCrsr, // insert text and scan for CR characters in order to insert // paragraph breaks at those positions by calling SplitNode -sal_Bool DocInsertStringSplitCR( +bool DocInsertStringSplitCR( SwDoc &rDoc, const SwPaM &rNewCursor, const String &rText, const bool bForceExpandHints ) { - sal_Bool bOK = sal_True; + bool bOK = true; const enum IDocumentContentOperations::InsertFlags nInsertFlags = (bForceExpandHints) @@ -947,12 +947,12 @@ sal_Bool DocInsertStringSplitCR( !rDoc.InsertString( rNewCursor, aTxt, nInsertFlags )) { OSL_FAIL( "Doc->Insert(Str) failed." ); - bOK = sal_False; + bOK = false; } if (!rDoc.SplitNode( *rNewCursor.GetPoint(), false ) ) { OSL_FAIL( "SplitNode failed" ); - bOK = sal_False; + bOK = false; } nStartIdx = nIdx + 1; nIdx = rText.Search( '\r', nStartIdx ); @@ -962,7 +962,7 @@ sal_Bool DocInsertStringSplitCR( !rDoc.InsertString( rNewCursor, aTxt, nInsertFlags )) { OSL_FAIL( "Doc->Insert(Str) failed." ); - bOK = sal_False; + bOK = false; } return bOK; diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 62b6bc54e980..ed1918aae25e 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -122,7 +122,7 @@ public: // #i28701# delete pWrapInfluenceOnObjPos; } - SwFmtAnchor* GetAnchor(sal_Bool bCreate = sal_False) + SwFmtAnchor* GetAnchor(bool bCreate = false) { if(bCreate && !pAnchor) { @@ -130,7 +130,7 @@ public: } return pAnchor; } - SwFmtHoriOrient* GetHOrient(sal_Bool bCreate = sal_False) + SwFmtHoriOrient* GetHOrient(bool bCreate = false) { if (bCreate && !pHOrient) { @@ -139,7 +139,7 @@ public: } return pHOrient; } - SwFmtVertOrient* GetVOrient(sal_Bool bCreate = sal_False) + SwFmtVertOrient* GetVOrient(bool bCreate = false) { if(bCreate && !pVOrient) { @@ -149,19 +149,19 @@ public: return pVOrient; } - SwFmtSurround* GetSurround(sal_Bool bCreate = sal_False) + SwFmtSurround* GetSurround(bool bCreate = false) { if(bCreate && !pSurround) pSurround = new SwFmtSurround(); return pSurround; } - SvxLRSpaceItem* GetLRSpace(sal_Bool bCreate = sal_False) + SvxLRSpaceItem* GetLRSpace(bool bCreate = false) { if(bCreate && !pLRSpace) pLRSpace = new SvxLRSpaceItem(RES_LR_SPACE); return pLRSpace; } - SvxULSpaceItem* GetULSpace(sal_Bool bCreate = sal_False) + SvxULSpaceItem* GetULSpace(bool bCreate = false) { if(bCreate && !pULSpace) pULSpace = new SvxULSpaceItem(RES_UL_SPACE); @@ -188,7 +188,7 @@ public: void SetOpaque(sal_Bool bSet){bOpaque = bSet;} // #i26791# - SwFmtFollowTextFlow* GetFollowTextFlow( sal_Bool _bCreate = sal_False ) + SwFmtFollowTextFlow* GetFollowTextFlow( bool _bCreate = false ) { if ( _bCreate && !mpFollowTextFlow ) mpFollowTextFlow = new SwFmtFollowTextFlow( sal_False ); @@ -227,7 +227,7 @@ public: // #i28701# inline SwFmtWrapInfluenceOnObjPos* GetWrapInfluenceOnObjPos( - const sal_Bool _bCreate = sal_False ) + const bool _bCreate = false ) { if ( _bCreate && !pWrapInfluenceOnObjPos ) { @@ -634,7 +634,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape) // #i32349# - if no horizontal position exists, create one if ( !pDesc->GetHOrient() ) { - SwFmtHoriOrient* pHori = pDesc->GetHOrient( sal_True ); + SwFmtHoriOrient* pHori = pDesc->GetHOrient( true ); SwTwips nHoriPos = MM100_TO_TWIP(aMM100Pos.X); pHori->SetPos( nHoriPos ); } @@ -646,7 +646,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape) // #i32349# - if no vertical position exists, create one if ( !pDesc->GetVOrient() ) { - SwFmtVertOrient* pVert = pDesc->GetVOrient( sal_True ); + SwFmtVertOrient* pVert = pDesc->GetVOrient( true ); SwTwips nVertPos = MM100_TO_TWIP(aMM100Pos.Y); pVert->SetPos( nVertPos ); } @@ -760,14 +760,14 @@ uno::Reference< drawing::XShapeGroup > SwXDrawPage::group(const uno::Reference< const SdrMarkList& rMarkList = pPage->PreGroup(xShapes); if ( rMarkList.GetMarkCount() > 1 ) { - sal_Bool bFlyInCnt = sal_False; + bool bFlyInCnt = false; for ( sal_uInt16 i = 0; !bFlyInCnt && i < rMarkList.GetMarkCount(); ++i ) { const SdrObject *pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); if (FLY_AS_CHAR == ::FindFrmFmt(const_cast( pObj))->GetAnchor().GetAnchorId()) { - bFlyInCnt = sal_True; + bFlyInCnt = true; } } if( bFlyInCnt ) @@ -1116,7 +1116,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A SwDoc* pDoc = pFmt->GetDoc(); if(RES_ANCHOR == pEntry->nWID && MID_ANCHOR_ANCHORFRAME == pEntry->nMemberId) { - sal_Bool bDone = sal_True; + bool bDone = true; uno::Reference xFrame; if(aValue >>= xFrame) { @@ -1138,7 +1138,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A aAnchor.SetType(FLY_AT_FLY); aItemSet.Put(aAnchor); pFmt->SetFmtAttr(aItemSet); - bDone = sal_True; + bDone = true; } } if(!bDone) @@ -1375,22 +1375,22 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A switch(pEntry->nWID) { case RES_ANCHOR: - pItem = pImpl->GetAnchor(sal_True); + pItem = pImpl->GetAnchor(true); break; case RES_HORI_ORIENT: - pItem = pImpl->GetHOrient(sal_True); + pItem = pImpl->GetHOrient(true); break; case RES_VERT_ORIENT: - pItem = pImpl->GetVOrient(sal_True); + pItem = pImpl->GetVOrient(true); break; case RES_LR_SPACE: - pItem = pImpl->GetLRSpace(sal_True); + pItem = pImpl->GetLRSpace(true); break; case RES_UL_SPACE: - pItem = pImpl->GetULSpace(sal_True); + pItem = pImpl->GetULSpace(true); break; case RES_SURROUND: - pItem = pImpl->GetSurround(sal_True); + pItem = pImpl->GetSurround(true); break; case FN_TEXT_RANGE: { @@ -1409,13 +1409,13 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A // #i26791# case RES_FOLLOW_TEXT_FLOW: { - pItem = pImpl->GetFollowTextFlow( sal_True ); + pItem = pImpl->GetFollowTextFlow( true ); } break; // #i28701# case RES_WRAP_INFLUENCE_ON_OBJPOS: { - pItem = pImpl->GetWrapInfluenceOnObjPos( sal_True ); + pItem = pImpl->GetWrapInfluenceOnObjPos( true ); } break; // #i28749# @@ -1726,8 +1726,8 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( if(xShapeAgg.is()) { SvxShape* pSvxShape = GetSvxShape(); - sal_Bool bGroupMember = sal_False; - sal_Bool bFormControl = sal_False; + bool bGroupMember = false; + bool bFormControl = false; SdrObject* pObject = pSvxShape->GetSdrObject(); if(pObject) { diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index e73bb35f48ad..99f08cf6f9bf 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -518,7 +518,7 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName, SwFieldType* pType = GetFldType(sal_True); if(pType) { - sal_Bool bSetValue = sal_True; + bool bSetValue = true; if( rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_SUB_TYPE))) { const boost::ptr_vector& rExtraArr(SwStyleNameMapper::GetExtraUINameArray()); @@ -535,7 +535,7 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName, { if(sTypeName == rExtraArr[ *pIds ] ) { - bSetValue = sal_False; + bSetValue = false; break; } } @@ -783,7 +783,7 @@ uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName) // a non-empty string. INetURLObject aObj; aObj.SetURL( aDataSource ); - sal_Bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; + bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; if (bIsURL && rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_DATA_BASE_URL))) pStr = &aDataSource; // DataBaseURL else if (!bIsURL && rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_DATA_BASE_NAME))) @@ -833,7 +833,7 @@ uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName) // a non-empty string. INetURLObject aObj; aObj.SetURL( sParam5 ); // SetSmartURL - sal_Bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; + bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; if (bIsURL && rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_DATA_BASE_URL))) pStr = &sParam5; // DataBaseURL else if ( rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_DATA_BASE_NAME))) @@ -1036,7 +1036,7 @@ struct SwFieldProperties_Impl sal_uInt16 nUSHORT2; sal_Int16 nSHORT1; sal_Int8 nByte1; - sal_Bool bFormatIsDefault; + bool bFormatIsDefault; sal_Bool bBool1; sal_Bool bBool2; sal_Bool bBool3; @@ -1052,7 +1052,7 @@ struct SwFieldProperties_Impl nUSHORT2(0), nSHORT1(0), nByte1(0), - bFormatIsDefault(sal_True), + bFormatIsDefault(true), bBool1(sal_False), bBool2(sal_False), bBool3(sal_False), @@ -1957,7 +1957,7 @@ void SwXTextField::setPropertyValue(const OUString& rPropertyName, const uno::An break; case FIELD_PROP_FORMAT: rValue >>= m_pProps->nFormat; - m_pProps->bFormatIsDefault = sal_False; + m_pProps->bFormatIsDefault = false; break; case FIELD_PROP_SUBTYPE: m_pProps->nSubType = SWUnoHelper::GetEnumAsInt32( rValue ); @@ -2740,7 +2740,7 @@ SwXFieldEnumeration::SwXFieldEnumeration(SwDoc* pDc) : const SwTxtFld *pTxtFld = pCurFldFmt->GetTxtFld(); // skip fields that are currently not in the document // e.g. fields in undo or redo array - sal_Bool bSkip = !pTxtFld || + bool bSkip = !pTxtFld || !pTxtFld->GetpTxtNode()->GetNodes().IsDocNodes(); if (!bSkip) pItems[ nFillPos++ ] = new SwXTextField(*pCurFldFmt, pDoc); diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index ee5e9b65e317..915569ce0e71 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -587,7 +587,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, nTOIOptions = rTOXBase.GetOptions(); } SwForm aForm(rTOXBase.GetTOXForm()); - sal_Bool bForm = sal_False; + bool bForm = false; switch (pEntry->nWID) { case WID_IDX_TITLE: @@ -711,7 +711,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, nsSwTOIOptions::TOI_INITIAL_CAPS); break; case WID_IS_COMMA_SEPARATED: - bForm = sal_True; + bForm = true; aForm.SetCommaSeparated(lcl_AnyToBool(rValue)); break; case WID_LABEL_CATEGORY: @@ -788,19 +788,19 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, String aString; SwStyleNameMapper::FillUIName( lcl_AnyToString(rValue), aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true); - bForm = sal_True; + bForm = true; // Header is on Pos 0 aForm.SetTemplate( 0, aString ); } break; case WID_IS_RELATIVE_TABSTOPS: - bForm = sal_True; + bForm = true; aForm.SetRelTabPos(lcl_AnyToBool(rValue)); break; case WID_PARA_SEP: { String aString; - bForm = sal_True; + bForm = true; SwStyleNameMapper::FillUIName( lcl_AnyToString(rValue), aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true); aForm.SetTemplate( 1, aString ); @@ -821,7 +821,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, case WID_PARA_LEV9: case WID_PARA_LEV10: { - bForm = sal_True; + bForm = true; // in sdbcx::Index Label 1 begins at Pos 2 otherwise at Pos 1 const sal_uInt16 nLPos = rTOXBase.GetType() == TOX_INDEX ? 2 : 1; String aString; diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index a4f8ea2db818..371e8fbeecf8 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -326,7 +326,7 @@ SwUnoCursorHelper::SetPageDesc( if (!pNewDesc->GetPageDesc() || (pNewDesc->GetPageDesc()->GetName() != sDescName)) { - sal_Bool bPut = sal_False; + bool bPut = false; if(sDescName.Len()) { SwPageDesc *const pPageDesc = @@ -336,7 +336,7 @@ SwUnoCursorHelper::SetPageDesc( throw lang::IllegalArgumentException(); } pNewDesc.get()->RegisterToPageDesc( *pPageDesc ); - bPut = sal_True; + bPut = true; } if(!bPut) { @@ -1834,7 +1834,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, } beans::PropertyState eTemp; - const sal_Bool bDone = SwUnoCursorHelper::getCrsrPropertyValue( + const bool bDone = SwUnoCursorHelper::getCrsrPropertyValue( *pEntry, rPaM, &aAny, eTemp ); if (!bDone) diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index efa650eaaf48..2f57992c08e1 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -646,7 +646,7 @@ throw (container::NoSuchElementException, lang::WrappedTargetException, } } - sal_Bool bInTable = sal_False; + bool bInTable = false; if (!m_bFirstParagraph) { pUnoCrsr->SetRemainInSection( sal_False ); @@ -661,7 +661,7 @@ throw (container::NoSuchElementException, lang::WrappedTargetException, { return 0; } - bInTable = sal_True; + bInTable = true; } } diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index b6e95c0a5764..21275eabeec2 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -370,7 +370,7 @@ void SwXTextPortion::GetPropertyValue( break; default: beans::PropertyState eTemp; - sal_Bool bDone = SwUnoCursorHelper::getCrsrPropertyValue( + bool bDone = SwUnoCursorHelper::getCrsrPropertyValue( rEntry, *pUnoCrsr, &(rVal), eTemp ); if(!bDone) { diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index bc00034640cf..814d0a8275d3 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -284,7 +284,7 @@ void SwXRedlinePortion::Validate() throw( uno::RuntimeException ) //search for the redline SwDoc* pDoc = pUnoCrsr->GetDoc(); const SwRedlineTbl& rRedTbl = pDoc->GetRedlineTbl(); - sal_Bool bFound = sal_False; + bool bFound = false; for(sal_uInt16 nRed = 0; nRed < rRedTbl.size() && !bFound; nRed++) bFound = pRedline == rRedTbl[nRed]; if(!bFound) diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 462e86b2d4cc..3dedfddcffb3 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -212,7 +212,7 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam, UnoActionContext aCont(pDoc2); SwFmtRefMark aRefMark(m_sMarkName); - sal_Bool bMark = *rPam.GetPoint() != *rPam.GetMark(); + bool bMark = *rPam.GetPoint() != *rPam.GetMark(); const bool bForceExpandHints( (!bMark && pCursor) ? pCursor->IsAtEndOfMeta() : false ); diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 51ab1a1dcc45..89163d4b1af1 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -317,11 +317,11 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) // and search for current header section const sal_uInt16 nCount = aSectionsArr.size(); - sal_Bool bHeaderPresent = sal_False; + bool bHeaderPresent = false; for(sal_uInt16 i = 0; i < nCount; i++) { - bHeaderPresent |= - (aSectionsArr[i]->GetType() == TOX_HEADER_SECTION); + if (aSectionsArr[i]->GetType() == TOX_HEADER_SECTION) + bHeaderPresent = true; } if (! bHeaderPresent) { @@ -580,7 +580,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr pItemSet; SAL_WNODEPRECATED_DECLARATIONS_POP - sal_Bool bLinkModeChanged = sal_False; + bool bLinkModeChanged = false; sal_Bool bLinkMode = sal_False; for (sal_Int32 nProperty = 0; nProperty < rPropertyNames.getLength(); @@ -668,7 +668,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, } else { - bLinkModeChanged = sal_True; + bLinkModeChanged = true; bLinkMode = bVal; } } diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 37d04ad33a31..9533ffe600ec 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1354,7 +1354,7 @@ uno::Sequence SwXNumberingRules::GetNumberingRuleByIndex( const SwNumFmt& rFmt = rNumRule.Get( (sal_uInt16)nIndex ); - sal_Bool bChapterNum = pDocShell != 0; + bool bChapterNum = pDocShell != 0; PropValDataArr aPropertyValues; //fill all properties into the array @@ -1665,11 +1665,11 @@ void SwXNumberingRules::SetNumberingRuleByIndex( const beans::PropertyValue* pPropArray = rProperties.getConstArray(); PropValDataArr aPropertyValues; - sal_Bool bExcept = sal_False; + bool bExcept = false; for(int i = 0; i < rProperties.getLength() && !bExcept; i++) { const beans::PropertyValue& rProp = pPropArray[i]; - bExcept = sal_True; + bExcept = true; for(sal_uInt16 j = 0; j < SAL_N_ELEMENTS( aNumPropertyNames ); j++) { if( j >= IgnoredFirst && j <= IgnoredLast ) @@ -1680,7 +1680,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( continue; if(COMPARE_EQUAL == rProp.Name.compareToAscii(aNumPropertyNames[j])) { - bExcept = sal_False; + bExcept = false; break; } } @@ -1690,13 +1690,13 @@ void SwXNumberingRules::SetNumberingRuleByIndex( } SwNumFmt aFmt(rNumRule.Get( (sal_uInt16)nIndex )); - sal_Bool bWrongArg = sal_False; + bool bWrongArg = false; if(!bExcept) { SvxBrushItem* pSetBrush = 0; Size* pSetSize = 0; SwFmtVertOrient* pSetVOrient = 0; - sal_Bool bCharStyleNameSet = sal_False; + bool bCharStyleNameSet = false; for(sal_uInt16 i = 0; i < SAL_N_ELEMENTS( aNumPropertyNames ) && !bExcept && !bWrongArg; i++) { @@ -1716,7 +1716,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( aFmt.SetNumAdjust((SvxAdjust)aUnoToSvxAdjust[nValue]); } else - bWrongArg = sal_True; + bWrongArg = true; } break; case 1: //"ParentNumbering", @@ -1743,7 +1743,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( break; case 4: //"CharStyleName", { - bCharStyleNameSet = sal_True; + bCharStyleNameSet = true; OUString uTmp; pData->aVal >>= uTmp; String sCharFmtName; @@ -1814,7 +1814,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( if(nValue >= 0) aFmt.SetCharTextDistance((sal_uInt16) MM100_TO_TWIP(nValue)); else - bWrongArg = sal_True; + bWrongArg = true; } break; case 8: //UNO_NAME_FIRST_LINE_OFFSET, @@ -1840,7 +1840,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( } else { - bWrongArg = sal_True; + bWrongArg = true; } } break; @@ -1862,7 +1862,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( } else { - bWrongArg = sal_True; + bWrongArg = true; } } break; @@ -1877,7 +1877,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( } else { - bWrongArg = sal_True; + bWrongArg = true; } } break; @@ -1904,7 +1904,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( if(nSet >= 0) aFmt.SetNumberingType(nSet); else - bWrongArg = sal_True; + bWrongArg = true; } break; case 15: //"ParagraphStyleName" @@ -1933,7 +1933,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( if( pData->aVal >>= nSet ) aFmt.SetBulletChar(nSet); else - bWrongArg = sal_True; + bWrongArg = true; } break; case 17: //UNO_NAME_BULLET_FONT, @@ -1952,7 +1952,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( } } else - bWrongArg = sal_True; + bWrongArg = true; } break; case 18: //"BulletFontName", @@ -1987,7 +1987,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( aFmt.SetBulletChar(aChar.toChar()); } else - bWrongArg = sal_True; + bWrongArg = true; } break; case 20: //UNO_NAME_GRAPHIC_URL, @@ -2030,7 +2030,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( pSetBrush->SetGraphic( aNewGr ); } else - bWrongArg = sal_True; + bWrongArg = true; } break; case 22: //UNO_NAME_GRAPHIC_SIZE, @@ -2047,7 +2047,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( pSetSize->Height() = pSize->Height; } else - bWrongArg = sal_True; + bWrongArg = true; } break; case 23: //VertOrient -- cgit