mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS xmlfilter06 (1.8.10); FILE MERGED

Browse Source 
2008/06/25 15:39:39 mav 1.8.10.1: #i91053# convert OOXML objects to OOo objects on activation
This commit is contained in:
Oliver Bolte
2008-07-22 13:40:00 +00:00
parent 10b0104867
commit 6955e1d6b6
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
embeddedobj/source/msole/ownview.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: ownview.cxx,v $ * $RCSfile: ownview.cxx,v $
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* This file is part of OpenOffice.org. * 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, ::rtl::OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream(
const uno::Reference< io::XInputStream >& xInputStream ) 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() ) if ( !xInputStream.is() )
throw uno::RuntimeException(); throw uno::RuntimeException();
uno::Reference< document::XTypeDetection > xTypeDetection( 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 ); uno::UNO_QUERY_THROW );
::rtl::OUString aTypeName; ::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 // The temporary native file is created, now the filter must be detected
if ( !bFailed ) if ( !bFailed )
{ {
m_aFilterName = GetFilterNameFromExtentionAndInStream( aFileSuffix, xNativeInTemp ); m_aFilterName = GetFilterNameFromExtentionAndInStream( m_xFactory, aFileSuffix, xNativeInTemp );
m_aNativeTempURL = aNativeTempURL; m_aNativeTempURL = aNativeTempURL;
} }