diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 19:57:37 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:26:17 +0100 |
commit | 0d957046f103605ba51b2a59a8f4c463ca33010a (patch) | |
tree | 66acd5576bd19167c14837d8b036673485f252bc /svx/source/unodraw | |
parent | bd9581d46d78c5742fbb50f1b4a9ff2fc1dae7e8 (diff) |
bool improvements
Change-Id: Ic32faa81bfbb66a9d8632fb3db187e33c31188ed
Diffstat (limited to 'svx/source/unodraw')
-rw-r--r-- | svx/source/unodraw/UnoGraphicExporter.cxx | 16 | ||||
-rw-r--r-- | svx/source/unodraw/unomtabl.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unopage.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unopool.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 12 | ||||
-rw-r--r-- | svx/source/unodraw/unoshap3.cxx | 4 | ||||
-rw-r--r-- | svx/source/unodraw/unoshape.cxx | 12 | ||||
-rw-r--r-- | svx/source/unodraw/unoshtxt.cxx | 4 |
8 files changed, 27 insertions, 27 deletions
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index e698b97881a7..ce7090340ca8 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -437,11 +437,11 @@ VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWid if(bSuccess) { SdrView* pView = new SdrView(mpDoc, pVDev); - pView->SetPageVisible( sal_False ); - pView->SetBordVisible( sal_False ); - pView->SetGridVisible( sal_False ); - pView->SetHlplVisible( sal_False ); - pView->SetGlueVisible( sal_False ); + pView->SetPageVisible( false ); + pView->SetBordVisible( false ); + pView->SetGridVisible( false ); + pView->SetHlplVisible( false ); + pView->SetGlueVisible( false ); pView->ShowSdrPage(pPage); Region aRegion (Rectangle( aPoint, aPageSize ) ); @@ -743,8 +743,8 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, pView.reset(new SdrView( mpDoc, &aVDev )); } - pView->SetBordVisible( sal_False ); - pView->SetPageVisible( sal_False ); + pView->SetBordVisible( false ); + pView->SetPageVisible( false ); pView->ShowSdrPage( pPage ); const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() ); @@ -1185,7 +1185,7 @@ void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XCompon // no errors so far return; } - while( 0 ); + while( false ); } catch( Exception& ) { diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index 7c162591af79..13541f214b38 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -326,7 +326,7 @@ uno::Any SAL_CALL SvxUnoMarkerTable::getByName( const OUString& aApiName ) throw container::NoSuchElementException(); } - while(0); + while(false); } return aAny; diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index c8926b06d2e5..a0c66808fa2f 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -483,7 +483,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x double fH = (double)aSize.Height; Camera3D aCam(pScene->GetCamera()); - aCam.SetAutoAdjustProjection(sal_False); + aCam.SetAutoAdjustProjection(false); aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH); basegfx::B3DPoint aLookAt; basegfx::B3DPoint aCamPos(0.0, 0.0, 10000.0); diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index 08a610cfe165..be3b0dd01437 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -182,7 +182,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn pPool->SetPoolDefaultItem( XFillBmpTileItem( eMode == drawing::BitmapMode_REPEAT ) ); return; } - while(0); + while(false); default: { diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index bf3f86cd4de5..fc2285106307 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -287,7 +287,7 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS } else { - DBG_ASSERT( 0, "Fatality! SdrObject is not belonging to its SdrObjList! [CL]" ); + DBG_ASSERT( false, "Fatality! SdrObject is not belonging to its SdrObjList! [CL]" ); } if( mpModel ) @@ -484,7 +484,7 @@ void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XC SvxShape* pShape = SvxShape::getImplementation( xRef ); if( pShape ) - mpObj->ConnectToNode( sal_True, pShape->mpObj.get() ); + mpObj->ConnectToNode( true, pShape->mpObj.get() ); if( mpModel ) mpModel->SetChanged(); @@ -500,7 +500,7 @@ void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XCon SvxShape* pShape = SvxShape::getImplementation( xRef ); if( mpObj.is() && pShape ) - mpObj->ConnectToNode( sal_False, pShape->mpObj.get() ); + mpObj->ConnectToNode( false, pShape->mpObj.get() ); if( mpModel ) mpModel->SetChanged(); @@ -513,7 +513,7 @@ void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing: ::SolarMutexGuard aGuard; if(mpObj.is()) - mpObj->DisconnectFromNode( sal_True ); + mpObj->DisconnectFromNode( true ); if( mpModel ) mpModel->SetChanged(); @@ -526,7 +526,7 @@ void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::X ::SolarMutexGuard aGuard; if(mpObj.is()) - mpObj->DisconnectFromNode( sal_False ); + mpObj->DisconnectFromNode( false ); if( mpModel ) mpModel->SetChanged(); @@ -1493,7 +1493,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte SvMemoryStream aMemStm; Graphic aGraphic; - aMemStm.SetBuffer( (char*)pSeq->getConstArray(), pSeq->getLength(), sal_False, pSeq->getLength() ); + aMemStm.SetBuffer( (char*)pSeq->getConstArray(), pSeq->getLength(), false, pSeq->getLength() ); if( GraphicConverter::Import( aMemStm, aGraphic ) == ERRCODE_NONE ) { diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index d94b7bc1e97c..2f343d6208ba 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -193,7 +193,7 @@ void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xSha } else { - DBG_ASSERT( 0, "Fatality! SdrObject is not belonging to its SdrObjList! [CL]" ); + DBG_ASSERT( false, "Fatality! SdrObject is not belonging to its SdrObjList! [CL]" ); } } } @@ -376,7 +376,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte double fCamFocal = (double)((const SfxUInt32Item&)rSceneSet.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); - aCam.SetAutoAdjustProjection(sal_False); + aCam.SetAutoAdjustProjection(false); aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH); basegfx::B3DPoint aLookAt; basegfx::B3DPoint aCamPos(0.0, 0.0, fCamPosZ); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 8c64c3a4c780..526bfec7d86e 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1738,7 +1738,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const if(bIsNotPersist) { // Not-Persistent Attribute, hole diese extra - mpObj->TakeNotPersistAttr(*pSet, sal_False); + mpObj->TakeNotPersistAttr(*pSet, false); } } @@ -1834,7 +1834,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) if(pMap->nWID >= SDRATTR_NOTPERSIST_FIRST && pMap->nWID <= SDRATTR_NOTPERSIST_LAST) { // Not-Persistent Attribute, hole diese extra - mpObj->TakeNotPersistAttr(aSet, sal_False); + mpObj->TakeNotPersistAttr(aSet, false); } } @@ -1878,7 +1878,7 @@ void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence // reseted even when an execption is thrown const ::comphelper::ScopeGuard aGuard( boost::bind( &SvxShape::endSetPropertyValues, this ) ); - mbIsMultiPropertyCall = sal_True; + mbIsMultiPropertyCall = true; if( mpImpl->mpMaster ) { @@ -1928,7 +1928,7 @@ void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence void SvxShape::endSetPropertyValues() { - mbIsMultiPropertyCall = sal_False; + mbIsMultiPropertyCall = false; if( mpImpl->mpItemSet ) { delete mpImpl->mpItemSet; @@ -2421,7 +2421,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl OUString aLayerName; if( rValue >>= aLayerName ) { - const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName, sal_True); + const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName, true); if( pLayer != NULL ) { mpObj->SetLayer( pLayer->GetID() ); @@ -2459,7 +2459,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl { Point aRef1(mpObj->GetSnapRect().Center()); double nTan=tan(nShear*nPi180); - mpObj->Shear(aRef1,nShear,nTan,sal_False); + mpObj->Shear(aRef1,nShear,nTan,false); return true; } } diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 30d364fdd93e..991b6bf9abac 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -653,7 +653,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() // #91254# put text to object and set EmptyPresObj to FALSE if( mpText && bOwnParaObj && pOutlinerParaObject && mpObject->IsEmptyPresObj() && pTextObj->IsRealyEdited() ) { - mpObject->SetEmptyPresObj( sal_False ); + mpObject->SetEmptyPresObj( false ); static_cast< SdrTextObj* >( mpObject)->NbcSetOutlinerParaObjectForText( pOutlinerParaObject, mpText ); // #i103982# Here, due to mpObject->NbcSetOutlinerParaObjectForText, we LOSE ownership of the @@ -893,7 +893,7 @@ void SvxTextEditSourceImpl::UpdateData() } if( mpObject->IsEmptyPresObj() ) - mpObject->SetEmptyPresObj(sal_False); + mpObject->SetEmptyPresObj(false); } } } |