summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 16:29:23 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 16:29:23 +0000
commit94ea9bcb20a068e89ffb0641f4da5e55713aa9c1 (patch)
tree00c09a9a6fb83242e451c5380047bd18defda3ee /package
parented12b4e6beb59fe9268665cfb0cb96732d4d42ad (diff)
INTEGRATION: CWS fwkbugfix02 (1.89.12); FILE MERGED
2004/04/27 10:58:22 mav 1.89.12.4: RESYNC: (1.89-1.90); FILE MERGED 2004/03/24 07:49:06 mav 1.89.12.3: #115974# use seekable wrapper from comphelper 2004/03/23 15:42:24 mav 1.89.12.2: #115974# use seekable wrapper from comphelper 2004/03/17 11:39:25 mav 1.89.12.1: #115957# Extend the cloning functionality
Diffstat (limited to 'package')
-rw-r--r--package/source/zippackage/ZipPackage.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index c3236503942e..acbfcf109eb5 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ZipPackage.cxx,v $
*
- * $Revision: 1.90 $
+ * $Revision: 1.91 $
*
- * last change: $Author: hr $ $Date: 2004-04-13 12:22:22 $
+ * last change: $Author: hr $ $Date: 2004-05-10 17:29:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -175,6 +175,7 @@
#include <ucbhelper/contentbroker.hxx>
#include <ucbhelper/fileidentifierconverter.hxx>
+#include <comphelper/seekableinput.hxx>
using namespace rtl;
using namespace ucb;
@@ -577,10 +578,14 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments )
{
if (xContentStream.is())
{
+ // the stream must be seekable, if it is not it will be wrapped
+ xContentStream = ::comphelper::OSeekableInputWrapper::CheckSeekableCanWrap( xContentStream, xFactory );
xContentSeek = Reference < XSeekable > ( xContentStream, UNO_QUERY );
if ( ! xContentSeek.is() )
- throw com::sun::star::uno::Exception ( OUString( RTL_CONSTASCII_USTRINGPARAM ( "The package component _requires_ an XSeekable interface!" ) ),
- static_cast < ::cppu::OWeakObject * > ( this ) );
+ throw com::sun::star::uno::Exception (
+ OUString( RTL_CONSTASCII_USTRINGPARAM (
+ "The package component _requires_ an XSeekable interface!" ) ),
+ static_cast < ::cppu::OWeakObject * > ( this ) );
if ( !xContentSeek->getLength() )
bHaveZipFile = sal_False;