diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-01-20 15:22:01 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-19 17:57:18 +0100 |
| commit | 52b908ce3db5f9b1556cdb4cbdc3b92ef2f89583 (patch) | |
| tree | e6ab4a78fb806998e56021b1c5331c9ada39d8fb /editeng | |
| parent | d6b62a3010360235886093d6cabe47c4ee82a2d7 (diff) | |
Fixed lines width guessing: gap are no smaller than 1pt
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/qa/items/borderline_test.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/items/frmitems.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editeng/qa/items/borderline_test.cxx b/editeng/qa/items/borderline_test.cxx index e7ea1a1dee..870a6a7401 100644 --- a/editeng/qa/items/borderline_test.cxx +++ b/editeng/qa/items/borderline_test.cxx @@ -80,7 +80,7 @@ void BorderLineTest::testGuessWidthNoMatch() { SvxBorderLine line; line.GuessLinesWidths( DOUBLE, - 1, 2, 3 ); + TEST_WIDTH + 1, TEST_WIDTH + 2, TEST_WIDTH + 3 ); CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetStyle() ); CPPUNIT_ASSERT_EQUAL( long( 0 ), line.GetWidth() ); } diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 0a8b1291e0..886ab164ec 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1736,7 +1736,7 @@ lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_B sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.LineDistance ) : rLine.LineDistance )); } - sal_Bool bRet = rLine.InnerLineWidth > 0 || rLine.OuterLineWidth > 0; + sal_Bool bRet = !rSvxLine.isEmpty(); return bRet; } @@ -1799,11 +1799,11 @@ SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, Svx } rSvxLine.SetStyle( nStyle ); - sal_Bool bGuessWidth = true; + sal_Bool bGuessWidth = sal_True; if ( rLine->LineWidth ) { rSvxLine.SetWidth( bConvert? MM100_TO_TWIP_UNSIGNED( rLine->LineWidth ) : rLine->LineWidth ); - bGuessWidth = false; + bGuessWidth = sal_False; } return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, bGuessWidth); |