diff options
author | Ocke.Janssen@oracle.com <Ocke.Janssen@oracle.com> | 2011-12-06 01:28:00 +0100 |
---|---|---|
committer | Thorsten Behrens <tbehrens@suse.com> | 2011-12-06 09:39:08 +0100 |
commit | 9753031300bb9bd61bbba2f617900422cdbde1ff (patch) | |
tree | 3145fbd0b22e89a0ae9607e90ac5d58043784d33 /svx/source/svdraw | |
parent | 0851453849d36e5f58be24316d9bf910ee12faf8 (diff) |
impress210: #i105310# set tooltip for items and some refactoring
# HG changeset patch
# User Ocke.Janssen@oracle.com
# Date 1297164555 -3600
# Node ID 902597eed5414555107034f62583c4ccc2cdfd4b
# Parent 2f0f385e8b25938777bb9fed6a86a2ff43e0b7cd
impress210: #i105310# set tooltip for items and some refactoring
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r-- | svx/source/svdraw/svddrgmt.cxx | 6 | ||||
-rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdotextpathdecomposition.cxx | 8 | ||||
-rw-r--r-- | svx/source/svdraw/svdpntv.cxx | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index b3f5d5c12673..85e87411723b 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -246,7 +246,7 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPointGlueDrag::create { drawinglayer::primitive2d::Primitive2DSequence aRetval; - if(maPositions.size()) + if(!maPositions.empty()) { basegfx::B2DPolygon aPolygon; sal_uInt32 a(0); @@ -666,14 +666,14 @@ void SdrDragMethod::CancelSdrDrag() void SdrDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlayManager) { // create SdrDragEntries on demand - if(!maSdrDragEntries.size()) + if(maSdrDragEntries.empty()) { createSdrDragEntries(); } // if there are entries, derive OverlayObjects from the entries, including // modification from current interactive state - if(maSdrDragEntries.size()) + if(!maSdrDragEntries.empty()) { drawinglayer::primitive2d::Primitive2DSequence aResult; drawinglayer::primitive2d::Primitive2DSequence aResultTransparent; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 5e7c53ba8aeb..f8df28b792b8 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -2146,7 +2146,7 @@ void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat ) aRect1 = Rectangle( rStat.GetNow(), Size( nDefaultObjectSizeWidth, nDefaultObjectSizeHeight ) ); // subtracting the horizontal difference of the latest handle from shape position - if ( aInteractionHandles.size() ) + if ( !aInteractionHandles.empty() ) { sal_Int32 nHandlePos = aInteractionHandles[ aInteractionHandles.size() - 1 ].xInteraction->getPosition().X; aRect1.Move( aRect.Left() - nHandlePos, 0 ); diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 2956b03cc13e..5a11ca6fc1cd 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2311,7 +2311,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, sal_Bool bForceLin // #i102241# check for line results const std::vector< basegfx::B2DPolygon >& rHairlineVector = aExtractor.getExtractedHairlines(); - if(rHairlineVector.size()) + if(!rHairlineVector.empty()) { // for SdrObject creation, just copy all to a single Hairline-PolyPolygon for(sal_uInt32 a(0); a < rHairlineVector.size(); a++) @@ -2323,7 +2323,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, sal_Bool bForceLin // #i102241# check for fill rsults const std::vector< basegfx::B2DPolyPolygon >& rLineFillVector(aExtractor.getExtractedLineFills()); - if(rLineFillVector.size()) + if(!rLineFillVector.empty()) { // merge to a single PolyPolygon (OR) aMergedLineFillPolyPolygon = basegfx::tools::mergeToSinglePolyPolygon(rLineFillVector); diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index afc16c35a07d..558ee612981d 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -199,7 +199,7 @@ namespace mrOutliner.SetDrawPortionHdl(LINK(this, impTextBreakupHandler, decompositionPathTextPrimitive)); mrOutliner.StripPortions(); - if(maPathTextPortions.size()) + if(!maPathTextPortions.empty()) { // sort portions by paragraph, x and y ::std::sort(maPathTextPortions.begin(), maPathTextPortions.end()); @@ -626,7 +626,7 @@ namespace // get text outlines and their object transformation pTextCandidate->getTextOutlinesAndTransformation(aB2DPolyPolyVector, aPolygonTransform); - if(aB2DPolyPolyVector.size()) + if(!aB2DPolyPolyVector.empty()) { // create stroke primitives std::vector< drawinglayer::primitive2d::BasePrimitive2D* > aStrokePrimitives; @@ -711,7 +711,7 @@ void SdrTextObj::impDecomposePathTextPrimitive( impTextBreakupHandler aConverter(rOutliner); const ::std::vector< impPathTextPortion > rPathTextPortions = aConverter.decompositionPathTextPrimitive(); - if(rPathTextPortions.size()) + if(!rPathTextPortions.empty()) { // get FormText and polygon values const drawinglayer::attribute::SdrFormTextAttribute& rFormTextAttribute = rSdrPathTextPrimitive.getSdrFormTextAttribute(); @@ -752,7 +752,7 @@ void SdrTextObj::impDecomposePathTextPrimitive( } // handle data pair polygon/ParagraphTextPortions - if(aParagraphTextPortions.size()) + if(!aParagraphTextPortions.empty()) { aPolygonParagraphHandler.HandlePair(rPathPolyPolygon.getB2DPolygon(a), aParagraphTextPortions); } diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 1c9e6a01cfad..331354b50621 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -247,7 +247,7 @@ SdrPaintView::~SdrPaintView() #endif // delete existing SdrPaintWindows - while(maPaintWindows.size()) + while(!maPaintWindows.empty()) { delete maPaintWindows.back(); maPaintWindows.pop_back(); |