diff options
Diffstat (limited to 'sw/qa/extras/mailmerge/mailmerge.cxx')
| -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 c54998afe182..647257636c7e 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -167,12 +167,12 @@ public: /** * Like parseExport(), but for given mail merge document. */ - xmlDocPtr parseMailMergeExport(int number, const OUString& rStreamName = OUString("word/document.xml")) + xmlDocPtr parseMailMergeExport(const OUString& rStreamName) { if (mnCurOutputType != text::MailMergeType::FILE) return nullptr; - OUString name = mailMergeOutputPrefix + OUString::number( number ) + ".odt"; + OUString name = mailMergeOutputPrefix + OUString::number( 0 ) + ".odt"; return parseExportInternal( mailMergeOutputURL + "/" + name, rStreamName ); } @@ -315,7 +315,7 @@ DECLARE_FILE_MAILMERGE_TEST(testMissingDefaultLineColor, "missing-default-line-c // And the default value is black (wasn't copied properly by mailmerge). CPPUNIT_ASSERT_EQUAL( COL_BLACK, lineColor ); // And check that the resulting file has the proper default. - xmlDocPtr pXmlDoc = parseMailMergeExport( 0, "styles.xml" ); + xmlDocPtr pXmlDoc = parseMailMergeExport( "styles.xml" ); CPPUNIT_ASSERT_EQUAL( OUString( "graphic" ), getXPath(pXmlDoc, "/office:document-styles/office:styles/style:default-style[1]", "family")); CPPUNIT_ASSERT_EQUAL( OUString( "#000000" ), getXPath(pXmlDoc, "/office:document-styles/office:styles/style:default-style[1]/style:graphic-properties", "stroke-color")); } |