Kaydet (Commit) 94a32175 authored tarafından Cédric Bosdonnat's avatar Cédric Bosdonnat

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

üst 6182e90a
...@@ -620,7 +620,7 @@ void SdDrawDocument::CreateDefaultCellStyles() ...@@ -620,7 +620,7 @@ void SdDrawDocument::CreateDefaultCellStyles()
rISet.Put( SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_LEFT) ); rISet.Put( SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_LEFT) );
Color aWhite( COL_WHITE ); Color aWhite( COL_WHITE );
SvxBorderLine aBorderLine( &aWhite, 1, SOLID ); ::editeng::SvxBorderLine aBorderLine( &aWhite, 1, ::editeng::SOLID );
SvxBoxItem aBoxItem( SDRATTR_TABLE_BORDER ); SvxBoxItem aBoxItem( SDRATTR_TABLE_BORDER );
aBoxItem.SetLine( &aBorderLine, BOX_LINE_TOP ); aBoxItem.SetLine( &aBorderLine, BOX_LINE_TOP );
......
...@@ -812,7 +812,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle, ...@@ -812,7 +812,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle,
// draw top border // draw top border
for( sal_uInt16 nLine = 0; nLine < 4; ++nLine ) 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)) ) if( !pBorderLine || ((pBorderLine->GetOutWidth() == 0) && (pBorderLine->GetInWidth()==0)) )
continue; continue;
...@@ -825,7 +825,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle, ...@@ -825,7 +825,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle,
if( xBorderInfo.get() ) if( xBorderInfo.get() )
{ {
const sal_uInt16 nOtherLine = nLine ^ 1; 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) ) if( pBorderLine2 && pBorderLine2->HasPriority(*pBorderLine) )
continue; // other border line wins continue; // other border line wins
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment