diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 16:05:44 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 16:05:44 +0000 |
| commit | facd7800c8b3c9f5a8d7c0c465d7f601a1489012 (patch) | |
| tree | b9271ddada9b51625634bfcbee55a3168f6c420e /framework | |
| parent | 624001d598fd0af4d014aa5a16cae0cf92759cdf (diff) | |
INTEGRATION: CWS obo30 (1.8.40); FILE MERGED
2008/06/06 06:38:57 obo 1.8.40.2: #i90100# EOL missing
2008/05/30 08:31:11 obo 1.8.40.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/xml/imagesconfiguration.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx index 95a317f1ac..7fd4050245 100644 --- a/framework/source/xml/imagesconfiguration.cxx +++ b/framework/source/xml/imagesconfiguration.cxx @@ -1,13 +1,13 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: imagesconfiguration.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.9 $ * * This file is part of OpenOffice.org. * @@ -59,7 +59,6 @@ // namespace //_________________________________________________________________________________________________________________ -using namespace ::rtl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::lang; @@ -70,7 +69,7 @@ namespace framework { SV_IMPL_PTRARR( ImageItemListDescriptor, ImageItemDescriptorPtr ); -SV_IMPL_PTRARR( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr ); +SV_IMPL_PTRARR( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr ); SV_IMPL_PTRARR( ImageListDescriptor, ImageListItemDescriptorPtr ); static Reference< XParser > GetSaxParser( @@ -94,13 +93,13 @@ static Reference< XDocumentHandler > GetSaxWriter( } // #110897# -sal_Bool ImagesConfiguration::LoadImages( +sal_Bool ImagesConfiguration::LoadImages( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, SvStream& rInStream, ImageListsDescriptor& aItems ) { Reference< XParser > xParser( GetSaxParser( xServiceFactory ) ); - Reference< XInputStream > xInputStream( - (::cppu::OWeakObject *)new utl::OInputStreamWrapper( rInStream ), + Reference< XInputStream > xInputStream( + (::cppu::OWeakObject *)new utl::OInputStreamWrapper( rInStream ), UNO_QUERY ); // connect stream to input stream to the parser @@ -136,14 +135,14 @@ sal_Bool ImagesConfiguration::LoadImages( // #110897# -sal_Bool ImagesConfiguration::StoreImages( +sal_Bool ImagesConfiguration::StoreImages( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, SvStream& rOutStream, const ImageListsDescriptor& aItems ) { Reference< XDocumentHandler > xWriter( GetSaxWriter( xServiceFactory ) ); - Reference< XOutputStream > xOutputStream( - (::cppu::OWeakObject *)new utl::OOutputStreamWrapper( rOutStream ), + Reference< XOutputStream > xOutputStream( + (::cppu::OWeakObject *)new utl::OOutputStreamWrapper( rOutStream ), UNO_QUERY ); Reference< ::com::sun::star::io::XActiveDataSource> xDataSource( xWriter , UNO_QUERY ); @@ -175,7 +174,7 @@ sal_Bool ImagesConfiguration::LoadImages( ImageListsDescriptor& rItems ) { Reference< XParser > xParser( GetSaxParser( xServiceFactory ) ); - + // connect stream to input stream to the parser InputSource aInputSource; @@ -238,3 +237,4 @@ sal_Bool ImagesConfiguration::StoreImages( } } + |