diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 13:40:00 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 13:40:00 +0000 |
| commit | 6955e1d6b6b56e6180f86cf4ec0a32c16dd7f18b (patch) | |
| tree | ba07a44663b77c6c0c66b525beeae23a46d3ce93 /embeddedobj | |
| parent | 10b010486793e473b6912c93cfa765499e584c98 (diff) | |
INTEGRATION: CWS xmlfilter06 (1.8.10); FILE MERGED
2008/06/25 15:39:39 mav 1.8.10.1: #i91053# convert OOXML objects to OOo objects on activation
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/msole/ownview.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index 409d09487ea7..f620fb4ee886 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ownview.cxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.9 $ * * This file is part of OpenOffice.org. * @@ -209,14 +209,16 @@ sal_Bool OwnView_Impl::CreateModel( sal_Bool bUseNative ) } //-------------------------------------------------------- -::rtl::OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream( const ::rtl::OUString& aNameWithExtention, - const uno::Reference< io::XInputStream >& xInputStream ) +::rtl::OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, + const ::rtl::OUString& aNameWithExtention, + const uno::Reference< io::XInputStream >& xInputStream ) { if ( !xInputStream.is() ) throw uno::RuntimeException(); uno::Reference< document::XTypeDetection > xTypeDetection( - m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.TypeDetection" ) ), + xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.TypeDetection" ) ), uno::UNO_QUERY_THROW ); ::rtl::OUString aTypeName; @@ -411,7 +413,7 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io // The temporary native file is created, now the filter must be detected if ( !bFailed ) { - m_aFilterName = GetFilterNameFromExtentionAndInStream( aFileSuffix, xNativeInTemp ); + m_aFilterName = GetFilterNameFromExtentionAndInStream( m_xFactory, aFileSuffix, xNativeInTemp ); m_aNativeTempURL = aNativeTempURL; } |