summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2011-01-03 14:11:19 +0100
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-19 17:57:16 +0100
commit723943b939a95bbd8f8bf30cf3fac7c214703762 (patch)
tree4ad5df5d61ef038b00c92dc575adc54ead7094be /editeng
parent99b5f5aec1d80f57d4ab23832c94516d793a783a (diff)
More build fixes in editeng
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/items/frmitems.cxx8
-rwxr-xr-xediteng/source/items/svxitems.src2
2 files changed, 6 insertions, 4 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index dc9efb432902..05260db234d8 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1727,7 +1727,7 @@ sal_Bool
lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
{
rSvxLine.SetColor( Color(rLine.Color));
- rSvxLine.SetLinesWidth( rSvxLine.GetStyle(),
+ rSvxLine.SetLinesWidths( rSvxLine.GetStyle(),
sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.InnerLineWidth) : rLine.InnerLineWidth ),
sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.OuterLineWidth) : rLine.OuterLineWidth ),
sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.LineDistance ) : rLine.LineDistance ));
@@ -2223,7 +2223,8 @@ SfxPoolItem* SvxBoxItem::Create( SvStream& rStrm, sal_uInt16 nIVersion ) const
sal_uInt16 nOutline, nInline, _nDistance;
Color aColor;
rStrm >> aColor >> nOutline >> nInline >> _nDistance;
- SvxBorderLine aBorder( &aColor, nOutline, nInline, _nDistance );
+ SvxBorderLine aBorder( &aColor );
+ aBorder.SetLinesWidths( SOLID, nInline, nOutline, _nDistance );
pAttr->SetLine( &aBorder, aLineMap[cLine] );
}
@@ -2596,7 +2597,8 @@ SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const
short nOutline, nInline, nDistance;
Color aColor;
rStrm >> aColor >> nOutline >> nInline >> nDistance;
- SvxBorderLine aBorder( &aColor, nOutline, nInline, nDistance );
+ SvxBorderLine aBorder( &aColor );
+ aBorder.SetLinesWidths( SOLID, nInline, nOutline, nDistance );
switch( cLine )
{
diff --git a/editeng/source/items/svxitems.src b/editeng/source/items/svxitems.src
index 5367db6b068b..a661aab97ac0 100755
--- a/editeng/source/items/svxitems.src
+++ b/editeng/source/items/svxitems.src
@@ -553,7 +553,7 @@ String RID_DASHED
{
Text [ en-US ] = "Single, dashed" ;
};
-String RID_SINGLE_DOUBLE
+String RID_DOUBLE
{
Text [ en-US ] = "Double" ;
};