diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-06-07 00:03:53 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-06-07 00:03:53 +0200 |
| commit | 448c89362dfbb0ac7d83fe277ee9f248711d66fc (patch) | |
| tree | cf3f1957c8a85f9c6f2995a0f73e275f3825c3bd /writerperfect | |
| parent | 8340e348f5a2a8fcf2be28de3a59b1c5466a775a (diff) | |
Fix parsing of WordPerfect documents that are not password protected
Diffstat (limited to 'writerperfect')
| -rw-r--r-- | writerperfect/source/wpdimp/WordPerfectImportFilter.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx index 99e2f27b323b..c81e324bf131 100644 --- a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx +++ b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx @@ -123,7 +123,6 @@ sal_Bool SAL_CALL WordPerfectImportFilter::importImpl( const Sequence< ::com::su OString aUtf8Passwd; -#if 1 WPDConfidence confidence = WPDocument::isFileFormatSupported(&input); if (WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence) @@ -146,7 +145,6 @@ sal_Bool SAL_CALL WordPerfectImportFilter::importImpl( const Sequence< ::com::su return sal_False; } } -#endif // An XML import service: what we push sax messages to.. OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XMLOasisImporter" ) ); @@ -162,7 +160,7 @@ sal_Bool SAL_CALL WordPerfectImportFilter::importImpl( const Sequence< ::com::su OdtGenerator collector(&xHandler, ODF_FLAT_XML); collector.registerEmbeddedObjectHandler("image/x-wpg", &handleEmbeddedWPG); - if (WPD_OK == WPDocument::parse(&input, &collector, aUtf8Passwd.getStr())) + if (WPD_OK == WPDocument::parse(&input, &collector, aUtf8Passwd.getLength() ? aUtf8Passwd.getStr() : 0)) return sal_True; return sal_False; } |