[Libreoffice-commits] .: sw/source

[Caolán McNamara]

 sw/source/core/layout/paintfrm.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 26d0442c88f059df06cd4c002bb74644ff2351d4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 1 11:10:33 2011 +0100

    disambiguate for MacOsX build ?

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 3425892..2f64c8c 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3358,8 +3358,8 @@ void SwHeadFootFrm::Paint( const SwRect& rRect, SwPrintData const*const pPrintDa
         primitive2d::PolyPolygonStrokePrimitive2D * pLine =
                 new primitive2d::PolyPolygonStrokePrimitive2D (
                     basegfx::B2DPolyPolygon( aLinePolygon ),
-                    attribute::LineAttribute( aLineColor, 20.0 ),
-                    attribute::StrokeAttribute( aStrokePattern ) );
+                    drawinglayer::attribute::LineAttribute( aLineColor, 20.0 ),
+                    drawinglayer::attribute::StrokeAttribute( aStrokePattern ) );
 
         aSeq[1] = primitive2d::Primitive2DReference( pLine );
 
@@ -3370,7 +3370,7 @@ void SwHeadFootFrm::Paint( const SwRect& rRect, SwPrintData const*const pPrintDa
         Font aFont = pOut->GetSettings().GetStyleSettings().GetAppFont();
         aFont.SetHeight( 8 * 20 ); // 8pt to twips
 
-        attribute::FontAttribute aFontAttr = primitive2d::getFontAttributeFromVclFont(
+        drawinglayer::attribute::FontAttribute aFontAttr = primitive2d::getFontAttributeFromVclFont(
                 aFontSize, aFont, false, false );
 
         FontMetric aFontMetric = pOut->GetFontMetric( aFont );