summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2012-01-21 12:00:59 +0100
committerThomas Arnhold <thomas@arnhold.org>2012-01-21 19:58:45 +0100
commit94f114550a8fd9f21e70fa98a4b564d7643d47d4 (patch)
tree82dcbc1edecc3199ce29b383dd67e073e9094b81
parent3bb278f5bfa1cb28ba051bc6980a93d52f9b29e1 (diff)
Improve checking for emptiness
-rw-r--r--chart2/source/controller/drawinglayer/DrawViewWrapper.cxx2
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.cxx2
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx8
-rw-r--r--sw/source/ui/uiview/viewmdi.cxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index e573944e5be4..fad41f051074 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -221,7 +221,7 @@ SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const
const basegfx::B2DPoint aHitPoint(rPnt.X(), rPnt.Y());
getAllHit3DObjectsSortedFrontToBack(aHitPoint, *pScene, aHitList);
- if(aHitList.size())
+ if(!aHitList.empty())
{
// choose the frontmost hit 3D object of the scene
pRet = const_cast< E3dCompoundObject* >(aHitList[0]);
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 41709c0dbd72..ece6b3e91e12 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -343,7 +343,7 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
//check offset of outer series
- if( aSeriesVec.size() )
+ if( !aSeriesVec.empty() )
{
sal_Int32 nOuterSeriesIndex = 0; //@todo in future this will depend on Orientation of the radius axis scale
Reference< chart2::XDataSeries > xSeries( aSeriesVec[nOuterSeriesIndex] );
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index a8e077bb8391..e3a90dd648f8 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1892,7 +1892,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x
xProperties->getPropertyValue(SC_NUMBERFORMAT) >>= nNumberFormat;
if (!sStyleName.isEmpty())
{
- if (xPropStates.size())
+ if (!xPropStates.empty())
{
sal_Int32 nIndex;
if (pOldName)
@@ -1968,7 +1968,7 @@ void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>&
rtl::OUString SC_SCOLUMNPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX));
std::vector<XMLPropertyState> xPropStates(xColumnStylesExportPropertySetMapper->Filter(xColumnProperties));
- if(xPropStates.size())
+ if(!xPropStates.empty())
{
std::vector< XMLPropertyState >::iterator aItr(xPropStates.begin());
std::vector< XMLPropertyState >::iterator aEndItr(xPropStates.end());
@@ -2013,7 +2013,7 @@ void ScXMLExport::AddStyleFromRow(const uno::Reference<beans::XPropertySet>& xRo
rtl::OUString SC_SROWPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX));
std::vector<XMLPropertyState> xPropStates(xRowStylesExportPropertySetMapper->Filter(xRowProperties));
- if(xPropStates.size())
+ if(!xPropStates.empty())
{
rtl::OUString sParent;
if (pOldName)
@@ -2365,7 +2365,7 @@ void ScXMLExport::_ExportAutoStyles()
if (xTableProperties.is())
{
std::vector<XMLPropertyState> xPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties));
- if(xPropStates.size())
+ if(!xPropStates.empty())
{
rtl::OUString sParent;
rtl::OUString sName;
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index b1c9dedfb5bc..27949cff51e9 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -460,7 +460,7 @@ IMPL_STATIC_LINK( SwView, MoveNavigationHdl, bool *, pbNext )
}
// move
- if(vNavMarks.size())
+ if(!vNavMarks.empty())
{
if(bNext)
{