sw/source/ui/docvw/HeaderFooterWin.cxx | 19 +++++++++---------- sw/source/ui/docvw/PageBreakWin.cxx | 17 +++++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-)
New commits: commit e612860d9ce7e632b8ec6d8e90bc2bdee6806c97 Author: Norbert Thiebaud <[email protected]> Date: Wed Oct 31 14:39:23 2012 -0500 fix build issue due to namespace conflcit between drawinglayer and vcl Change-Id: I3b2ef864e701fffc30bee91e4e455d4639bc893f diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index 6b96627..82c6638 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -74,7 +74,6 @@ using namespace basegfx; using namespace basegfx::tools; using namespace drawinglayer::attribute; -using namespace drawinglayer::primitive2d; namespace { @@ -265,7 +264,7 @@ bool SwHeaderFooterWin::Contains( const Point &rDocPt ) const void SwHeaderFooterWin::Paint( const Rectangle& ) { const Rectangle aRect( Rectangle( Point( 0, 0 ), PixelToLogic( GetSizePixel() ) ) ); - Primitive2DSequence aSeq( 3 ); + drawinglayer::primitive2d::Primitive2DSequence aSeq( 3 ); B2DPolygon aPolygon = lcl_GetPolygon( aRect, m_bIsHeader ); @@ -282,7 +281,7 @@ void SwHeaderFooterWin::Paint( const Rectangle& ) aFillColor = rSettings.GetDialogColor( ).getBColor(); aLineColor = rSettings.GetDialogTextColor( ).getBColor(); - aSeq[0] = Primitive2DReference( new PolyPolygonColorPrimitive2D( + aSeq[0] = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D( B2DPolyPolygon( aPolygon ), aFillColor ) ); } else @@ -293,17 +292,17 @@ void SwHeaderFooterWin::Paint( const Rectangle& ) nAngle = 0; FillGradientAttribute aFillAttrs( GRADIENTSTYLE_LINEAR, 0.0, 0.0, 0.0, nAngle, aLighterColor, aFillColor, 10 ); - aSeq[0] = Primitive2DReference( new FillGradientPrimitive2D( + aSeq[0] = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::FillGradientPrimitive2D( aGradientRect, aFillAttrs ) ); } // Create the border lines primitive - aSeq[1] = Primitive2DReference( new PolygonHairlinePrimitive2D( + aSeq[1] = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::PolygonHairlinePrimitive2D( aPolygon, aLineColor ) ); // Create the text primitive B2DVector aFontSize; - FontAttribute aFontAttr = getFontAttributeFromVclFont( + FontAttribute aFontAttr = drawinglayer::primitive2d::getFontAttributeFromVclFont( aFontSize, GetFont(), false, false ); Rectangle aTextRect; @@ -317,7 +316,7 @@ void SwHeaderFooterWin::Paint( const Rectangle& ) aFontSize.getX(), aFontSize.getY(), double( aTextPos.X() ), double( aTextPos.Y() ) ) ); - aSeq[2] = Primitive2DReference( new TextSimplePortionPrimitive2D( + aSeq[2] = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::TextSimplePortionPrimitive2D( aTextMatrix, String( m_sLabel ), 0, m_sLabel.getLength(), std::vector< double >( ), @@ -371,7 +370,7 @@ void SwHeaderFooterWin::Paint( const Rectangle& ) aSignColor = Color( COL_WHITE ).getBColor( ); aSeq.realloc( aSeq.getLength() + 1 ); - aSeq[ aSeq.getLength() - 1 ] = Primitive2DReference( new PolyPolygonColorPrimitive2D( + aSeq[ aSeq.getLength() - 1 ] = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D( B2DPolyPolygon( aSign ), aSignColor ) ); // Create the processor and process the primitives @@ -381,9 +380,9 @@ void SwHeaderFooterWin::Paint( const Rectangle& ) *this, aNewViewInfos ); // TODO Ghost it all if needed - Primitive2DSequence aGhostedSeq( 1 ); + drawinglayer::primitive2d::Primitive2DSequence aGhostedSeq( 1 ); double nFadeRate = double( m_nFadeRate ) / 100.0; - aGhostedSeq[0] = Primitive2DReference( new ModifiedColorPrimitive2D( + aGhostedSeq[0] = drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::ModifiedColorPrimitive2D( aSeq, BColorModifier( Color( COL_WHITE ).getBColor(), 1.0 - nFadeRate, BCOLORMODIFYMODE_INTERPOLATE ) ) ); pProcessor->process( aGhostedSeq ); diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx index 56e42b4..f945467 100644 --- a/sw/source/ui/docvw/PageBreakWin.cxx +++ b/sw/source/ui/docvw/PageBreakWin.cxx @@ -25,6 +25,7 @@ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable * instead of those above. */ + #include <globals.hrc> #include <popup.hrc> #include <utlui.hrc> @@ -53,18 +54,18 @@ #include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> +#include <drawinglayer/processor2d/processorfromoutputdevice.hxx> #include <editeng/brkitem.hxx> #include <sfx2/dispatch.hxx> -#include <drawinglayer/processor2d/processorfromoutputdevice.hxx> #include <vcl/svapp.hxx> + #define BUTTON_WIDTH 30 #define BUTTON_HEIGHT 19 #define ARROW_WIDTH 9 using namespace basegfx; using namespace basegfx::tools; -using namespace drawinglayer::primitive2d; namespace { @@ -163,15 +164,15 @@ void SwPageBreakWin::Paint( const Rectangle& ) bool bRtl = Application::GetSettings().GetLayoutRTL(); - Primitive2DSequence aSeq( 3 ); + drawinglayer::primitive2d::Primitive2DSequence aSeq( 3 ); B2DRectangle aBRect( double( aRect.Left() ), double( aRect.Top( ) ), double( aRect.Right() ), double( aRect.Bottom( ) ) ); B2DPolygon aPolygon = createPolygonFromRect( aBRect, 3.0 / BUTTON_WIDTH, 3.0 / BUTTON_HEIGHT ); // Create the polygon primitives - aSeq[0] = Primitive2DReference( new PolyPolygonColorPrimitive2D( + aSeq[0] = Primitive2DReference( new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D( B2DPolyPolygon( aPolygon ), aOtherColor ) ); - aSeq[1] = Primitive2DReference( new PolygonHairlinePrimitive2D( + aSeq[1] = Primitive2DReference( new drawinglayer::primitive2d::PolygonHairlinePrimitive2D( aPolygon, aColor ) ); // Create the primitive for the image @@ -179,7 +180,7 @@ void SwPageBreakWin::Paint( const Rectangle& ) double nImgOfstX = 3.0; if ( bRtl ) nImgOfstX = aRect.Right() - aImg.GetSizePixel().Width() - 3.0; - aSeq[2] = Primitive2DReference( new DiscreteBitmapPrimitive2D( + aSeq[2] = Primitive2DReference( new drawinglayer::primitive2d::DiscreteBitmapPrimitive2D( aImg.GetBitmapEx(), B2DPoint( nImgOfstX, 1.0 ) ) ); double nTop = double( aRect.getHeight() ) / 2.0; @@ -200,12 +201,12 @@ void SwPageBreakWin::Paint( const Rectangle& ) aTriangleColor = Color( COL_WHITE ).getBColor( ); aSeq.realloc( aSeq.getLength() + 1 ); - aSeq[ aSeq.getLength() - 1 ] = Primitive2DReference( new PolyPolygonColorPrimitive2D( + aSeq[ aSeq.getLength() - 1 ] = Primitive2DReference( new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D( B2DPolyPolygon( aTriangle ), aTriangleColor ) ); Primitive2DSequence aGhostedSeq( 1 ); double nFadeRate = double( m_nFadeRate ) / 100.0; - aGhostedSeq[0] = Primitive2DReference( new ModifiedColorPrimitive2D( + aGhostedSeq[0] = Primitive2DReference( new drawinglayer::primitive2d::ModifiedColorPrimitive2D( aSeq, BColorModifier( Color( COL_WHITE ).getBColor(), 1.0 - nFadeRate, BCOLORMODIFYMODE_INTERPOLATE ) ) ); // Create the processor and process the primitives _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
