diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-09-26 14:08:20 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-09-26 14:08:20 +0000 |
| commit | 3ba82371e2629bf9a6e3b2c87dd419fa35af87b4 (patch) | |
| tree | eae22eb2cc664b9b391b058d488afedebab53c42 | |
| parent | 7fdbe1dd5f6e42818b34390c379220dd67e42314 (diff) | |
CWS-TOOLING: integrate CWS impress157_DEV300
| -rw-r--r-- | sdext/source/pdfimport/config/description.xml | 2 | ||||
| -rw-r--r-- | sdext/source/pdfimport/pdfiadaptor.cxx | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml index 96df175635a5..eebb9c1f65d7 100644 --- a/sdext/source/pdfimport/config/description.xml +++ b/sdext/source/pdfimport/config/description.xml @@ -16,7 +16,7 @@ </simple-license> </registration> - <version value="0.3" /> + <version value="0.3.2" /> <platform value="UPDATED_SUPPORTED_PLATFORM" /> diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index 6c6c9732cbfd..8b6db0ff972d 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -99,15 +99,18 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert bool bAddPwdProp = false; if( ! xSubStream.is() ) { + uno::Reference< io::XInputStream > xInput; for( sal_Int32 i = 0; i < nAttribs; i++ ) { - if( pAttribs[i].Name.equalsAscii( "Stream" ) ) - pAttribs[i].Value >>= xSubStream; + if( pAttribs[i].Name.equalsAscii( "InputStream" ) ) + { + pAttribs[i].Value >>= xInput; + break; + } } - if( xSubStream.is() ) + if( xInput.is() ) { // TODO(P2): extracting hybrid substream twice - once during detection, second time here - uno::Reference< io::XInputStream > xInput( xSubStream->getInputStream() ); uno::Reference< io::XSeekable > xSeek( xInput, uno::UNO_QUERY ); if( xSeek.is() ) xSeek->seek( 0 ); |