diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-12-23 17:43:14 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-18 09:13:56 +0100 |
| commit | ba0796b331247b27886384377c480e413c3ee83d (patch) | |
| tree | f0b6a5adb18a6805561dbc8a0bc8cf38b7e6d03a /sw/qa | |
| parent | 6b355901a7e7a1fd8710e743621ad655068a5817 (diff) | |
mailmerge: Killed the 'Save, print or send' page.
Introduced the appropriate dialogs instead; they are not accessible from the
UI yet, though.
Change-Id: I54a4af1980e3caa6683bc4406feeb08142c9b8f5
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/mailmerge/mailmerge.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index 647257636c7e..4273747b4446 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -234,7 +234,7 @@ protected: DECLARE_MAILMERGE_TEST(TestName, filename, datasource, tablename, true, MMTest) int MMTest::documentStartPageNumber( int document ) const -{ // See SwMailMergeOutputPage::documentStartPageNumber() . +{ // See documentStartPageNumber() . SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get()); CPPUNIT_ASSERT(pTextDoc); SwWrtShell* shell = pTextDoc->GetDocShell()->GetWrtShell(); @@ -365,8 +365,8 @@ DECLARE_SHELL_MAILMERGE_TEST(testPageBoundariesSimpleMailMerge, "simple-mail-mer { // This is like the test above, but this one uses the create-single-document-containing-everything-generated approach, // and verifies that boundaries of the generated sub-documents are correct inside that document. - // These boundaries are done using "SwMailMergeOutputPage::documentStartPageNumber<number>" UNO bookmarks (see also - // SwMailMergeOutputPage::documentStartPageNumber() ). + // These boundaries are done using "documentStartPageNumber<number>" UNO bookmarks (see also + // documentStartPageNumber() ). executeMailMerge(); // Here getPages() works on the source document, so get pages of the resulting one. SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get()); |