diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-09-05 22:01:41 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-09-06 23:53:43 +0200 |
| commit | 5b47818367290640421f835bdd038bc35c6b0781 (patch) | |
| tree | 62c41a82c50a3b41d2f576d80c66bec19323510c /sc/qa | |
| parent | Update shape fill preview on switch to this tab (diff) | |
| download | core-5b47818367290640421f835bdd038bc35c6b0781.tar.gz core-5b47818367290640421f835bdd038bc35c6b0781.zip | |
merge area does not need to be increased if a shadow is attached
Diffstat (limited to 'sc/qa')
| -rw-r--r-- | sc/qa/unit/ucalc.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 543c912a3512..e32c28b7906d 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -2284,14 +2284,14 @@ void Test::testMergedCells() m_pDoc->DoMerge(0, 1, 1, 3, 3, false); SCCOL nEndCol = 1; SCROW nEndRow = 1; - m_pDoc->ExtendMerge( 1, 1, nEndCol, nEndRow, 0, false, false); + m_pDoc->ExtendMerge( 1, 1, nEndCol, nEndRow, 0, false); CPPUNIT_ASSERT_MESSAGE("did not merge cells", nEndCol == 3 && nEndRow == 3); ScDocFunc aDocFunc(*m_xDocShRef); ScRange aRange(0,2,0,MAXCOL,2,0); ScMarkData aMark; aMark.SetMarkArea(aRange); aDocFunc.InsertCells(aRange, &aMark, INS_INSROWS, true, true); - m_pDoc->ExtendMerge( 1, 1, nEndCol, nEndRow, 0, false, false); + m_pDoc->ExtendMerge( 1, 1, nEndCol, nEndRow, 0, false); cout << nEndRow << nEndCol; //have a look why this does not work //CPPUNIT_ASSERT_MESSAGE("did not increase merge area", nEndCol == 3 && nEndRow == 4); |