diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-04-02 16:50:15 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-04-02 20:22:40 +0100 |
| commit | 0e0e3caf382f793481b638417540d05c1d1ed24a (patch) | |
| tree | 4cf268f5dd5b0e44cf49c32681af11033ec33246 /sc/qa | |
| parent | f834d986d5a1e7e66f4029476d058fbf5f63d8d1 (diff) | |
Don't instantiate ScDocFunc objects, get them from the doc-shell
Diffstat (limited to 'sc/qa')
| -rw-r--r-- | sc/qa/unit/ucalc.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 6a926287f025..245215c723a3 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -3899,13 +3899,12 @@ void Test::testMergedCells() SCROW nEndRow = 1; 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); m_pDoc->SetInTest(); - aDocFunc.InsertCells(aRange, &aMark, INS_INSROWS, true, true); - m_pDoc->ExtendMerge( 1, 1, nEndCol, nEndRow, 0, false); + m_xDocShRef->GetDocFunc().InsertCells(aRange, &aMark, INS_INSROWS, true, true); + m_pDoc->ExtendMerge(1, 1, nEndCol, nEndRow, 0, false); cout << nEndRow << nEndCol; CPPUNIT_ASSERT_MESSAGE("did not increase merge area", nEndCol == 3 && nEndRow == 4); m_pDoc->DeleteTab(0); |