Bugzilla – Attachment 57156 Details for
Bug 46166
EasyHack: remove obsolete MSFilterTracer ...
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Removed the whole MSFilterTracer class and all references to it
0001-Removed-obsolete-MSFilterTracer-class.patch (text/plain), 26.65 KB, created by
Szabolcs Dézsi
on 2012-02-16 07:18:34 UTC
(
hide
)
Description:
Removed the whole MSFilterTracer class and all references to it
Filename:
MIME Type:
Creator:
Szabolcs Dézsi
Created:
2012-02-16 07:18:34 UTC
Size:
26.65 KB
patch
obsolete
>From 3f02b8043d86341572727b772c934ab7ccb496ec Mon Sep 17 00:00:00 2001 >From: Szabolcs Dezsi <dezsiszabi@hotmail.com> >Date: Thu, 16 Feb 2012 16:11:52 +0100 >Subject: [PATCH] Removed obsolete MSFilterTracer class > >--- > filter/Library_msfilter.mk | 1 - > filter/Package_inc.mk | 1 - > filter/inc/filter/msfilter/msdffimp.hxx | 7 +- > filter/inc/filter/msfilter/msfiltertracer.hxx | 99 ---------- > filter/inc/filter/msfilter/svdfppt.hxx | 4 +- > filter/source/msfilter/msdffimp.cxx | 26 +--- > filter/source/msfilter/msfiltertracer.cxx | 241 ------------------------- > filter/source/msfilter/svdfppt.cxx | 20 +-- > 8 files changed, 8 insertions(+), 391 deletions(-) > delete mode 100644 filter/inc/filter/msfilter/msfiltertracer.hxx > delete mode 100644 filter/source/msfilter/msfiltertracer.cxx > >diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk >index 316a47d..e454dfb 100644 >--- a/filter/Library_msfilter.mk >+++ b/filter/Library_msfilter.mk >@@ -64,7 +64,6 @@ $(eval $(call gb_Library_add_exception_objects,msfilter,\ > filter/source/msfilter/eschesdo \ > filter/source/msfilter/mscodec \ > filter/source/msfilter/msdffimp \ >- filter/source/msfilter/msfiltertracer \ > filter/source/msfilter/msocximex \ > filter/source/msfilter/msoleexp \ > filter/source/msfilter/mstoolbar \ >diff --git a/filter/Package_inc.mk b/filter/Package_inc.mk >index af2ade6..27a6c45 100644 >--- a/filter/Package_inc.mk >+++ b/filter/Package_inc.mk >@@ -24,7 +24,6 @@ $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/countryid.hxx,f > $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/escherex.hxx,filter/msfilter/escherex.hxx)) > $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/mscodec.hxx,filter/msfilter/mscodec.hxx)) > $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msdffimp.hxx,filter/msfilter/msdffimp.hxx)) >-$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msfiltertracer.hxx,filter/msfilter/msfiltertracer.hxx)) > $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msocximex.hxx,filter/msfilter/msocximex.hxx)) > $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msoleexp.hxx,filter/msfilter/msoleexp.hxx)) > $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/mstoolbar.hxx,filter/msfilter/mstoolbar.hxx)) >diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx >index e2d6ced..9d60ffc 100644 >--- a/filter/inc/filter/msfilter/msdffimp.hxx >+++ b/filter/inc/filter/msfilter/msdffimp.hxx >@@ -37,7 +37,6 @@ > #include <tools/gen.hxx> > #include <tools/table.hxx> > #include <svx/msdffdef.hxx> >-#include <filter/msfilter/msfiltertracer.hxx> > #include <vcl/graph.hxx> > #include <string.h> > #include <map> >@@ -578,7 +577,6 @@ public: > DffRecordManager maShapeRecords; > ColorData mnDefaultColor; > >- MSFilterTracer* mpTracer; > sal_Bool mbTracing; > > Color MSO_TEXT_CLR_ToColor( sal_uInt32 nColorCode ) const; >@@ -621,12 +619,11 @@ public: > long nApplicationScale = 0, > ColorData mnDefaultColor_ = COL_DEFAULT, > sal_uLong nDefaultFontHeight_ = 24, >- SvStream* pStData2_ = 0, >- MSFilterTracer* pTracer = NULL ); >+ SvStream* pStData2_ = 0); > > // in PPT werden die Parameter DGGContainerOffset und PicStream > // mit Hilfe einer Init Routine Uebergeben. >- SvxMSDffManager( SvStream& rStCtrl, const String& rBaseURL, MSFilterTracer* pTracer ); >+ SvxMSDffManager( SvStream& rStCtrl, const String& rBaseURL ); > void InitSvxMSDffManager(sal_uInt32 nOffsDgg_, SvStream* pStData_, sal_uInt32 nSvxMSDffOLEConvFlags); > void SetDgContainer( SvStream& rSt ); > >diff --git a/filter/inc/filter/msfilter/msfiltertracer.hxx b/filter/inc/filter/msfilter/msfiltertracer.hxx >deleted file mode 100644 >index 66d20d6..0000000 >--- a/filter/inc/filter/msfilter/msfiltertracer.hxx >+++ /dev/null >@@ -1,99 +0,0 @@ >-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ >-/************************************************************************* >- * >- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. >- * >- * Copyright 2000, 2010 Oracle and/or its affiliates. >- * >- * OpenOffice.org - a multi-platform office productivity suite >- * >- * This file is part of OpenOffice.org. >- * >- * OpenOffice.org is free software: you can redistribute it and/or modify >- * it under the terms of the GNU Lesser General Public License version 3 >- * only, as published by the Free Software Foundation. >- * >- * OpenOffice.org is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >- * GNU Lesser General Public License version 3 for more details >- * (a copy is included in the LICENSE file that accompanied this code). >- * >- * You should have received a copy of the GNU Lesser General Public License >- * version 3 along with OpenOffice.org. If not, see >- * <http://www.openoffice.org/license.html> >- * for a copy of the LGPLv3 License. >- * >- ************************************************************************/ >- >-#ifndef _MS_FILTERTRACER_HXX >-#define _MS_FILTERTRACER_HXX >- >-#include <rtl/ustring.hxx> >-#include <tools/stream.hxx> >-#include <xmloff/attrlist.hxx> >-#include <com/sun/star/uno/Any.h> >-#include <com/sun/star/uno/Reference.h> >-#include <com/sun/star/util/XTextSearch.hpp> >-#include <com/sun/star/util/SearchResult.hpp> >-#include <com/sun/star/util/logging/XLogger.hpp> >-#include <com/sun/star/beans/PropertyValue.hpp> >-#include <com/sun/star/xml/sax/XAttributeList.hpp> >-#include <com/sun/star/xml/sax/XDocumentHandler.hpp> >-#include "filter/msfilter/msfilterdllapi.h" >- >-class FilterConfigItem; >-class MSFILTER_DLLPUBLIC MSFilterTracer >-{ >- FilterConfigItem* mpCfgItem; >- SvXMLAttributeList* mpAttributeList; >- SvStream* mpStream; >- sal_Bool mbEnabled; >- >- ::com::sun::star::util::SearchOptions maSearchOptions; >- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxFilterTracer; >- ::com::sun::star::uno::Reference< ::com::sun::star::util::XTextSearch > mxTextSearch; >- >- ::com::sun::star::uno::Reference< ::com::sun::star::util::logging::XLogger > mxLogger; >- ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler; >- >- public : >- >- /* The first parameter is expecting the path of the configuration file. >- The second parameter can be used to override properties of the configuration >- file. A "DocumentURL" property can be set in the property >- sequence to provide the current url of the document. >- If the "Path" property is not set in the configuration file, then the path >- of the "DocumentURL" property is used instead. If both are not set, the >- application path is used instead. >- If the "Name" property is not set in the configuration file, then the name >- of the "DocumentURL" property is used instead. If both are not set, the >- name "tracer* is used. >- The file extension will always be "log" */ >- >- MSFilterTracer( const ::rtl::OUString& rConfigurationPath, >- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pConfigData = NULL ); >- ~MSFilterTracer(); >- >- void StartTracing(); >- void EndTracing(); >- >- inline sal_Bool IsEnabled() const { return mbEnabled; } >- >- void StartElement( const ::rtl::OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > xAttribs ); >- void EndElement( const ::rtl::OUString& rName ); >- >- void Trace( const ::rtl::OUString& rElementID, const ::rtl::OUString& rMessage ); >- void AddAttribute( const ::rtl::OUString &sName , const ::rtl::OUString &sValue ); >- void RemoveAttribute( const ::rtl::OUString& sName ); >- void ClearAttributes(); >- >- /* initially all properties of the configuration file and the >- properties which are given to the c'tor can be retrieved */ >- ::com::sun::star::uno::Any GetProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any* pDefault = NULL ) const; >- void SetProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rProperty ); >-}; >- >-#endif >- >-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ >diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx >index 6980917..f1ac113 100644 >--- a/filter/inc/filter/msfilter/svdfppt.hxx >+++ b/filter/inc/filter/msfilter/svdfppt.hxx >@@ -39,7 +39,6 @@ > #include <editeng/editdata.hxx> > #include <filter/msfilter/msdffimp.hxx> > #include <filter/msfilter/msocximex.hxx> >-#include <filter/msfilter/msfiltertracer.hxx> > #include <editeng/eeitem.hxx> > #define ITEMID_FIELD EE_FEATURE_FIELD > #include <editeng/flditem.hxx> >@@ -92,10 +91,9 @@ struct MSFILTER_DLLPUBLIC PowerPointImportParam > { > SvStream& rDocStream; > sal_uInt32 nImportFlags; >- MSFilterTracer* pTracer; > PptCurrentUserAtom aCurrentUserAtom; > >- PowerPointImportParam( SvStream& rDocStream, sal_uInt32 nImportFlags, MSFilterTracer* pTracer ); >+ PowerPointImportParam( SvStream& rDocStream, sal_uInt32 nImportFlags ); > }; > > struct SdHyperlinkEntry >diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx >index da90330..e249b88 100644 >--- a/filter/source/msfilter/msdffimp.cxx >+++ b/filter/source/msfilter/msdffimp.cxx >@@ -4560,11 +4560,6 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r > if( pShapeId ) > *pShapeId = aObjData.nShapeId; > >- if ( mbTracing ) >- mpTracer->AddAttribute( aObjData.nSpFlags & SP_FGROUP >- ? rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GroupShape" )) >- : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Shape" )), >- rtl::OUString::valueOf( (sal_Int32)aObjData.nShapeId ) ); > aObjData.bOpt = maShapeRecords.SeekToContent( rSt, DFF_msofbtOPT, SEEK_FROM_CURRENT_AND_RESTART ); > if ( aObjData.bOpt ) > { >@@ -5123,10 +5118,6 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r > pRet->SetPrintable( ( nGroupProperties & 1 ) != 0 ); > } > >- if ( mbTracing ) >- mpTracer->RemoveAttribute( aObjData.nSpFlags & SP_FGROUP >- ? rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GroupShape" )) >- : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Shape" )) ); > return pRet; > } > >@@ -5853,8 +5844,7 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_, > long nApplicationScale, > ColorData mnDefaultColor_, > sal_uLong nDefaultFontHeight_, >- SvStream* pStData2_, >- MSFilterTracer* pTracer ) >+ SvStream* pStData2_) > :DffPropertyReader( *this ), > pFormModel( NULL ), > pBLIPInfos( new SvxMSDffBLIPInfos ), >@@ -5874,14 +5864,8 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_, > nSvxMSDffSettings( 0 ), > nSvxMSDffOLEConvFlags( 0 ), > mnDefaultColor( mnDefaultColor_), >- mpTracer( pTracer ), > mbTracing( sal_False ) > { >- if ( mpTracer ) >- { >- uno::Any aAny( mpTracer->GetProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "On" )) ) ); >- aAny >>= mbTracing; >- } > SetModel( pSdrModel_, nApplicationScale ); > > // FilePos des/der Stream(s) merken >@@ -5907,7 +5891,7 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_, > pStData->Seek( nOldPosData ); > } > >-SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, const String& rBaseURL, MSFilterTracer* pTracer ) >+SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, const String& rBaseURL) > :DffPropertyReader( *this ), > pFormModel( NULL ), > pBLIPInfos( new SvxMSDffBLIPInfos ), >@@ -5925,14 +5909,8 @@ SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, const String& rBaseURL, MS > nSvxMSDffSettings( 0 ), > nSvxMSDffOLEConvFlags( 0 ), > mnDefaultColor( COL_DEFAULT ), >- mpTracer( pTracer ), > mbTracing( sal_False ) > { >- if ( mpTracer ) >- { >- uno::Any aAny( mpTracer->GetProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "On" )) ) ); >- aAny >>= mbTracing; >- } > SetModel( NULL, 0 ); > } > >diff --git a/filter/source/msfilter/msfiltertracer.cxx b/filter/source/msfilter/msfiltertracer.cxx >deleted file mode 100644 >index 51b40d0..0000000 >--- a/filter/source/msfilter/msfiltertracer.cxx >+++ /dev/null >@@ -1,241 +0,0 @@ >-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ >-/************************************************************************* >- * >- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. >- * >- * Copyright 2000, 2010 Oracle and/or its affiliates. >- * >- * OpenOffice.org - a multi-platform office productivity suite >- * >- * This file is part of OpenOffice.org. >- * >- * OpenOffice.org is free software: you can redistribute it and/or modify >- * it under the terms of the GNU Lesser General Public License version 3 >- * only, as published by the Free Software Foundation. >- * >- * OpenOffice.org is distributed in the hope that it will be useful, >- * but WITHOUT ANY WARRANTY; without even the implied warranty of >- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >- * GNU Lesser General Public License version 3 for more details >- * (a copy is included in the LICENSE file that accompanied this code). >- * >- * You should have received a copy of the GNU Lesser General Public License >- * version 3 along with OpenOffice.org. If not, see >- * <http://www.openoffice.org/license.html> >- * for a copy of the LGPLv3 License. >- * >- ************************************************************************/ >- >-#include <filter/msfilter/msfiltertracer.hxx> >-#include <vcl/svapp.hxx> >-#include <tools/urlobj.hxx> >-#include <com/sun/star/uno/Sequence.h> >-#include <com/sun/star/util/logging/LogLevel.hpp> >-#include <com/sun/star/util/SearchAlgorithms.hpp> >-#include <com/sun/star/util/SearchFlags.hpp> >-#include <comphelper/processfactory.hxx> >-#include <com/sun/star/lang/XMultiServiceFactory.hpp> >-#include <com/sun/star/io/XActiveDataSource.hpp> >-#include <svtools/FilterConfigItem.hxx> >-#include <unotools/localfilehelper.hxx> >-#include <unotools/streamwrap.hxx> >-#include <unotools/ucbstreamhelper.hxx> >- >- >-using namespace ::com::sun::star; >- >-MSFilterTracer::MSFilterTracer( const ::rtl::OUString& rConfigPath, uno::Sequence< beans::PropertyValue >* pConfigData ) : >- mpCfgItem( new FilterConfigItem( rConfigPath, pConfigData ) ), >- mpAttributeList( new SvXMLAttributeList() ), >- mpStream( NULL ), >- mbEnabled( sal_False ) // will be set to true in StartTracing() >-{ >- if ( mpCfgItem->ReadBool( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "On" )), sal_False ) ) >- { >- uno::Reference< lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); >- if ( xMgr.is() ) >- { >- /* the following methods try to read a property, if it is not available it will put the second >- parameter as default into the property sequence of the FilterConfigItem. It means we ensure that >- the property is available by trying to read it (the return value of the method is ignored) */ >- ::rtl::OUString aEmptyString; >- mpCfgItem->ReadInt32( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LogLevel" )), util::logging::LogLevel::ALL ); >- mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ClassFilter" )), aEmptyString ); >- mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MethodFilter" )), aEmptyString ); >- mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MessageFilter" )), aEmptyString ); >- util::SearchAlgorithms eSearchAlgorithm = (util::SearchAlgorithms) >- mpCfgItem->ReadInt32( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SearchAlgorithm" )), util::SearchAlgorithms_ABSOLUTE ); >- >- // creating the name of the log file >- rtl::OUString aPath( mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Path" )), aEmptyString ) ); >- rtl::OUString aName( mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" )), aEmptyString ) ); >- rtl::OUString aDocumentURL( mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentURL" )), aEmptyString ) ); >- INetURLObject aLogFile( aDocumentURL ); >- if ( !aLogFile.GetMainURL( INetURLObject::NO_DECODE ).isEmpty() ) >- { >- if ( !aPath.isEmpty() ) >- { >- String aOldName( aLogFile.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::NO_DECODE ) ); >- aLogFile = INetURLObject( aPath ); >- aLogFile.insertName( aOldName ); >- } >- if ( !aName.isEmpty() ) >- aLogFile.setName( aName ); >- } >- else >- { >- if ( !aPath.isEmpty() ) >- aLogFile = INetURLObject( aPath ); >- else >- { >- rtl::OUString aURLStr; >- if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( Application::GetAppFileName(), aURLStr ) ) >- { >- aLogFile = INetURLObject(aURLStr); >- aLogFile .removeSegment(); >- aLogFile .removeFinalSlash(); >- } >- } >- if ( aName.isEmpty() ) >- aName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "tracer" )); >- aLogFile.insertName( aName ); >- } >- aLogFile.setExtension( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "log" )) ); >- >- // creating the file stream >- mpStream = ::utl::UcbStreamHelper::CreateStream( aLogFile.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC | STREAM_SHARE_DENYNONE ); >- if ( mpStream && !mpStream->GetError() ) >- { >- // creating a wrapper for our stream >- utl::OOutputStreamWrapper* pHelper = new ::utl::OOutputStreamWrapper( *mpStream ); >- uno::Reference< io::XOutputStream > xOutputStream( pHelper ); >- >- // instanciating the DocumentHandler, then setting the OutputStream >- mxHandler = uno::Reference< xml::sax::XDocumentHandler >( xMgr->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" )) ), uno::UNO_QUERY ); >- uno::Reference< io::XActiveDataSource > xDocSrc( mxHandler, uno::UNO_QUERY ); >- xDocSrc->setOutputStream( xOutputStream ); >- mxHandler->startDocument(); >- mxHandler->ignorableWhitespace ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " )) ); >- >- // writing the "DocumentHandler" property, so the FilterTracer component >- // will use it for the output >- uno::Any aAny; >- aAny <<= xDocSrc; >- mpCfgItem->WriteAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentHandler" )), aAny ); >- >- SvXMLAttributeList* pAttrList = new SvXMLAttributeList; >- pAttrList->AddAttribute( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentURL" )), aDocumentURL ); >- uno::Reference < xml::sax::XAttributeList > xAttributeList(pAttrList); >- mxHandler->startElement( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Document" )), xAttributeList ); >- } >- >- uno::Sequence< uno::Any > aArgument( 1 ); >- uno::Sequence< beans::PropertyValue > aPropValues( mpCfgItem->GetFilterData() ); >- aArgument[ 0 ] <<= aPropValues; >- mxFilterTracer = xMgr->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.FilterTracer" )), aArgument ); >- if ( mxFilterTracer.is() ) >- { >- mxTextSearch = uno::Reference< util::XTextSearch >( mxFilterTracer, uno::UNO_QUERY ); >- mxLogger = uno::Reference< util::logging::XLogger >( mxFilterTracer, uno::UNO_QUERY ); >- if ( mxTextSearch.is() ) >- { >- maSearchOptions.algorithmType = eSearchAlgorithm; >- mxTextSearch->setOptions( maSearchOptions ); >- } >- } >- } >- } >-} >- >-MSFilterTracer::~MSFilterTracer() >-{ >- mxLogger = NULL; >- mxFilterTracer = NULL; >- if ( mxHandler.is() ) >- { >- mxHandler->ignorableWhitespace ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " )) ); >- mxHandler->endElement( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Document" )) ); >- mxHandler->ignorableWhitespace ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " )) ); >- mxHandler->endDocument(); >- mxHandler = NULL; >- } >- delete mpAttributeList; >- delete mpCfgItem; >- delete mpStream; >-} >- >-void MSFilterTracer::StartTracing() >-{ >- mbEnabled = mpCfgItem->ReadBool( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "On" )), sal_False ); >-} >- >-void MSFilterTracer::EndTracing() >-{ >- mbEnabled = sal_False; >-} >- >-void MSFilterTracer::StartElement( const rtl::OUString& rName, uno::Reference< xml::sax::XAttributeList > xAttribs ) >-{ >- if ( mxHandler.is() ) >- mxHandler->startElement( rName, xAttribs ); >-} >- >-void MSFilterTracer::Trace( const rtl::OUString& rElement, const rtl::OUString& rMessage ) >-{ >- if ( mbEnabled && mxLogger.is() ) >- { >- sal_Bool bFilter = sal_False; >- if ( !rMessage.isEmpty() && mxTextSearch.is() ) >- { >- maSearchOptions.searchString = rMessage; >- mxTextSearch->setOptions( maSearchOptions ); >- util::SearchResult aSearchResult = mxTextSearch->searchForward( rMessage, 0, rMessage.getLength() ); >- bFilter = aSearchResult.subRegExpressions != 0; >- } >- if ( !bFilter ) >- { >- uno::Reference < xml::sax::XAttributeList > xAttrList( new SvXMLAttributeList( *mpAttributeList ) ); >- if ( mxHandler.is() ) >- mxHandler->startElement( rElement, xAttrList ); >- if ( !rMessage.isEmpty() ) >- { >- rtl::OUString aEmpty; >- mxLogger->logp( 0, aEmpty, aEmpty, rMessage ); >- } >- if ( mxHandler.is() ) >- mxHandler->endElement( rElement ); >- } >- } >-} >- >-void MSFilterTracer::AddAttribute( const ::rtl::OUString& sName , const ::rtl::OUString& sValue ) >-{ >- if ( mbEnabled ) >- mpAttributeList->AddAttribute( sName, sValue ); >-} >-void MSFilterTracer::ClearAttributes() >-{ >- if ( mbEnabled ) >- mpAttributeList->Clear(); >-} >- >-void MSFilterTracer::RemoveAttribute( const ::rtl::OUString& sName ) >-{ >- if ( mbEnabled ) >- mpAttributeList->RemoveAttribute( sName ); >-} >- >-uno::Any MSFilterTracer::GetProperty( const rtl::OUString& rPropName, const uno::Any* pDefault ) const >-{ >- uno::Any aDefault; >- if ( pDefault ) >- aDefault = *pDefault; >- return mpCfgItem->ReadAny( rPropName, aDefault ); >-} >- >-void MSFilterTracer::SetProperty( const ::rtl::OUString& rPropName, const uno::Any& rProperty ) >-{ >- mpCfgItem->WriteAny( rPropName, rProperty ); >-} >- >-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ >diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx >index 2b9f19f..9f88b5d 100644 >--- a/filter/source/msfilter/svdfppt.cxx >+++ b/filter/source/msfilter/svdfppt.cxx >@@ -165,10 +165,9 @@ using namespace drawing ; > using namespace container ; > using namespace table ; > >-PowerPointImportParam::PowerPointImportParam( SvStream& rDocStrm, sal_uInt32 nFlags, MSFilterTracer* pT ) : >+PowerPointImportParam::PowerPointImportParam( SvStream& rDocStrm, sal_uInt32 nFlags) : > rDocStream ( rDocStrm ), >- nImportFlags ( nFlags ), >- pTracer ( pT ) >+ nImportFlags ( nFlags ) > { > } > >@@ -520,7 +519,7 @@ PptSlidePersistEntry::~PptSlidePersistEntry() > }; > > SdrEscherImport::SdrEscherImport( PowerPointImportParam& rParam, const String& rBaseURL ) : >- SvxMSDffManager ( rParam.rDocStream, rBaseURL, rParam.pTracer ), >+ SvxMSDffManager ( rParam.rDocStream, rBaseURL ), > pFonts ( NULL ), > nStreamLen ( 0 ), > nTextStylesIndex ( 0xffff ), >@@ -2146,9 +2145,6 @@ sal_Bool SdrPowerPointImport::ReadFontCollection() > aFont.SetPitch( pFont->ePitch ); > aFont.SetHeight( 100 ); > >- if ( mbTracing && !pFont->bAvailable ) >- mpTracer->Trace( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sd1000" )), pFont->aName ); >- > // following block is necessary, because our old PowerPoint export did not set the > // correct charset > if ( pFont->aName.EqualsIgnoreCaseAscii( "Wingdings" ) || >@@ -2740,12 +2736,6 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* > DffRecordHeader aPageHd; > if ( SeekToAktPage( &aPageHd ) ) > { >- if ( mbTracing ) >- mpTracer->AddAttribute( eAktPageKind == PPT_SLIDEPAGE >- ? rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Page" )) >- : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NotesPage" )), >- rtl::OUString::valueOf( (sal_Int32)nAktPageNum + 1 ) ); >- > rSlidePersist.pHeaderFooterEntry = new HeaderFooterEntry( pMasterPersist ); > ProcessData aProcessData( rSlidePersist, (SdPage*)pRet ); > while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aPageHd.GetRecEndFilePos() ) ) >@@ -2935,10 +2925,6 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* > } > if ( rSlidePersist.pSolverContainer ) > SolveSolver( *rSlidePersist.pSolverContainer ); >- if ( mbTracing ) >- mpTracer->RemoveAttribute( eAktPageKind == PPT_SLIDEPAGE >- ? rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Page" )) >- : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NotesPage" )) ); > } > rStCtrl.Seek( nMerk ); > } >-- >1.7.7 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=57156">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 46166
:
57156
|
57580