diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-24 14:42:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-24 14:42:48 +0100 |
| commit | 403b0a8d059de01b7297e1e6083eb41e930d73a7 (patch) | |
| tree | 7c8cc1711baaf7352b9f90c6b7d910d832be878e /sd | |
| parent | remove unused makefile tg_xmerge.mk (diff) | |
| download | core-403b0a8d059de01b7297e1e6083eb41e930d73a7.tar.gz core-403b0a8d059de01b7297e1e6083eb41e930d73a7.zip | |
-Werror=unused-parameter
Not sure if this rather radical shrinking of sw::log::Tracer is good, though (or
if the class already has become obsolete anyway)?
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 3 | ||||
| -rw-r--r-- | sd/source/filter/sdpptwrp.cxx | 12 |
2 files changed, 3 insertions, 12 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 4fc9e7187915..1f8fd684f021 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2717,8 +2717,7 @@ ImplSdPPTImport::ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Ref // - exported function - // --------------------- -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT( const ::rtl::OUString& rConfigPath, - uno::Sequence< beans::PropertyValue >* pConfigData, +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT( SdDrawDocument* pDocument, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMedium ) { sal_Bool bRet = sal_False; diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index db0826ff02a1..2229c263960b 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -54,8 +54,7 @@ typedef sal_Bool ( __LOADONCALLAPI *ExportPPT )( const std::vector< com::sun::st Reference< XStatusIndicator > &, SvMemoryStream*, sal_uInt32 nCnvrtFlags ); -typedef sal_Bool ( SAL_CALL *ImportPPT )( const ::rtl::OUString&, Sequence< PropertyValue >*, - SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& ); +typedef sal_Bool ( SAL_CALL *ImportPPT )( SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& ); typedef sal_Bool ( __LOADONCALLAPI *SaveVBA )( SfxObjectShell&, SvMemoryStream*& ); @@ -99,13 +98,6 @@ sal_Bool SdPPTFilter::Import() pDocStream->SetVersion( pStorage->GetVersion() ); pDocStream->SetCryptMaskKey(pStorage->GetKey()); - String aTraceConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Tracing/Import/PowerPoint" ) ); - Sequence< PropertyValue > aConfigData( 1 ); - PropertyValue aPropValue; - aPropValue.Value <<= rtl::OUString( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); - aPropValue.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentURL" ) ); - aConfigData[ 0 ] = aPropValue; - if ( pStorage->IsStream( String( RTL_CONSTASCII_USTRINGPARAM("EncryptedSummary") ) ) ) mrMedium.SetError( ERRCODE_SVX_READ_FILTER_PPOINT, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); else @@ -115,7 +107,7 @@ sal_Bool SdPPTFilter::Import() { ImportPPT PPTImport = reinterpret_cast< ImportPPT >( pLibrary->getFunctionSymbol( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ImportPPT" ) ) ) ); if ( PPTImport ) - bRet = PPTImport( aTraceConfigPath, &aConfigData, &mrDocument, *pDocStream, *pStorage, mrMedium ); + bRet = PPTImport( &mrDocument, *pDocStream, *pStorage, mrMedium ); if ( !bRet ) mrMedium.SetError( SVSTREAM_WRONGVERSION, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); |