diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-03-25 10:51:15 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-03-25 10:54:06 +0900 |
commit | 1e50f7892705c64db0ffec06b651cd280e9a7f8f (patch) | |
tree | 252c74d3619fb966e52fdcaf6a72cbb8595710e8 /svx/source | |
parent | c7af37db60aab361e8ab01e69c816d249fb558b6 (diff) |
sal_Bool to bool
Change-Id: Ibc63340b3ae431c7cdac78893dbdd1989ebe5ff9
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/engine3d/view3d.cxx | 28 | ||||
-rw-r--r-- | svx/source/items/algitem.cxx | 4 | ||||
-rw-r--r-- | svx/source/items/grfitem.cxx | 4 | ||||
-rw-r--r-- | svx/source/items/hlnkitem.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/event/eventhandler.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/properties/e3dsceneproperties.cxx | 8 | ||||
-rw-r--r-- | svx/source/sdr/properties/textproperties.cxx | 10 | ||||
-rw-r--r-- | svx/source/stbctrls/pszctrl.cxx | 46 |
8 files changed, 52 insertions, 52 deletions
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 4dc904f7bef4..5f856ed538a8 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -603,8 +603,8 @@ bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDs bool E3dView::IsConvertTo3DObjPossible() const { - sal_Bool bAny3D(sal_False); - sal_Bool bGroupSelected(sal_False); + bool bAny3D(false); + bool bGroupSelected(false); bool bRetval(true); for(sal_uInt32 a=0;!bAny3D && a<GetMarkedObjectCount();a++) @@ -624,14 +624,14 @@ bool E3dView::IsConvertTo3DObjPossible() const return bRetval; } -void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D, - sal_Bool& rGroupSelected) const +void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, bool& rAny3D, + bool& rGroupSelected) const { if(pObj) { if(pObj->ISA(E3dObject)) { - rAny3D = sal_True; + rAny3D = true; } else { @@ -643,7 +643,7 @@ void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D, SdrObject* pNewObj = aIter.Next(); ImpIsConvertTo3DPossible(pNewObj, rAny3D, rGroupSelected); } - rGroupSelected = sal_True; + rGroupSelected = true; } } } @@ -698,7 +698,7 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj) } } -void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat) +void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat) { // Single PathObject, transform this SdrPathObj* pPath = PTR_CAST(SdrPathObj, pObj); @@ -766,7 +766,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal } } -void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat) +void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat) { if(pObj) { @@ -831,7 +831,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExt } } -void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2) +void E3dView::ConvertMarkedObjTo3D(bool bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2) { if(AreObjectsMarked()) { @@ -1097,12 +1097,12 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth) if(aCompareColor == aLocalColor) { - bOverlap = sal_False; + bOverlap = false; } } else if(eLocalFillStyle == XFILL_NONE) { - bOverlap = sal_False; + bOverlap = false; } } } @@ -1468,7 +1468,7 @@ void E3dView::MovAction(const Point& rPnt) // axis. It is sufficient with this call, if an object is selected. // (No initialization necessary) -void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes) +void E3dView::End3DCreation(bool bUseDefaultValuesForMirrorAxes) { ResetCreationActive(); @@ -1485,7 +1485,7 @@ void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes) basegfx::B2DPoint aPnt1(aRect.Left(), -aRect.Top()); basegfx::B2DPoint aPnt2(aRect.Left(), -aRect.Bottom()); - ConvertMarkedObjTo3D(sal_False, aPnt1, aPnt2); + ConvertMarkedObjTo3D(false, aPnt1, aPnt2); } else { @@ -1499,7 +1499,7 @@ void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes) basegfx::B2DPoint aPnt1(aMirrorRef1.X(), -aMirrorRef1.Y()); basegfx::B2DPoint aPnt2(aMirrorRef2.X(), -aMirrorRef2.Y()); - ConvertMarkedObjTo3D(sal_False, aPnt1, aPnt2); + ConvertMarkedObjTo3D(false, aPnt1, aPnt2); } } } diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index a3ff5d9d775e..e0b0aa038d9a 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -336,7 +336,7 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { - sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); + bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) { @@ -364,7 +364,7 @@ bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { - sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 ); + bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 ); long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX; // Members sind sal_Int16 sal_Int32 nVal = 0; if(!(rVal >>= nVal) || (nVal > nMaxVal)) diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index 3bc7ab1883c6..d63e32e06e59 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -89,7 +89,7 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, sal_uInt16 nVersion ) const bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { - sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); + bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; text::GraphicCrop aRet; aRet.Left = nLeft; @@ -112,7 +112,7 @@ bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { - sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); + bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; text::GraphicCrop aVal; diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 3389f9c4ca1f..a2181a2a626f 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -235,7 +235,7 @@ int SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr ) const const SvxHyperlinkItem& rItem = (const SvxHyperlinkItem&) rAttr; - sal_Bool bRet = ( sName == rItem.sName && + bool bRet = ( sName == rItem.sName && sURL == rItem.sURL && sTarget == rItem.sTarget && eType == rItem.eType && diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx index ae01f9946614..9dab9cb7b921 100644 --- a/svx/source/sdr/event/eventhandler.cxx +++ b/svx/source/sdr/event/eventhandler.cxx @@ -110,7 +110,7 @@ namespace sdr } // for control - sal_Bool EventHandler::IsEmpty() const + bool EventHandler::IsEmpty() const { return (0L == maVector.size()); } diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index f215e1a5da23..5b9fbed8dd3e 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -197,13 +197,13 @@ namespace sdr // one common function for the camera attributes // since SetCamera() sets all three back to the ItemSet Camera3D aSceneCam(rObj.GetCamera()); - sal_Bool bChange(sal_False); + bool bChange(false); // for SDRATTR_3DSCENE_PERSPECTIVE: if(aSceneCam.GetProjection() != rObj.GetPerspective()) { aSceneCam.SetProjection(rObj.GetPerspective()); - bChange = sal_True; + bChange = true; } // for SDRATTR_3DSCENE_DISTANCE: @@ -213,7 +213,7 @@ namespace sdr if(fNew != aActualPosition.getZ()) { aSceneCam.SetPosition(basegfx::B3DPoint(aActualPosition.getX(), aActualPosition.getY(), fNew)); - bChange = sal_True; + bChange = true; } // for SDRATTR_3DSCENE_FOCAL_LENGTH: @@ -222,7 +222,7 @@ namespace sdr if(aSceneCam.GetFocalLength() != fNew) { aSceneCam.SetFocalLength(fNew); - bChange = sal_True; + bChange = true; } // for all diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 156268f95b9c..cf5e526365bb 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -207,7 +207,7 @@ namespace sdr if(nDifference) { - const sal_Bool bLineVisible(XLINE_NONE != ((const XLineStyleItem&)(GetItem(XATTR_LINESTYLE))).GetValue()); + const bool bLineVisible(XLINE_NONE != ((const XLineStyleItem&)(GetItem(XATTR_LINESTYLE))).GetValue()); if(bLineVisible) { @@ -421,7 +421,7 @@ namespace sdr if(nParaCount) { - sal_Bool bBurnIn(sal_False); + bool bBurnIn(false); for(sal_uInt16 nPara = 0; nPara < nParaCount; nPara++) { @@ -451,7 +451,7 @@ namespace sdr from the paragraphs item set */ - sal_Bool bHasURL(sal_False); + bool bHasURL(false); if(aSet.GetItemState(EE_CHAR_COLOR) == SFX_ITEM_SET) { @@ -473,7 +473,7 @@ namespace sdr if(pData && pData->ISA(SvxURLField)) { - bHasURL = sal_True; + bHasURL = true; break; } } @@ -519,7 +519,7 @@ namespace sdr } pOutliner->SetParaAttribs(nPara, aSet); - bBurnIn = sal_True; // #i51163# Flag was set wrong + bBurnIn = true; // #i51163# Flag was set wrong } } diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index de7fd80e8275..b4485c535fc3 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -142,10 +142,10 @@ struct SvxPosSizeStatusBarControl_Impl Point aPos; // valid when a position is shown Size aSize; // valid when a size is shown String aStr; // valid when a text is shown - sal_Bool bPos; // show position ? - sal_Bool bSize; // set size ? - sal_Bool bTable; // set table index ? - sal_Bool bHasMenu; // set StarCalc popup menu ? + bool bPos; // show position ? + bool bSize; // set size ? + bool bTable; // set table index ? + bool bHasMenu; // set StarCalc popup menu ? sal_uInt16 nFunction; // the selected StarCalc function Image aPosImage; // Image to show the position Image aSizeImage; // Image to show the size @@ -170,10 +170,10 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId, SfxStatusBarControl( _nSlotId, _nId, rStb ), pImp( new SvxPosSizeStatusBarControl_Impl ) { - pImp->bPos = sal_False; - pImp->bSize = sal_False; - pImp->bTable = sal_False; - pImp->bHasMenu = sal_False; + pImp->bPos = false; + pImp->bSize = false; + pImp->bTable = false; + pImp->bHasMenu = false; pImp->nFunction = 0; pImp->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) ); pImp->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) ); @@ -233,12 +233,12 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt { if ( eState == SFX_ITEM_AVAILABLE ) { - pImp->bHasMenu = sal_True; + pImp->bHasMenu = true; if ( pState && pState->ISA(SfxUInt16Item) ) pImp->nFunction = ((const SfxUInt16Item*)pState)->GetValue(); } else - pImp->bHasMenu = sal_False; + pImp->bHasMenu = false; } else if ( SFX_ITEM_AVAILABLE != eState ) { @@ -246,11 +246,11 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt // notified for all display types if ( nSID == SID_TABLE_CELL ) - pImp->bTable = sal_False; + pImp->bTable = false; else if ( nSID == SID_ATTR_POSITION ) - pImp->bPos = sal_False; + pImp->bPos = false; else if ( nSID == GetSlotId() ) // controller is registered for SID_ATTR_SIZE - pImp->bSize = sal_False; + pImp->bSize = false; else { SAL_WARN( "svx.stbcrtls","unknown slot id"); @@ -260,30 +260,30 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt { // show position pImp->aPos = ( (SfxPointItem*)pState )->GetValue(); - pImp->bPos = sal_True; - pImp->bTable = sal_False; + pImp->bPos = true; + pImp->bTable = false; } else if ( pState->ISA( SvxSizeItem ) ) { // show size pImp->aSize = ( (SvxSizeItem*)pState )->GetSize(); - pImp->bSize = sal_True; - pImp->bTable = sal_False; + pImp->bSize = true; + pImp->bTable = false; } else if ( pState->ISA( SfxStringItem ) ) { // show string (table cel or different) pImp->aStr = ( (SfxStringItem*)pState )->GetValue(); - pImp->bTable = sal_True; - pImp->bPos = sal_False; - pImp->bSize = sal_False; + pImp->bTable = true; + pImp->bPos = false; + pImp->bSize = false; } else { SAL_WARN( "svx.stbcrtls", "invalid item type" ); - pImp->bPos = sal_False; - pImp->bSize = sal_False; - pImp->bTable = sal_False; + pImp->bPos = false; + pImp->bSize = false; + pImp->bTable = false; } if ( GetStatusBar().AreItemsVisible() ) |