[Libreoffice-commits] .: sd/source

[Cédric Bosdonnat]

 sd/source/core/drawdoc4.cxx            |    2 +-
 sd/source/ui/table/TableDesignPane.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9c041a26f4448f57b8b54ce3edb89b4a0e73f6a5
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Fri Mar 25 15:51:47 2011 +0100

    Moved SvxBorder* into editeng namespace to avoid duplicate DOUBLE on windows

diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 279d9bc..9715630 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -620,7 +620,7 @@ void SdDrawDocument::CreateDefaultCellStyles()
     rISet.Put( SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_LEFT) );
 
     Color aWhite( COL_WHITE );
-    SvxBorderLine aBorderLine( &aWhite, 1, SOLID );
+    ::editeng::SvxBorderLine aBorderLine( &aWhite, 1, ::editeng::SOLID );
     
     SvxBoxItem aBoxItem( SDRATTR_TABLE_BORDER );
     aBoxItem.SetLine( &aBorderLine, BOX_LINE_TOP );
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 4f6b2df..08271e2 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -812,7 +812,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle,
                     // draw top border
                     for( sal_uInt16 nLine = 0; nLine < 4; ++nLine )
                     {
-                        const SvxBorderLine* pBorderLine = xCellInfo->maBorder.GetLine(nLine);
+                        const ::editeng::SvxBorderLine* pBorderLine = xCellInfo->maBorder.GetLine(nLine);
                         if( !pBorderLine || ((pBorderLine->GetOutWidth() == 0) && (pBorderLine->GetInWidth()==0)) )
                             continue;
 
@@ -825,7 +825,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle,
                             if( xBorderInfo.get() )
                             {
                                 const sal_uInt16 nOtherLine = nLine ^ 1;
-                                const SvxBorderLine* pBorderLine2 = xBorderInfo->maBorder.GetLine(nOtherLine^1);
+                                const ::editeng::SvxBorderLine* pBorderLine2 = xBorderInfo->maBorder.GetLine(nOtherLine^1);
                                 if( pBorderLine2 && pBorderLine2->HasPriority(*pBorderLine) )
                                     continue; // other border line wins
                             }