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 /filter/inc | |
parent | fdo#46377 BASISINSTALLLOCATION = INSTALLLOCATION (diff) | |
download | core-168fc5c022538d287293bf933adde4b98c6aca37.tar.gz core-168fc5c022538d287293bf933adde4b98c6aca37.zip |
Removed MSFilterTracer and all references to it
Diffstat (limited to 'filter/inc')
-rw-r--r-- | filter/inc/filter/msfilter/msdffimp.hxx | 7 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/msfiltertracer.hxx | 97 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/svdfppt.hxx | 4 |
3 files changed, 3 insertions, 105 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index 1616adbaa162..be40fda1fe8d 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> @@ -576,7 +575,6 @@ public: DffRecordManager maShapeRecords; ColorData mnDefaultColor; - MSFilterTracer* mpTracer; sal_Bool mbTracing; Color MSO_TEXT_CLR_ToColor( sal_uInt32 nColorCode ) const; @@ -619,12 +617,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 e8fd0490c979..000000000000 --- a/filter/inc/filter/msfilter/msfiltertracer.hxx +++ /dev/null @@ -1,97 +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 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; -}; - -#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 69809177c159..f1ac113188fd 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 |