summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-08-21 15:41:08 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-08-21 15:41:29 +0100
commit619d8ba56a80eccdbb262d6155607a3efc405334 (patch)
tree9d6b403448b752346246ef2c1a1671aa53e1d9e9 /sw
parentcbb675a6ccdbd8ac4f9a0af3eee7427b6b28fe92 (diff)
support ww2, etc via fftester
Change-Id: Iba9aeb909a23373c9c1524b647bc7a86cafb1fa8
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/ww8par.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 2041ccce8b3c..11a32469237d 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();