diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-08-20 20:58:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-21 08:09:03 +0100 |
| commit | 2c387e2018ec56dcec80600bbf50f6c8c43a2b62 (patch) | |
| tree | 986cef462122794a6e6fbf9ab1191c7e886dc257 /sw | |
| parent | 684a210dd44ba5bb239eb07842ced767059a3fb8 (diff) | |
allow differentiation between ww6 and ww8
Change-Id: Ia2181b3e9d01661aee521a763b0f87c65e6bad0c
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/shellio.hxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 41c4d3ea2cb2..6736a62b6630 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -187,12 +187,12 @@ protected: #define SW_STREAM_READER 1 #define SW_STORAGE_READER 2 -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(const OUString &rUrl); +extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(const OUString &rUrl, const OUString &rFltName); class SW_DLLPUBLIC Reader { friend class SwReader; - friend bool TestImportDOC(const OUString &rUrl); + friend bool TestImportDOC(const OUString &rUrl, const OUString &rFltName); SwDoc* pTemplate; OUString aTemplateNm; diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 0d0fb1e54b86..ee603c2f57fb 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -6048,7 +6048,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportDOC() return new WW8Reader(); } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(const OUString &rURL) +extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(const OUString &rURL, const OUString &rFltName) { Reader *pReader = ImportDOC(); @@ -6057,6 +6057,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportDOC(const OUString &rURL pReader->pStrm = &aFileStream; pReader->pStg = xStorage.get(); + pReader->SetFltName(rFltName); SwGlobals::ensure(); |