diff options
Diffstat (limited to 'sw/qa/unit/swmodeltestbase.cxx')
| -rw-r--r-- | sw/qa/unit/swmodeltestbase.cxx | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx index b1ece8ac05fc..14376aa6af25 100644 --- a/sw/qa/unit/swmodeltestbase.cxx +++ b/sw/qa/unit/swmodeltestbase.cxx @@ -639,13 +639,13 @@ void SwModelTestBase::save(const OUString& aFilterName) { validate(maTempFile.GetFileName(), test::ODF); } + mbExported = true; } void SwModelTestBase::loadAndSave(const char* pName) { load(pName); save(OUString::createFromAscii(mpFilter)); - mbExported = true; } void SwModelTestBase::loadAndReload(const char* pName) @@ -684,7 +684,9 @@ xmlDocUniquePtr SwModelTestBase::parseExport(const OUString& rStreamName) if (!mbExported) return nullptr; - return parseExportInternal(maTempFile.GetURL(), rStreamName); + std::unique_ptr<SvStream> pStream(parseExportStream(maTempFile.GetURL(), rStreamName)); + + return parseXmlStream(pStream.get()); } xmlDocUniquePtr SwModelTestBase::parseExportedFile() @@ -693,17 +695,6 @@ xmlDocUniquePtr SwModelTestBase::parseExportedFile() return parseXmlStream(&stream); } -xmlDocUniquePtr SwModelTestBase::parseExportInternal(const OUString& url, - const OUString& rStreamName) -{ - std::unique_ptr<SvStream> pStream(parseExportStream(url, rStreamName)); - - xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get()); - pXmlDoc->name = reinterpret_cast<char*>(xmlStrdup( - reinterpret_cast<xmlChar const*>(OUStringToOString(url, RTL_TEXTENCODING_UTF8).getStr()))); - return pXmlDoc; -} - void SwModelTestBase::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) { // docx |