[Libreoffice-commits] .: 6 commits - animations/source basegfx/inc basegfx/source chart2/source connectivity/source cui/source drawinglayer/source oox/inc oox/source padmin/source sc/source svtools/bmpmaker svtools/source svx/source sw/source unusedcode.easy vcl/generic vcl/inc
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sat Jan 21 10:59:03 PST 2012
animations/source/animcore/animcore.cxx | 2 -
basegfx/inc/basegfx/curve/b2dbeziertools.hxx | 2 -
basegfx/source/polygon/b2dpolygoncutandtouch.cxx | 10 ++---
basegfx/source/polygon/b2dpolygontriangulator.cxx | 2 -
basegfx/source/polygon/b2dtrapezoid.cxx | 2 -
basegfx/source/raster/rasterconvert3d.cxx | 4 +-
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 2 -
chart2/source/model/template/PieChartTypeTemplate.cxx | 2 -
connectivity/source/drivers/mozab/MPreparedStatement.cxx | 2 -
cui/source/dialogs/SpellDialog.cxx | 4 +-
cui/source/dialogs/cuigaldlg.cxx | 4 +-
drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx | 6 +--
drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx | 2 -
drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx | 2 -
drawinglayer/source/primitive3d/sdrprimitive3d.cxx | 2 -
drawinglayer/source/processor2d/canvasprocessor.cxx | 2 -
drawinglayer/source/processor2d/vclhelpergradient.cxx | 6 +--
drawinglayer/source/processor2d/vclprocessor2d.cxx | 2 -
oox/inc/oox/export/chartexport.hxx | 7 ---
oox/inc/oox/export/shapes.hxx | 3 -
oox/source/export/chartexport.cxx | 16 --------
oox/source/export/shapes.cxx | 11 ------
padmin/source/newppdlg.cxx | 2 -
sc/source/filter/xml/xmlexprt.cxx | 8 ++--
svtools/bmpmaker/bmpcore.cxx | 2 -
svtools/source/filter/wmf/winmtf.cxx | 2 -
svx/source/engine3d/helperhittest3d.cxx | 2 -
svx/source/table/tablelayouter.cxx | 22 ------------
svx/source/table/tablelayouter.hxx | 3 -
sw/source/core/docnode/ndtbl.cxx | 2 -
sw/source/core/unocore/unoportenum.cxx | 4 +-
sw/source/ui/uiview/viewmdi.cxx | 2 -
unusedcode.easy | 11 ------
vcl/generic/print/printerjob.cxx | 19 ----------
vcl/inc/generic/printerjob.hxx | 4 --
35 files changed, 43 insertions(+), 135 deletions(-)
New commits:
commit 22da27d9ddcdacaef21d667b0777052b7e817b9a
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Jan 21 19:57:19 2012 +0100
Improve checking for emptiness
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index 9a837f6..e85b806 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -1178,7 +1178,7 @@ Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw (RuntimeExce
{
xNewNode = new AnimationNode( *this );
- if( maChildren.size() )
+ if( !maChildren.empty() )
{
Reference< XTimeContainer > xContainer( xNewNode, UNO_QUERY );
if( xContainer.is() )
diff --git a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
index 2279cb9..821cc33 100644
--- a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
+++ b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
@@ -54,7 +54,7 @@ namespace basegfx
public:
B2DCubicBezierHelper(const B2DCubicBezier& rBase, sal_uInt32 nDivisions = 9);
- double getLength() const { if(maLengthArray.size()) return maLengthArray[maLengthArray.size() - 1]; else return 0.0; }
+ double getLength() const { if(!maLengthArray.empty()) return maLengthArray[maLengthArray.size() - 1]; else return 0.0; }
double distanceToRelative(double fDistance) const;
};
} // end of namespace basegfx
diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index 011ecff..d4d075b 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -437,7 +437,7 @@ namespace basegfx
// #i76891# using findCuts recursively is not sufficient here
findCutsAndTouchesAndCommonForBezier(aTempPolygonA, aTempPolygonEdge, aTempPointVectorA, aTempPointVectorEdge);
- if(aTempPointVectorA.size())
+ if(!aTempPointVectorA.empty())
{
// adapt tempVector entries to segment
adaptAndTransferCutsWithBezierSegment(aTempPointVectorA, aTempPolygonA, nIndA, rTempPointsA);
@@ -479,13 +479,13 @@ namespace basegfx
// #i76891# using findCuts recursively is not sufficient here
findCutsAndTouchesAndCommonForBezier(aTempPolygonA, aTempPolygonB, aTempPointVectorA, aTempPointVectorB);
- if(aTempPointVectorA.size())
+ if(!aTempPointVectorA.empty())
{
// adapt tempVector entries to segment
adaptAndTransferCutsWithBezierSegment(aTempPointVectorA, aTempPolygonA, nIndA, rTempPointsA);
}
- if(aTempPointVectorB.size())
+ if(!aTempPointVectorB.empty())
{
// adapt tempVector entries to segment
adaptAndTransferCutsWithBezierSegment(aTempPointVectorB, aTempPolygonB, nIndB, rTempPointsB);
@@ -518,7 +518,7 @@ namespace basegfx
rCubicA.adaptiveSubdivideByCount(aTempPolygon, SUBDIVIDE_FOR_CUT_TEST_COUNT);
findCuts(aTempPolygon, aTempPointVector);
- if(aTempPointVector.size())
+ if(!aTempPointVector.empty())
{
// adapt tempVector entries to segment
adaptAndTransferCutsWithBezierSegment(aTempPointVector, aTempPolygon, nInd, rTempPoints);
@@ -715,7 +715,7 @@ namespace basegfx
rCubicA.adaptiveSubdivideByCount(aTempPolygon, SUBDIVIDE_FOR_CUT_TEST_COUNT);
findTouches(aTempPolygon, rPointPolygon, aTempPointVector);
- if(aTempPointVector.size())
+ if(!aTempPointVector.empty())
{
// adapt tempVector entries to segment
adaptAndTransferCutsWithBezierSegment(aTempPointVector, aTempPolygon, nInd, rTempPoints);
diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx b/basegfx/source/polygon/b2dpolygontriangulator.cxx
index 66666e5..121211d 100644
--- a/basegfx/source/polygon/b2dpolygontriangulator.cxx
+++ b/basegfx/source/polygon/b2dpolygontriangulator.cxx
@@ -261,7 +261,7 @@ namespace basegfx
}
}
- if(maStartEntries.size())
+ if(!maStartEntries.empty())
{
// sort initial list
::std::sort(maStartEntries.begin(), maStartEntries.end());
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
index 8c43bfe..fc2a43b 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -550,7 +550,7 @@ namespace basegfx
}
}
- if(maTrDeEdgeEntries.size())
+ if(!maTrDeEdgeEntries.empty())
{
// single and initial sort of traversing edges
maTrDeEdgeEntries.sort();
diff --git a/basegfx/source/raster/rasterconvert3d.cxx b/basegfx/source/raster/rasterconvert3d.cxx
index 3ff9486..9c9c8e0 100644
--- a/basegfx/source/raster/rasterconvert3d.cxx
+++ b/basegfx/source/raster/rasterconvert3d.cxx
@@ -66,7 +66,7 @@ namespace basegfx
void RasterConverter3D::rasterconvertB3DArea(sal_Int32 nStartLine, sal_Int32 nStopLine)
{
- if(maLineEntries.size())
+ if(!maLineEntries.empty())
{
OSL_ENSURE(nStopLine >= nStartLine, "nStopLine is bigger than nStartLine (!)");
@@ -317,7 +317,7 @@ namespace basegfx
}
}
- if(maLineEntries.size())
+ if(!maLineEntries.empty())
{
rasterconvertB3DArea(nStartLine, nStopLine);
}
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index 2aa2ddd..e21ec2f 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
@@ -486,7 +486,7 @@ void OPreparedStatement::describeParameter()
{
::std::vector< OSQLParseNode*> aParseNodes;
scanParameter(m_pParseTree,aParseNodes);
- if(aParseNodes.size())
+ if(!aParseNodes.empty())
{
m_xParamColumns = new OSQLColumns();
const OSQLTables& xTabs = m_pSQLIterator->getTables();
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 2f66b41..a336a4b 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1181,7 +1181,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
if(!bUseSavedSentence)
m_aSavedSentence = aSentence;
bool bHasReplaced = false;
- while(aSentence.size())
+ while(!aSentence.empty())
{
//apply all changes that are already part of the "ChangeAllList"
//returns true if the list still contains errors after the changes have been applied
@@ -1195,7 +1195,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
break;
}
- if(aSentence.size())
+ if(!aSentence.empty())
{
SpellPortions::iterator aStart = aSentence.begin();
rtl::OUString sText;
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 47d3ba8..ba84162 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -1217,7 +1217,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFoundHdl, void *, EMPTYARG )
else
aCbxPreview.Disable();
- if( aFoundList.size() )
+ if( !aFoundList.empty() )
aBtnTakeAll.Enable();
else
aBtnTakeAll.Disable();
@@ -1258,7 +1258,7 @@ IMPL_LINK( TPGalleryThemeProperties, PreviewTimerHdl, void *, EMPTYARG )
IMPL_LINK( TPGalleryThemeProperties, EndSearchProgressHdl, SearchProgress *, EMPTYARG )
{
- if( aFoundList.size() )
+ if( !aFoundList.empty() )
{
aLbxFound.SelectEntryPos( 0 );
aBtnTakeAll.Enable();
diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
index b2f1bb5..25afcfe 100644
--- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
@@ -128,7 +128,7 @@ namespace drawinglayer
Primitive2DSequence aRetval(rColors.size() ? rMatrices.size() + 1 : rMatrices.size());
// create solid fill with start color
- if(rColors.size())
+ if(!rColors.empty())
{
// create primitive
const Primitive2DReference xRef(
@@ -175,7 +175,7 @@ namespace drawinglayer
aRetval.realloc(nEntryCount);
- if(rColors.size())
+ if(!rColors.empty())
{
basegfx::B2DRange aOuterPolyRange(aOuterPoly.getB2DRange());
aOuterPolyRange.expand(getObjectRange());
@@ -193,7 +193,7 @@ namespace drawinglayer
aCombinedPolyPoly = basegfx::B2DPolyPolygon(aInnerPoly);
}
- if(rColors.size())
+ if(!rColors.empty())
{
aRetval[nIndex] = Primitive2DReference(new PolyPolygonColorPrimitive2D(
aCombinedPolyPoly, rColors[rColors.size() - 1]));
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
index 0b6447c..8b676cd 100644
--- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
@@ -55,7 +55,7 @@ namespace drawinglayer
// get slices
const Slice3DVector& rSliceVector = getSlices();
- if(rSliceVector.size())
+ if(!rSliceVector.empty())
{
sal_uInt32 a;
diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
index cc9cb8b..1639308 100644
--- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
@@ -55,7 +55,7 @@ namespace drawinglayer
// get slices
const Slice3DVector& rSliceVector = getSlices();
- if(rSliceVector.size())
+ if(!rSliceVector.empty())
{
const bool bBackScale(!basegfx::fTools::equal(getBackScale(), 1.0));
const bool bClosedRotation(!bBackScale && getHorizontalSegments() && basegfx::fTools::equal(getRotation(), F_2PI));
diff --git a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
index b2a098c..e4ee45f 100644
--- a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
@@ -64,7 +64,7 @@ namespace drawinglayer
{
basegfx::B3DRange aRetval;
- if(rSlices.size())
+ if(!rSlices.empty())
{
for(sal_uInt32 a(0L); a < rSlices.size(); a++)
{
diff --git a/drawinglayer/source/processor2d/canvasprocessor.cxx b/drawinglayer/source/processor2d/canvasprocessor.cxx
index e916b29..6dcdd99 100644
--- a/drawinglayer/source/processor2d/canvasprocessor.cxx
+++ b/drawinglayer/source/processor2d/canvasprocessor.cxx
@@ -539,7 +539,7 @@ namespace drawinglayer
aStrokeAttribute.MiterLimit = 15.0; // degrees; maybe here (15.0 * F_PI180) is needed, not clear in the documentation
const ::std::vector< double >& rDotDashArray = rStrokeAttribute.getDotDashArray();
- if(rDotDashArray.size())
+ if(!rDotDashArray.empty())
{
aStrokeAttribute.DashArray = uno::Sequence< double >(&rDotDashArray[0], rDotDashArray.size());
}
diff --git a/drawinglayer/source/processor2d/vclhelpergradient.cxx b/drawinglayer/source/processor2d/vclhelpergradient.cxx
index 7564f00..da7995a 100644
--- a/drawinglayer/source/processor2d/vclhelpergradient.cxx
+++ b/drawinglayer/source/processor2d/vclhelpergradient.cxx
@@ -140,7 +140,7 @@ namespace drawinglayer
}
// draw last poly in last color
- if(rColors.size())
+ if(!rColors.empty())
{
const basegfx::BColor aFillColor(rColors[rColors.size() - 1L]);
rOutDev.SetFillColor(Color(aFillColor));
@@ -179,7 +179,7 @@ namespace drawinglayer
}
// draw last poly in last color
- if(rColors.size())
+ if(!rColors.empty())
{
const basegfx::BColor aFillColor(rColors[rColors.size() - 1L]);
rOutDev.SetFillColor(Color(aFillColor));
@@ -265,7 +265,7 @@ namespace drawinglayer
}
// paint them with mask using the XOR method
- if(aMatrices.size())
+ if(!aMatrices.empty())
{
if(bSimple)
{
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index d27826b..c554eb8 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -277,7 +277,7 @@ namespace drawinglayer
nLen = nChars;
}
- if(aTransformedDXArray.size())
+ if(!aTransformedDXArray.empty())
{
mpOutputDevice->DrawTextArray(
aStartPoint,
diff --git a/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx
index fd438ce..5209a92 100644
--- a/svtools/bmpmaker/bmpcore.cxx
+++ b/svtools/bmpmaker/bmpcore.cxx
@@ -91,7 +91,7 @@ void BmpCreator::ImplCreate( const ::std::vector< DirEntry >& rInDirs,
if( pCollectStm )
pCollectStm->Seek( STREAM_SEEK_TO_END );
- if( rInDirs.size() )
+ if( !rInDirs.empty() )
{
ByteString aLine;
String aInfo, aPrefix, aName( rName ), aString;
diff --git a/svtools/source/filter/wmf/winmtf.cxx b/svtools/source/filter/wmf/winmtf.cxx
index 3ae1dff..090886e 100644
--- a/svtools/source/filter/wmf/winmtf.cxx
+++ b/svtools/source/filter/wmf/winmtf.cxx
@@ -2178,7 +2178,7 @@ void WinMtfOutput::Push() // !! to be able to access the o
void WinMtfOutput::Pop()
{
// Die aktuellen Daten vom Stack holen
- if( vSaveStack.size() )
+ if( !vSaveStack.empty() )
{
// Die aktuelle Daten auf dem Stack sichern
SaveStructPtr pSave( vSaveStack.back() );
diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx
index 1a6e41c..c83cae9 100644
--- a/svx/source/engine3d/helperhittest3d.cxx
+++ b/svx/source/engine3d/helperhittest3d.cxx
@@ -279,7 +279,7 @@ bool checkHitSingle3DObject(
::std::vector< basegfx::B3DPoint > aHitsWithObject;
getAllHit3DObjectWithRelativePoint(aFront, aBack, rCandidate, aViewInfo3D, aHitsWithObject, true);
- if(aHitsWithObject.size())
+ if(!aHitsWithObject.empty())
{
return true;
}
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index f759441..0817150 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2933,7 +2933,7 @@ const SwTableBox* SwCollectTblLineBoxes::GetBoxOfPos( const SwTableBox& rBox )
const SwTableBox* pRet = 0;
sal_uInt16 n;
- if( aPosArr.size() )
+ if( !aPosArr.empty() )
{
for( n = 0; n < aPosArr.size(); ++n )
if( aPosArr[ n ] == nWidth )
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 33697fc..fdfe3c6 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -1020,7 +1020,7 @@ lcl_GetNextIndex(
SwSoftPageBreakList const & rBreakArr )
{
sal_Int32 nRet = -1;
- if(rBkmArr.size())
+ if(!rBkmArr.empty())
{
SwXBookmarkPortion_ImplSharedPtr pPtr = (*rBkmArr.begin());
nRet = pPtr->getIndex();
@@ -1032,7 +1032,7 @@ lcl_GetNextIndex(
if(nRet < 0 || nTmp < nRet)
nRet = nTmp;
}
- if(rBreakArr.size())
+ if(!rBreakArr.empty())
{
if(nRet < 0 || *rBreakArr.begin() < static_cast<sal_uInt32>(nRet))
nRet = *rBreakArr.begin();
commit cfc2f1919f8cf856c0c884dac7e4eb83bece4a7f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Jan 21 13:59:47 2012 +0100
Improve checking for emptiness (while)
diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx
index 3521a0c..593c09c 100644
--- a/padmin/source/newppdlg.cxx
+++ b/padmin/source/newppdlg.cxx
@@ -138,7 +138,7 @@ void PPDImportDialog::Import()
int i = 0;
aProgress.setRange( 0, aFiles.size() );
- while( aFiles.size() )
+ while( !aFiles.empty() )
{
aProgress.setValue( ++i );
aProgress.setFilename( aFiles.front() );
commit 94f114550a8fd9f21e70fa98a4b564d7643d47d4
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Jan 21 12:00:59 2012 +0100
Improve checking for emptiness
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index e573944..fad41f0 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 41709c0..ece6b3e 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 a8e077b..e3a90dd 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 b1c9ded..27949cf 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)
{
commit 3bb278f5bfa1cb28ba051bc6980a93d52f9b29e1
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Jan 21 01:38:01 2012 +0100
unused methods
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 18e8332..2842ecf 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -1172,28 +1172,6 @@ void TableLayouter::SetWritingMode( com::sun::star::text::WritingMode eWritingMo
meWritingMode = eWritingMode;
}
-// -----------------------------------------------------------------------------
-
-sal_Int32 TableLayouter::getColumnStart( sal_Int32 nColumn ) const
-{
- if( isValidColumn(nColumn) )
- return maColumns[nColumn].mnPos;
- else
- return 0;
-}
-
-// -----------------------------------------------------------------------------
-
-sal_Int32 TableLayouter::getRowStart( sal_Int32 nRow ) const
-{
- if( isValidRow(nRow) )
- return maRows[nRow].mnPos;
- else
- return 0;
-}
-
-// -----------------------------------------------------------------------------
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index e951590..98b3157 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -98,9 +98,6 @@ public:
sal_Int32 getMinimumColumnWidth( sal_Int32 nColumn );
- sal_Int32 getColumnStart( sal_Int32 nColumn ) const;
- sal_Int32 getRowStart( sal_Int32 nRow ) const;
-
/** checks if the given edge is visible.
Edges between merged cells are not visible.
*/
diff --git a/unusedcode.easy b/unusedcode.easy
index 9f6f2f0..9d44e00 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1653,9 +1653,6 @@ psp::PrinterGfx::GetGlyphOutline(unsigned short, unsigned short**, Point**, unsi
psp::PrinterGfx::GetResolution(int&, int&) const
psp::PrinterGfx::PSRMoveTo(int, int)
psp::PrinterGfx::SetFallbackFont(int)
-psp::PrinterJob::GetDocumentHeader()
-psp::PrinterJob::GetDocumentTrailer()
-psp::PrinterJob::GetErrorCode()
pyuno::Runtime::finalize()
pyuno::importToGlobal(_object*, _object*, _object*)
rptui::OFieldExpressionControl::LinkStubAsynchActivate(void*, void*)
@@ -1730,10 +1727,6 @@ sdr::table::SdrTableObj::getRowCount() const
sdr::table::SdrTableObjImpl::GetCellItem(sdr::table::CellPos const&, unsigned short) const
sdr::table::SvxTableController::DeleteTable()
sdr::table::SvxTableController::getSelectionCursor()
-sdr::table::TableLayouter::getColumnStart(int) const
-sdr::table::TableLayouter::getRowStart(int) const
-sdr::table::TableLayouter::setColumnWidth(int, int)
-sdr::table::TableLayouter::setRowHeight(int, int)
sfx2::TaskPaneWrapper::GetChildWindowId()
slideshow::internal::DrawShapeSubsetting::reset(slideshow::internal::DocTreeNode const&, boost::shared_ptr<GDIMetaFile> const&)
std::__cxx1998::map<rtl::OUString, OutputStorageWrapper_Impl*, OUStringLess, std::allocator<std::pair<rtl::OUString const, OutputStorageWrapper_Impl*> > >::~map()
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 423424d..35633cd 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -179,18 +179,6 @@ PrinterJob::IsColorPrinter () const
}
osl::File*
-PrinterJob::GetDocumentHeader ()
-{
- return mpJobHeader;
-}
-
-osl::File*
-PrinterJob::GetDocumentTrailer ()
-{
- return mpJobTrailer;
-}
-
-osl::File*
PrinterJob::GetCurrentPageHeader ()
{
return maHeaderList.back();
@@ -708,13 +696,6 @@ PrinterJob::EndPage ()
return sal_True;
}
-sal_uInt32
-PrinterJob::GetErrorCode ()
-{
- /* TODO */
- return 0;
-}
-
struct less_ppd_key : public ::std::binary_function<double, double, bool>
{
bool operator()(const PPDKey* left, const PPDKey* right)
diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx
index 62a1c07..aa05394 100644
--- a/vcl/inc/generic/printerjob.hxx
+++ b/vcl/inc/generic/printerjob.hxx
@@ -101,8 +101,6 @@ public: // for usage in PrinterGfx
sal_uInt16 GetPostscriptLevel (const JobData *pJobData = NULL) const;
sal_Bool IsColorPrinter () const;
- osl::File* GetDocumentHeader ();
- osl::File* GetDocumentTrailer ();
osl::File* GetCurrentPageHeader ();
osl::File* GetCurrentPageBody ();
@@ -140,8 +138,6 @@ public:
sal_Bool StartPage (const JobData& rJobSetup);
sal_Bool EndPage ();
-
- sal_uInt32 GetErrorCode ();
};
} /* namespace psp */
commit 89898395899f4b2935689a5666d0734ba3d63511
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Jan 21 01:29:51 2012 +0100
Remove unused Get/SetXmlNamespace
diff --git a/oox/inc/oox/export/chartexport.hxx b/oox/inc/oox/export/chartexport.hxx
index 6d03779..5bca83f 100644
--- a/oox/inc/oox/export/chartexport.hxx
+++ b/oox/inc/oox/export/chartexport.hxx
@@ -196,8 +196,6 @@ public:
ChartExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX );
virtual ~ChartExport() {}
- sal_Int32 GetXmlNamespace() const;
- ChartExport& SetXmlNamespace( sal_Int32 nXmlNamespace );
sal_Int32 GetChartID( );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel(){ return mxChartModel; }
diff --git a/oox/inc/oox/export/shapes.hxx b/oox/inc/oox/export/shapes.hxx
index a9459c8..b043c3f 100644
--- a/oox/inc/oox/export/shapes.hxx
+++ b/oox/inc/oox/export/shapes.hxx
@@ -85,9 +85,6 @@ public:
ShapeExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, ShapeHashMap* pShapeMap = NULL, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX );
virtual ~ShapeExport() {}
- sal_Int32 GetXmlNamespace() const;
- ShapeExport& SetXmlNamespace( sal_Int32 nXmlNamespace );
-
static sal_Bool NonEmptyText( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xIface );
virtual ShapeExport&
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index d6acf3f..4bdb9df 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -564,17 +564,6 @@ ChartExport::ChartExport( sal_Int32 nXmlNamespace, FSHelperPtr pFS, Reference< f
{
}
-sal_Int32 ChartExport::GetXmlNamespace() const
-{
- return mnXmlNamespace;
-}
-
-ChartExport& ChartExport::SetXmlNamespace( sal_Int32 nXmlNamespace )
-{
- mnXmlNamespace = nXmlNamespace;
- return *this;
-}
-
sal_Int32 ChartExport::GetChartID( )
{
sal_Int32 nID = GetFB()->GetUniqueId();
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 5b1b810..6404184 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -577,17 +577,6 @@ ShapeExport::ShapeExport( sal_Int32 nXmlNamespace, FSHelperPtr pFS, ShapeHashMap
{
}
-sal_Int32 ShapeExport::GetXmlNamespace() const
-{
- return mnXmlNamespace;
-}
-
-ShapeExport& ShapeExport::SetXmlNamespace( sal_Int32 nXmlNamespace )
-{
- mnXmlNamespace = nXmlNamespace;
- return *this;
-}
-
awt::Size ShapeExport::MapSize( const awt::Size& rSize ) const
{
Size aRetSize( OutputDevice::LogicToLogic( Size( rSize.Width, rSize.Height ), maMapModeSrc, maMapModeDest ) );
diff --git a/unusedcode.easy b/unusedcode.easy
index f3f518b..9f6f2f0 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1536,8 +1536,6 @@ oox::core::PowerPointExport::WriteAnimationNodeCommonPropsEnd(boost::shared_ptr<
oox::core::PowerPointExport::WriteTextStyles(boost::shared_ptr<sax_fastparser::FastSerializerHelper>)
oox::core::Relations::getExternalTargetFromFirstType(rtl::OUString const&) const
oox::core::XmlFilterBase::getChartConverter()
-oox::drawingml::ChartExport::GetXmlNamespace() const
-oox::drawingml::ChartExport::SetXmlNamespace(int)
oox::drawingml::ChartExport::exportDataSeq(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&, int)
oox::drawingml::ChartExport::exportXAxis(oox::drawingml::AxisIdPair)
oox::drawingml::ChartExport::exportYAxis(oox::drawingml::AxisIdPair)
@@ -1550,8 +1548,6 @@ oox::drawingml::GetPoint2D(com::sun::star::uno::Reference<com::sun::star::xml::s
oox::drawingml::GetTextMargin(rtl::OUString const&)
oox::drawingml::GetTextVerticalAdjust(int)
oox::drawingml::GraphicProperties::assignUsed(oox::drawingml::GraphicProperties const&)
-oox::drawingml::ShapeExport::GetXmlNamespace() const
-oox::drawingml::ShapeExport::SetXmlNamespace(int)
oox::drawingml::TextBodyProperties::pushToPropMap(oox::PropertyMap&) const
oox::drawingml::TextListStyle::dump() const
oox::drawingml::Theme::getEffectStyle(int) const
commit 08d47e3491f0d55467ebbe723020172b768b37b4
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Jan 21 01:27:23 2012 +0100
correct copyright header
diff --git a/oox/inc/oox/export/chartexport.hxx b/oox/inc/oox/export/chartexport.hxx
index 4dddbd6..6d03779 100644
--- a/oox/inc/oox/export/chartexport.hxx
+++ b/oox/inc/oox/export/chartexport.hxx
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile$
- * $Revision$
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 9996d1e..d6acf3f 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3,13 +3,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile$
- * $Revision$
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
More information about the Libreoffice-commits
mailing list