sw/source/filter/ww8/ww8par.cxx | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 619d8ba56a80eccdbb262d6155607a3efc405334
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Aug 21 15:41:08 2015 +0100
support ww2, etc via fftester
Change-Id: Iba9aeb909a23373c9c1524b647bc7a86cafb1fa8
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 2041ccc..11a3246 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6053,10 +6053,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
TestImportDOC(const OUString &rURL
Reader *pReader = ImportDOC();
SvFileStream aFileStream(rURL, StreamMode::READ);
- tools::SvRef<SotStorage> xStorage = new SotStorage(aFileStream);
-
+ tools::SvRef<SotStorage> xStorage;
pReader->pStrm = &aFileStream;
- pReader->pStg = xStorage.get();
+ if (rFltName != "WW6")
+ {
+ xStorage = tools::SvRef<SotStorage>(new SotStorage(aFileStream));
+ pReader->pStg = xStorage.get();
+ }
pReader->SetFltName(rFltName);
SwGlobals::ensure();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
