diff options
author | Szabolcs Dezsi <dezsiszabi@hotmail.com> | 2012-02-24 11:43:42 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-02-24 10:46:09 +0000 |
commit | 168fc5c022538d287293bf933adde4b98c6aca37 (patch) | |
tree | 20d65900db101e3e95b49c7ff0e0dcebf5b5511f /sd | |
parent | 06dd0fda38f07a74ba8469542ed4afe93b47ee9c (diff) |
Removed MSFilterTracer and all references to it
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 17 | ||||
-rw-r--r-- | sd/source/filter/ppt/pptin.hxx | 3 | ||||
-rw-r--r-- | sd/source/filter/sdpptwrp.cxx | 1 |
3 files changed, 5 insertions, 16 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index af5dd14d8cf6..4fc9e7187915 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,7 +112,7 @@ lcl_getUnoCtx() return aCtx.getUNOContext(); } -SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMedium, MSFilterTracer* pTracer ) +SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMedium ) { sal_uInt32 nImportFlags = 0; @@ -144,7 +144,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvSto delete pSummaryInformation; #endif - PowerPointImportParam aParam( rDocStream, nImportFlags, pTracer ); + PowerPointImportParam aParam( rDocStream, nImportFlags ); SvStream* pCurrentUserStream = rStorage.OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "Current User" ) ), STREAM_STD_READ ); if( pCurrentUserStream ) { @@ -761,9 +761,6 @@ sal_Bool ImplSdPPTImport::Import() DffRecordHeader aPageHd; if ( SeekToAktPage( &aPageHd ) ) { - if ( mbTracing ) - mpTracer->AddAttribute( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MasterPage" )), rtl::OUString::valueOf( (sal_Int32) (nAktPageNum + 1) ) ); - while( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aPageHd.GetRecEndFilePos() ) ) { DffRecordHeader aHd; @@ -839,8 +836,6 @@ sal_Bool ImplSdPPTImport::Import() } aHd.SeekToEndOfRecord( rStCtrl ); } - if ( mbTracing ) - mpTracer->RemoveAttribute( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MasterPage" )) ); } rStCtrl.Seek( nFPosMerk ); ImportPageEffect( (SdPage*)pMPage, bNewAnimationsUsed ); @@ -2728,13 +2723,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT( const ::rtl::OUStri { sal_Bool bRet = sal_False; - MSFilterTracer aTracer( rConfigPath, pConfigData ); - aTracer.StartTracing(); - - SdPPTImport* pImport = new SdPPTImport( pDocument, rDocStream, rStorage, rMedium, &aTracer ); + SdPPTImport* pImport = new SdPPTImport( pDocument, rDocStream, rStorage, rMedium ); bRet = pImport->Import(); - aTracer.EndTracing(); delete pImport; return bRet; diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx index 39bd87405601..db36046fba91 100644 --- a/sd/source/filter/ppt/pptin.hxx +++ b/sd/source/filter/ppt/pptin.hxx @@ -33,7 +33,6 @@ #include <svx/msdffdef.hxx> #include <diadef.h> #include <svx/svdtypes.hxx> -#include <filter/msfilter/msfiltertracer.hxx> #include <com/sun/star/uno/Any.h> #include <boost/shared_ptr.hpp> @@ -97,7 +96,7 @@ class SdPPTImport public: - SdPPTImport( SdDrawDocument* pDoc, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMed, MSFilterTracer* pTracer = NULL ); + SdPPTImport( SdDrawDocument* pDoc, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMed ); ~SdPPTImport(); sal_Bool Import(); diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index af3887d56e18..db0826ff02a1 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -39,7 +39,6 @@ #include "ppt/pptin.hxx" #include "drawdoc.hxx" #include <tools/urlobj.hxx> -#include <filter/msfilter/msfiltertracer.hxx> // -------------- // - Namespaces - |