Some cppcheck cleaning
This commit is contained in:
parent
5c82c9588e
commit
93774fa4d5
9 changed files with 15 additions and 15 deletions
|
@ -2103,7 +2103,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( sal_Bool bLineGeometryNeededOnl
|
|||
}
|
||||
|
||||
// #i37011#
|
||||
if(vObjectList.size())
|
||||
if(!vObjectList.empty())
|
||||
{
|
||||
// copy remaining objects to pRet
|
||||
if(vObjectList.size() > 1L)
|
||||
|
|
|
@ -662,7 +662,7 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFW
|
|||
std::vector< double > vDistances;
|
||||
vDistances.reserve( nPointCount );
|
||||
CalcDistances( rOutlinePoly, vDistances );
|
||||
if ( vDistances.size() )
|
||||
if ( !vDistances.empty() )
|
||||
{
|
||||
std::vector< FWParagraphData >::iterator aParagraphIter( aTextAreaIter->vParagraphs.begin() );
|
||||
std::vector< FWParagraphData >::iterator aParagraphIEnd( aTextAreaIter->vParagraphs.end() );
|
||||
|
@ -793,7 +793,7 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFW
|
|||
SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const SdrObject* pCustomShape )
|
||||
{
|
||||
SdrObject* pRet = NULL;
|
||||
if ( rFWData.vTextAreas.size() )
|
||||
if ( !rFWData.vTextAreas.empty() )
|
||||
{
|
||||
pRet = new SdrObjGroup();
|
||||
std::vector< FWTextArea >::const_iterator aTextAreaIter = rFWData.vTextAreas.begin();
|
||||
|
|
|
@ -511,7 +511,7 @@ void Svx3DLightControl::TrySelection(Point aPosPixel)
|
|||
std::vector< const E3dCompoundObject* > aResult;
|
||||
getAllHit3DObjectsSortedFrontToBack(aPoint, *mpScene, aResult);
|
||||
|
||||
if(aResult.size())
|
||||
if(!aResult.empty())
|
||||
{
|
||||
// exclude expansion object which will be part of
|
||||
// the hits. It's invisible, but for HitTest, it's included
|
||||
|
|
|
@ -161,7 +161,7 @@ TYPEINIT1(FmParentData, FmFilterData);
|
|||
FmParentData::~FmParentData()
|
||||
{
|
||||
for (::std::vector<FmFilterData*>::const_iterator i = m_aChildren.begin();
|
||||
i != m_aChildren.end(); i++)
|
||||
i != m_aChildren.end(); ++i)
|
||||
delete (*i);
|
||||
}
|
||||
|
||||
|
@ -588,7 +588,7 @@ void FmFilterModel::Clear()
|
|||
m_xControllers = NULL;
|
||||
|
||||
for (::std::vector<FmFilterData*>::const_iterator i = m_aChildren.begin();
|
||||
i != m_aChildren.end(); i++)
|
||||
i != m_aChildren.end(); ++i)
|
||||
delete (*i);
|
||||
|
||||
m_aChildren.clear();
|
||||
|
@ -700,7 +700,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar
|
|||
FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, const Reference< XFormController > & xController) const
|
||||
{
|
||||
for (::std::vector<FmFilterData*>::const_iterator i = rItems.begin();
|
||||
i != rItems.end(); i++)
|
||||
i != rItems.end(); ++i)
|
||||
{
|
||||
FmFormItem* pForm = PTR_CAST(FmFormItem,*i);
|
||||
if (pForm)
|
||||
|
@ -722,7 +722,7 @@ FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, cons
|
|||
FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, const Reference< XForm >& xForm) const
|
||||
{
|
||||
for (::std::vector<FmFilterData*>::const_iterator i = rItems.begin();
|
||||
i != rItems.end(); i++)
|
||||
i != rItems.end(); ++i)
|
||||
{
|
||||
FmFormItem* pForm = PTR_CAST(FmFormItem,*i);
|
||||
if (pForm)
|
||||
|
@ -1903,7 +1903,7 @@ void FmFilterNavigator::DeleteSelection()
|
|||
|
||||
for (::std::vector<SvLBoxEntry*>::reverse_iterator i = aEntryList.rbegin();
|
||||
// link problems with operator ==
|
||||
i.base() != aEntryList.rend().base(); i++)
|
||||
i.base() != aEntryList.rend().base(); ++i)
|
||||
{
|
||||
m_pModel->Remove((FmFilterData*)(*i)->GetUserData());
|
||||
}
|
||||
|
|
|
@ -329,7 +329,7 @@ Reference< XFormController > FormViewPageWindowAdapter::getController( const Re
|
|||
{
|
||||
Reference< XTabControllerModel > xModel(xForm, UNO_QUERY);
|
||||
for (::std::vector< Reference< XFormController > >::const_iterator i = m_aControllerList.begin();
|
||||
i != m_aControllerList.end(); i++)
|
||||
i != m_aControllerList.end(); ++i)
|
||||
{
|
||||
if ((XTabControllerModel*)(*i)->getModel().get() == (XTabControllerModel*)xModel.get())
|
||||
return *i;
|
||||
|
|
|
@ -3153,7 +3153,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
|
|||
Reference< XColumnsSupplier >( m_xComposer, UNO_QUERY_THROW )->getColumns();
|
||||
|
||||
for (::std::vector<FmFieldInfo>::iterator iter = rFieldInfos.begin();
|
||||
iter != rFieldInfos.end(); iter++)
|
||||
iter != rFieldInfos.end(); ++iter)
|
||||
{
|
||||
if ( xQueryColumns->hasByName((*iter).aFieldName) )
|
||||
{
|
||||
|
@ -3229,7 +3229,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
|
|||
|
||||
// find the text component
|
||||
for (::std::vector<FmFieldInfo>::iterator iter = rFieldInfos.begin();
|
||||
iter != rFieldInfos.end(); iter++)
|
||||
iter != rFieldInfos.end(); ++iter)
|
||||
{
|
||||
// we found the field so insert a new entry to the filter row
|
||||
if ((*iter).xField == xField)
|
||||
|
|
|
@ -144,7 +144,7 @@ static void createTheme( rtl::OUString aThemeName,
|
|||
|
||||
FileNameList::const_iterator aIter;
|
||||
|
||||
for( aIter = rFiles.begin(); aIter != rFiles.end(); aIter++ )
|
||||
for( aIter = rFiles.begin(); aIter != rFiles.end(); ++aIter )
|
||||
{
|
||||
// Should/could use:
|
||||
// if ( ! pGalTheme->InsertFileOrDirURL( aURL ) ) {
|
||||
|
|
|
@ -214,7 +214,7 @@ namespace sdr
|
|||
|
||||
// execute events from the vector
|
||||
for(::std::vector< Event* >::iterator aCandidate = EventPointerVector.begin();
|
||||
aCandidate != EventPointerVector.end(); aCandidate++)
|
||||
aCandidate != EventPointerVector.end(); ++aCandidate)
|
||||
{
|
||||
// trigger event. This may re-insert the event to the scheduler again
|
||||
(*aCandidate)->Trigger(mnTime);
|
||||
|
|
|
@ -174,7 +174,7 @@ namespace sdr
|
|||
aGluepointVector.push_back(basegfx::B2DPoint(aPosition.X(), aPosition.Y()));
|
||||
}
|
||||
|
||||
if(aGluepointVector.size())
|
||||
if(!aGluepointVector.empty())
|
||||
{
|
||||
const basegfx::BColor aBackPen(1.0, 1.0, 1.0);
|
||||
const basegfx::BColor aRGBFrontColor(0.0, 0.0, 1.0); // COL_LIGHTBLUE
|
||||
|
|
Loading…
Reference in a new issue