mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:simplifybool

Browse Source 
Change-Id: I610022f4eabe45eb4e2347db56accf3851e5c281
This commit is contained in:
Stephan Bergmann
2015-04-24 12:32:52 +02:00
parent 0a48e0fb4e
commit 3accc52528
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
reportdesign/source/core/sdr/ReportUndoFactory.cxx
View File

@@ -68,12 +68,12 @@ SdrUndoAction* OReportUndoFactory::CreateUndoGeoObject( SdrObject& rObject )
SdrUndoAction* OReportUndoFactory::CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText ) SdrUndoAction* OReportUndoFactory::CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText )
{ {
return m_pUndoFactory->CreateUndoAttrObject( rObject, bStyleSheet1 ? true : false, bSaveText ? true : false ); return m_pUndoFactory->CreateUndoAttrObject( rObject, bStyleSheet1, bSaveText );
} }
SdrUndoAction* OReportUndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ) SdrUndoAction* OReportUndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect )
{ {
return m_pUndoFactory->CreateUndoRemoveObject( rObject, bOrdNumDirect ? true : false ); return m_pUndoFactory->CreateUndoRemoveObject( rObject, bOrdNumDirect );
} }
SdrUndoAction* OReportUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool /*bOrdNumDirect*/ ) SdrUndoAction* OReportUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool /*bOrdNumDirect*/ )
@@ -93,7 +93,7 @@ SdrUndoAction* OReportUndoFactory::CreateUndoNewObject( SdrObject& rObject, bool
SdrUndoAction* OReportUndoFactory::CreateUndoCopyObject( SdrObject& rObject, bool bOrdNumDirect ) SdrUndoAction* OReportUndoFactory::CreateUndoCopyObject( SdrObject& rObject, bool bOrdNumDirect )
{ {
return m_pUndoFactory->CreateUndoCopyObject( rObject, bOrdNumDirect ? true : false ); return m_pUndoFactory->CreateUndoCopyObject( rObject, bOrdNumDirect );
} }
SdrUndoAction* OReportUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1) SdrUndoAction* OReportUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1)
@@ -103,7 +103,7 @@ SdrUndoAction* OReportUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, s
SdrUndoAction* OReportUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ) SdrUndoAction* OReportUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect )
{ {
return m_pUndoFactory->CreateUndoReplaceObject( rOldObject, rNewObject, bOrdNumDirect ? true : false ); return m_pUndoFactory->CreateUndoReplaceObject( rOldObject, rNewObject, bOrdNumDirect );
} }
SdrUndoAction* OReportUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ) SdrUndoAction* OReportUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer )

2
reportdesign/source/core/sdr/UndoActions.cxx
View File

@@ -135,7 +135,7 @@ OUndoContainerAction::~OUndoContainerAction()
#if OSL_DEBUG_LEVEL > 0 #if OSL_DEBUG_LEVEL > 0
SvxShape* pShape = SvxShape::getImplementation( xChild ); SvxShape* pShape = SvxShape::getImplementation( xChild );
SdrObject* pObject = pShape ? pShape->GetSdrObject() : NULL; SdrObject* pObject = pShape ? pShape->GetSdrObject() : NULL;
OSL_ENSURE( pObject ? pShape->HasSdrObjectOwnership() && !pObject->IsInserted() : true , OSL_ENSURE( pObject == nullptr || (pShape->HasSdrObjectOwnership() && !pObject->IsInserted()),
"OUndoContainerAction::~OUndoContainerAction: inconsistency in the shape/object ownership!" ); "OUndoContainerAction::~OUndoContainerAction: inconsistency in the shape/object ownership!" );
#endif #endif
// -> dispose it // -> dispose it

2
reportdesign/source/ui/report/dlgedfunc.cxx
View File

@@ -610,7 +610,7 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt)
SdrObject* pObjOverlapped = isOver(aNewRect,*m_pParent->getPage(),m_rView,false,pObjIter, ISOVER_IGNORE_CUSTOMSHAPES); SdrObject* pObjOverlapped = isOver(aNewRect,*m_pParent->getPage(),m_rView,false,pObjIter, ISOVER_IGNORE_CUSTOMSHAPES);
bIsSetPoint = pObjOverlapped ? true : false; bIsSetPoint = pObjOverlapped != nullptr;
if (pObjOverlapped && !m_bSelectionMode) if (pObjOverlapped && !m_bSelectionMode)
{ {
colorizeOverlappedObject(pObjOverlapped); colorizeOverlappedObject(pObjOverlapped);