diff options
| -rw-r--r-- | sc/qa/unit/data/ods/tdf88827_borderDoubleThin.ods | bin | 0 -> 9410 bytes | |||
| -rw-r--r-- | sc/qa/unit/subsequent_export-test.cxx | 8 | ||||
| -rw-r--r-- | sc/qa/unit/subsequent_filters-test.cxx | 21 | ||||
| -rw-r--r-- | svtools/source/control/ctrlbox.cxx | 2 |
4 files changed, 26 insertions, 5 deletions
diff --git a/sc/qa/unit/data/ods/tdf88827_borderDoubleThin.ods b/sc/qa/unit/data/ods/tdf88827_borderDoubleThin.ods Binary files differnew file mode 100644 index 000000000000..b20e0aaa7bbf --- /dev/null +++ b/sc/qa/unit/data/ods/tdf88827_borderDoubleThin.ods diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 1a99a645c4e0..dbab3ccca3d2 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -1949,8 +1949,8 @@ void ScExportTest::testBordersExchangeXLSX() /* 0,05 */ {{Solid , Solid , 1, 1}, {Dotted , Dotted , 15, 15}, {Dotted , Dotted , 15, 15}, {FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {None , None , 0, 0}}, /* 0,25 */ {{Solid , Solid , 1, 1}, {Dotted , Dotted , 15, 15}, {Dotted , Dotted , 15, 15}, {FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {None , None , 0, 0}}, /* 0,50 */ {{Solid , Solid , 1, 1}, {Dotted , Dotted , 15, 15}, {Dotted , Dotted , 15, 15}, {FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {None , None , 0, 0}}, -/* 0,75 */ {{Solid , Solid , 15, 15}, {Dotted , Dotted , 15, 15}, {FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {DashDot , DashDot , 15, 15}, {DashDoDo, DashDoDo, 15, 15}, {None , None , 0, 0}}, -/* 1,00 */ {{Solid , Solid , 15, 15}, {Dotted , Dotted , 15, 15}, {FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {DashDot , DashDot , 15, 15}, {DashDoDo, DashDoDo, 15, 15}, {None , None , 0, 0}}, +/* 0,75 */ {{Solid , Solid , 15, 15}, {Dotted , Dotted , 15, 15}, {FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {DashDot , DashDot , 15, 15}, {DashDoDo, DashDoDo, 15, 15}, {DoubThin, DoubThin, 35, 35}}, +/* 1,00 */ {{Solid , Solid , 15, 15}, {Dotted , Dotted , 15, 15}, {FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {DashDot , DashDot , 15, 15}, {DashDoDo, DashDoDo, 15, 15}, {DoubThin, DoubThin, 35, 35}}, /* 1,25 */ {{Solid , Solid , 15, 15}, {Dotted , Dotted , 15, 15}, {FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {DashDot , DashDot , 15, 15}, {DashDoDo, DashDoDo, 15, 15}, {DoubThin, DoubThin, 35, 35}}, /* 1,50 */ {{Solid , Solid , 15, 15}, {Dotted , Dotted , 15, 15}, {FineDash, FineDash, 15, 15}, {FineDash, FineDash, 15, 15}, {DashDot , DashDot , 15, 15}, {DashDoDo, DashDoDo, 15, 15}, {DoubThin, DoubThin, 35, 35}}, @@ -1982,8 +1982,8 @@ void ScExportTest::testBordersExchangeXLSX() const editeng::SvxBorderLine* pLineTop = nullptr; const editeng::SvxBorderLine* pLineBottom = nullptr; rDoc.GetBorderLines(nCol + 2, (nRow * 2) + 8, 0, nullptr, &pLineTop, nullptr, &pLineBottom); - if((nCol < 5) && (nRow == 6)) - { // in this range no lines + if((nCol < 3) && (nRow == 6)) + { // in this range no lines since minimum size to create a double is 0.5 CPPUNIT_ASSERT(!pLineTop); CPPUNIT_ASSERT(!pLineBottom); continue; diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 78724f8e8ac6..e2858a700b28 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -136,6 +136,7 @@ public: // void testFormatsXLSX(); void testMatrixODS(); void testMatrixXLS(); + void testDoubleThinBorder(); void testBorderODS(); void testBordersOoo33(); void testBugFixesODS(); @@ -262,6 +263,7 @@ public: // CPPUNIT_TEST(testFormatsXLSX); TODO: Fix this CPPUNIT_TEST(testMatrixODS); CPPUNIT_TEST(testMatrixXLS); + CPPUNIT_TEST(testDoubleThinBorder); CPPUNIT_TEST(testBorderODS); CPPUNIT_TEST(testBordersOoo33); CPPUNIT_TEST(testBugFixesODS); @@ -915,6 +917,25 @@ void ScFiltersTest::testMatrixXLS() xDocSh->DoClose(); } +void ScFiltersTest::testDoubleThinBorder() +{ +// double-thin borders created with size less than 1.15 where invisible (and subsequently lost) on round-trips. + ScDocShellRef xDocSh = loadDoc("tdf88827_borderDoubleThin.", FORMAT_ODS); + + CPPUNIT_ASSERT_MESSAGE("Failed to load tdf88827_borderDoubleThin.*", xDocSh.Is()); + ScDocument& rDoc = xDocSh->GetDocument(); + + const editeng::SvxBorderLine* pLeft = nullptr; + const editeng::SvxBorderLine* pTop = nullptr; + const editeng::SvxBorderLine* pRight = nullptr; + const editeng::SvxBorderLine* pBottom = nullptr; + + rDoc.GetBorderLines( 2, 2, 0, &pLeft, &pTop, &pRight, &pBottom ); + CPPUNIT_ASSERT(pTop); + CPPUNIT_ASSERT(pRight); + CPPUNIT_ASSERT_EQUAL( table::BorderLineStyle::DOUBLE_THIN, pRight->GetBorderLineStyle() ); +} + void ScFiltersTest::testBorderODS() { ScDocShellRef xDocSh = loadDoc("border.", FORMAT_ODS); diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index ce7234810d16..d16372c9f687 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -170,7 +170,7 @@ long BorderWidthImpl::GuessWidth( long nLine1, long nLine2, long nGap ) bool bGapChange = bool( m_nFlags & BorderWidthImplFlags::CHANGE_DIST ); double nWidthGap = lcl_getGuessedWidth( nGap, m_nRateGap, bGapChange ); - if ( bGapChange && nGap > MINGAPWIDTH ) + if ( bGapChange && nGap >= MINGAPWIDTH ) aToCompare.push_back( nWidthGap ); else if ( !bGapChange && nWidthGap < 0 ) bInvalid = true; |