[Libreoffice-commits] .: Branch 'integration/dev300_m106' - writerfilter/source

[Thorsten Behrens]

 writerfilter/source/filter/ImportFilter.cxx |    2 +-
 writerfilter/source/ooxml/OOXMLFactory.hxx  |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 001e51648e071c1475921c37c34f06a293a5bf5b
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Tue May 24 01:13:05 2011 +0200

    Fix post-merge

diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx
index 7993282..ca6e7b9 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -127,7 +127,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes
 
         pDocument->resolve(*pStream);
         writerfilter::ooxml::OOXMLStream::Pointer_t  pVBAProjectStream(writerfilter::ooxml::OOXMLDocumentFactory::createStream( pDocStream, writerfilter::ooxml::OOXMLStream::VBAPROJECT ));
-        oox::StorageRef xVbaPrjStrg( new ::oox::ole::OleStorage( uno::Reference< lang::XMultiServiceFactory >( m_xContext->getServiceManager(), uno::UNO_QUERY_THROW ), pVBAProjectStream->getDocumentStream(), false ) );
+        oox::StorageRef xVbaPrjStrg( new ::oox::ole::OleStorage( m_xContext, pVBAProjectStream->getDocumentStream(), false ) );
         if( xVbaPrjStrg.get() && xVbaPrjStrg->isStorage() )
         {
             ::oox::ole::VbaProject aVbaProject( m_xContext, xModel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Writer" ) ) );
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx
index ba362b3..9c9b8c5 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -47,6 +47,7 @@ enum ResourceType_t {
     RT_NoResource,
     RT_Table,
     RT_Stream,
+    RT_StreamProperties,
     RT_List,
     RT_Integer,
     RT_Properties,