diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-04 11:21:44 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-04 11:28:37 +0000 |
| commit | b901d0ea975bb7c76d303e08781b10ccdbaa7ead (patch) | |
| tree | 319631ce5046e7f8fb518d5c9f28ab49901b6c98 /sw | |
| parent | 31a4735d32cd4893185f87a8f06b6c20564a16ee (diff) | |
and fix up test for CVE-2006-3117
Diffstat (limited to 'sw')
| -rwxr-xr-x | sw/prj/build.lst | 2 | ||||
| -rw-r--r-- | sw/qa/core/filters-test.cxx | 3 | ||||
| -rw-r--r-- | sw/qa/core/makefile.mk | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/sw/prj/build.lst b/sw/prj/build.lst index 7736cfd2df72..723a98a3afb8 100755 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,4 +1,4 @@ -sw sw : filter l10n connectivity writerperfect lotuswordpro vbahelper svx stoc writerfilter unoxml fileaccess NULL +sw sw : filter l10n connectivity writerperfect lotuswordpro vbahelper svx stoc writerfilter unoxml fileaccess package NULL sw sw usr1 - all sw_mkout NULL sw sw\inc nmake - all sw_inc NULL sw sw\uiconfig\layout nmake - all sw_layout NULL diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx index dcb51d7ea51c..1e09a0547972 100644 --- a/sw/qa/core/filters-test.cxx +++ b/sw/qa/core/filters-test.cxx @@ -126,11 +126,10 @@ void FiltersTest::testCVEs() #ifndef WNT bool bResult; -#if 0 bResult = testLoad(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice XML (Writer)")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CXML")), m_aPWDURL + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/CVE/CVE-2006-3117-1.sxw"))); CPPUNIT_ASSERT_MESSAGE("CVE-2006-3117 regression", bResult == false); -#endif bResult = testLoad(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Rich Text Format")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RTF")), diff --git a/sw/qa/core/makefile.mk b/sw/qa/core/makefile.mk index d8fd60b48191..c831e8722e2b 100644 --- a/sw/qa/core/makefile.mk +++ b/sw/qa/core/makefile.mk @@ -178,7 +178,12 @@ $(MISC)/$(TARGET)/services.rdb .ERRREMOVE : $(MISC)/$(TARGET)/udkapi.rdb makefil -c $(DLLPRE)ucpfile1$(DLLPOST) \ -c $(DLLPRE)unoxml$(DLLPOSTFIX)$(DLLPOST) \ -c $(DLLPRE)comphelp$(COMPHLP_MAJOR)$(COMID)$(DLLPOST) \ + -c $(DLLPRE)xstor$(DLLPOST) \ + -c $(DLLPRE)package2$(DLLPOST) \ + -c $(DLLPRE)xof$(DLLPOSTFIX)$(DLLPOST) \ + -c $(DLLPRE)utl$(DLLPOSTFIX)$(DLLPOST) \ -c stocservices.uno$(DLLPOST) \ + -c reflection.uno$(DLLPOST) \ -c i18npool.uno$(DLLPOST) \ -c sax.uno$(DLLPOST) |