include/vcl/outdev.hxx | 8 ++++---- vcl/source/gdi/outdev.cxx | 30 +++++++++++++++--------------- 2 files changed, 19 insertions(+), 19 deletions(-)
New commits: commit 4a1bb12034fc76b2d26291c373da7309bc26f9bc Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Mon Mar 10 19:05:26 2014 +1100 Stick to function naming conventions in OutputDevice Function name changes for consistency in OutputDevice: * impPaintLineGeometryWithEvtlExpand -> ImplPaintLineGeometryWithEvtlExpand * ImpDrawPolyPolygonWithB2DPolyPolygon -> ImplDrawPolyPolygonWithB2DPolyPolygon * ImpTryDrawPolyLineDirect -> ImplTryDrawPolyLineDirect * ImpDrawPolyLineWithLineInfo -> ImplDrawPolyLineWithLineInfo Change-Id: Iae1ce07036856902259cef0a05afb57fd657325e Reviewed-on: https://gerrit.libreoffice.org/8509 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 6ee194b..9188568 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -638,11 +638,11 @@ public: // #i101491# // Helper which holds the old line geometry creation and is extended to use AA when // switched on. Advantage is that line geometry is only temporarily used for paint - SAL_DLLPRIVATE void ImpDrawPolyLineWithLineInfo(const Polygon& rPoly, const LineInfo& rLineInfo); + SAL_DLLPRIVATE void ImplDrawPolyLineWithLineInfo(const Polygon& rPoly, const LineInfo& rLineInfo); // #i101491# // Helper who tries to use SalGDI's DrawPolyLine direct and returns it's bool. Contains no AA check. - SAL_DLLPRIVATE bool ImpTryDrawPolyLineDirect( + SAL_DLLPRIVATE bool ImplTryDrawPolyLineDirect( const basegfx::B2DPolygon& rB2DPolygon, double fLineWidth = 0.0, double fTransparency = 0.0, @@ -650,7 +650,7 @@ public: css::drawing::LineCap eLineCap = css::drawing::LineCap_BUTT); // Helper for line geometry paint with support for graphic expansion (pattern and fat_to_area) - void impPaintLineGeometryWithEvtlExpand(const LineInfo& rInfo, basegfx::B2DPolyPolygon aLinePolyPolygon); + void ImplPaintLineGeometryWithEvtlExpand(const LineInfo& rInfo, basegfx::B2DPolyPolygon aLinePolyPolygon); ///@} /** @name Polygon functions @@ -662,7 +662,7 @@ public: // #i101491# // Helper who implements the DrawPolyPolygon functionality for basegfx::B2DPolyPolygon // without MetaFile processing - SAL_DLLPRIVATE void ImpDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPolygon& rB2DPolyPoly); + SAL_DLLPRIVATE void ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPolygon& rB2DPolyPoly); ///@} diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx index 3d412a2..f721054 100644 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -1409,7 +1409,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt ) mpAlphaVDev->DrawLine( rStartPt, rEndPt ); } -void OutputDevice::impPaintLineGeometryWithEvtlExpand( +void OutputDevice::ImplPaintLineGeometryWithEvtlExpand( const LineInfo& rInfo, basegfx::B2DPolyPolygon aLinePolyPolygon) { @@ -1585,7 +1585,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt, aLinePolygon.append(basegfx::B2DPoint(aStartPt.X(), aStartPt.Y())); aLinePolygon.append(basegfx::B2DPoint(aEndPt.X(), aEndPt.Y())); - impPaintLineGeometryWithEvtlExpand(aInfo, basegfx::B2DPolyPolygon(aLinePolygon)); + ImplPaintLineGeometryWithEvtlExpand(aInfo, basegfx::B2DPolyPolygon(aLinePolygon)); } else { @@ -1663,7 +1663,7 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly ) && IsLineColor()); // use b2dpolygon drawing if possible - if(bTryAA && ImpTryDrawPolyLineDirect(rPoly.getB2DPolygon())) + if(bTryAA && ImplTryDrawPolyLineDirect(rPoly.getB2DPolygon())) { basegfx::B2DPolygon aB2DPolyLine(rPoly.getB2DPolygon()); const ::basegfx::B2DHomMatrix aTransform = ImplGetDeviceTransformation(); @@ -1727,10 +1727,10 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly, const LineInfo& rLineInfo if ( mpMetaFile ) mpMetaFile->AddAction( new MetaPolyLineAction( rPoly, rLineInfo ) ); - ImpDrawPolyLineWithLineInfo(rPoly, rLineInfo); + ImplDrawPolyLineWithLineInfo(rPoly, rLineInfo); } -void OutputDevice::ImpDrawPolyLineWithLineInfo(const Polygon& rPoly, const LineInfo& rLineInfo) +void OutputDevice::ImplDrawPolyLineWithLineInfo(const Polygon& rPoly, const LineInfo& rLineInfo) { sal_uInt16 nPoints(rPoly.GetSize()); @@ -1773,7 +1773,7 @@ void OutputDevice::ImpDrawPolyLineWithLineInfo(const Polygon& rPoly, const LineI if(bDashUsed || bLineWidthUsed) { - impPaintLineGeometryWithEvtlExpand(aInfo, basegfx::B2DPolyPolygon(aPoly.getB2DPolygon())); + ImplPaintLineGeometryWithEvtlExpand(aInfo, basegfx::B2DPolyPolygon(aPoly.getB2DPolygon())); } else { @@ -2002,10 +2002,10 @@ void OutputDevice::DrawPolyPolygon( const basegfx::B2DPolyPolygon& rB2DPolyPoly mpMetaFile->AddAction( new MetaPolyPolygonAction( PolyPolygon( rB2DPolyPoly ) ) ); // call helper - ImpDrawPolyPolygonWithB2DPolyPolygon(rB2DPolyPoly); + ImplDrawPolyPolygonWithB2DPolyPolygon(rB2DPolyPoly); } -void OutputDevice::ImpDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPolygon& rB2DPolyPoly) +void OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPolygon& rB2DPolyPoly) { // Do not paint empty PolyPolygons if(!rB2DPolyPoly.count() || !IsDeviceOutputNecessary()) @@ -2077,7 +2077,7 @@ void OutputDevice::ImpDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyPo ImplDrawPolyPolygon( aPixelPolyPolygon.Count(), aPixelPolyPolygon ); } -bool OutputDevice::ImpTryDrawPolyLineDirect( +bool OutputDevice::ImplTryDrawPolyLineDirect( const basegfx::B2DPolygon& rB2DPolygon, double fLineWidth, double fTransparency, @@ -2149,7 +2149,7 @@ bool OutputDevice::TryDrawPolyLineDirect( if(bTryAA) { - if(ImpTryDrawPolyLineDirect(rB2DPolygon, fLineWidth, fTransparency, eLineJoin, eLineCap)) + if(ImplTryDrawPolyLineDirect(rB2DPolygon, fLineWidth, fTransparency, eLineJoin, eLineCap)) { // worked, add metafile action (if recorded) and return true if( mpMetaFile ) @@ -2207,14 +2207,14 @@ void OutputDevice::DrawPolyLine( && IsLineColor()); // use b2dpolygon drawing if possible - if(bTryAA && ImpTryDrawPolyLineDirect(rB2DPolygon, fLineWidth, 0.0, eLineJoin, eLineCap)) + if(bTryAA && ImplTryDrawPolyLineDirect(rB2DPolygon, fLineWidth, 0.0, eLineJoin, eLineCap)) { return; } // #i101491# // no output yet; fallback to geometry decomposition and use filled polygon paint - // when line is fat and not too complex. ImpDrawPolyPolygonWithB2DPolyPolygon + // when line is fat and not too complex. ImplDrawPolyPolygonWithB2DPolyPolygon // will do internal needed AA checks etc. if(fLineWidth >= 2.5 && rB2DPolygon.count() @@ -2238,7 +2238,7 @@ void OutputDevice::DrawPolyLine( // draw usig a loop; else the topology will paint a PolyPolygon for(sal_uInt32 a(0); a < aAreaPolyPolygon.count(); a++) { - ImpDrawPolyPolygonWithB2DPolyPolygon( + ImplDrawPolyPolygonWithB2DPolyPolygon( basegfx::B2DPolyPolygon(aAreaPolyPolygon.getB2DPolygon(a))); } @@ -2253,7 +2253,7 @@ void OutputDevice::DrawPolyLine( // to avoid optical gaps for(sal_uInt32 a(0); a < aAreaPolyPolygon.count(); a++) { - ImpTryDrawPolyLineDirect(aAreaPolyPolygon.getB2DPolygon(a)); + ImplTryDrawPolyLineDirect(aAreaPolyPolygon.getB2DPolygon(a)); } } } @@ -2264,7 +2264,7 @@ void OutputDevice::DrawPolyLine( LineInfo aLineInfo; if( fLineWidth != 0.0 ) aLineInfo.SetWidth( static_cast<long>(fLineWidth+0.5) ); - ImpDrawPolyLineWithLineInfo( aToolsPolygon, aLineInfo ); + ImplDrawPolyLineWithLineInfo( aToolsPolygon, aLineInfo ); } }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits