summaryrefslogtreecommitdiff
path: root/sw/source/ui/shells/tabsh.cxx
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2010-12-24 16:24:20 +0100
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-19 15:31:31 +0100
commit6936cd24206e66cffb789a11fc20090bb03b3058 (patch)
treefee506bcab04d015c87d2e0a872cca70e9edfc32 /sw/source/ui/shells/tabsh.cxx
parentcd8d9afd92f3b781b5718c15a7bf158d7fa5589a (diff)
Misc sw build breakers fixes after the borders width changes
Diffstat (limited to 'sw/source/ui/shells/tabsh.cxx')
-rw-r--r--sw/source/ui/shells/tabsh.cxx15
1 files changed, 5 insertions, 10 deletions
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index af6a2a996d8a..73db32260f91 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -462,15 +462,10 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
static void lcl_TabGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLine& rBorderLine)
{
- if(pBorderLine->GetInWidth() > rBorderLine.GetInWidth())
- rBorderLine.SetInWidth(pBorderLine->GetInWidth());
-
- if(pBorderLine->GetOutWidth() > rBorderLine.GetOutWidth())
- rBorderLine.SetOutWidth(pBorderLine->GetOutWidth());
-
- if(pBorderLine->GetDistance() > rBorderLine.GetDistance())
- rBorderLine.SetDistance(pBorderLine->GetDistance());
+ if(pBorderLine->GetWidth() > rBorderLine.GetWidth())
+ rBorderLine.SetWidth(pBorderLine->GetWidth());
+ rBorderLine.SetStyle(pBorderLine->GetStyle());
rBorderLine.SetColor(pBorderLine->GetColor());
}
@@ -548,8 +543,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
if(aBorderLine.GetOutWidth() == 0)
{
- aBorderLine.SetInWidth(0);
- aBorderLine.SetOutWidth(DEF_LINE_WIDTH_0);
+ aBorderLine.SetStyle( SOLID );
+ aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
}
sal_Bool bLine = sal_False;