diff options
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/tracer.cxx | 76 | ||||
| -rw-r--r-- | sw/source/filter/ww8/tracer.hxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 3 |
3 files changed, 1 insertions, 81 deletions
diff --git a/sw/source/filter/ww8/tracer.cxx b/sw/source/filter/ww8/tracer.cxx index d9b2fc407f62..a0009b2fad80 100644 --- a/sw/source/filter/ww8/tracer.cxx +++ b/sw/source/filter/ww8/tracer.cxx @@ -29,7 +29,6 @@ #include <tools/urlobj.hxx> //INetURLObject #include <sfx2/docfile.hxx> //SfxMedium -#include <filter/msfilter/msfiltertracer.hxx> //MSFilterTracer #include "tracer.hxx" //sw::log::Tracer using rtl::OUString; @@ -42,7 +41,6 @@ namespace sw namespace log { Tracer::Tracer(const SfxMedium &rMed) - : mpTrace(0) { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -54,87 +52,16 @@ namespace sw aPropValue.Name = C2O("DocumentURL"); aConfig[0] = aPropValue; OUString aTraceConfigPath(CAU("Office.Tracing/Import/Word")); - mpTrace = new MSFilterTracer(aTraceConfigPath, &aConfig); - if (mpTrace) - mpTrace->StartTracing(); } Tracer::~Tracer() { - if (mpTrace) - { - mpTrace->EndTracing(); - delete mpTrace; - } } void Tracer::Log(Problem eProblem) { - if (!mpTrace) - return; - OUString sID(CAU("sw")); sID += rtl::OUString::valueOf(static_cast<sal_Int32>(eProblem)); - switch (eProblem) - { - case ePrinterMetrics: - mpTrace->Trace(sID, COMMENT("PrinterMetrics")); - break; - case eExtraLeading: - mpTrace->Trace(sID, COMMENT("Extra Leading")); - break; - case eTabStopDistance: - mpTrace->Trace(sID, COMMENT("Minimum Tab Distance")); - break; - case eDontUseHTMLAutoSpacing: - mpTrace->Trace(sID, COMMENT("HTML AutoSpacing")); - break; - case eAutoWidthFrame: - mpTrace->Trace(sID, COMMENT("AutoWidth")); - break; - case eRowCanSplit: - mpTrace->Trace(sID, COMMENT("Splitable Row")); - break; - case eSpacingBetweenCells: - mpTrace->Trace(sID, COMMENT("Spacing Between Cells")); - break; - case eTabInNumbering: - mpTrace->Trace(sID, COMMENT("Tab In Numbering")); - break; - case eNegativeVertPlacement: - mpTrace->Trace(sID, - COMMENT("Negative Vertical Placement")); - break; - case eAutoColorBg: - mpTrace->Trace(sID, - COMMENT("Bad Background for Autocolour")); - break; - case eTooWideAsChar: - mpTrace->Trace(sID, - COMMENT("Inline wider than TextArea")); - break; - case eAnimatedText: - mpTrace->Trace(sID, - COMMENT("Animated Text")); - break; - case eDontAddSpaceForEqualStyles: - mpTrace->Trace(sID, - COMMENT("Don't Add Space between Equal Style")); - break; - case eBorderDistOutside: - mpTrace->Trace(sID, - COMMENT("Word draws the border outside")); - break; - case eContainsVisualBasic: - mpTrace->Trace(sID, COMMENT("Contains VBA")); - break; - case eContainsWordBasic: - mpTrace->Trace(sID, COMMENT("Contains Word Basic")); - break; - default: - mpTrace->Trace(sID, COMMENT("UNKNOWN")); - break; - } } rtl::OUString Tracer::GetContext(Environment eContext) const @@ -188,18 +115,15 @@ namespace sw void Tracer::EnterEnvironment(Environment eContext) { - mpTrace->AddAttribute(GetContext(eContext), GetDetails(eContext)); } void Tracer::EnterEnvironment(Environment eContext, const rtl::OUString &rDetails) { - mpTrace->AddAttribute(GetContext(eContext), rDetails); } void Tracer::LeaveEnvironment(Environment eContext) { - mpTrace->RemoveAttribute(GetContext(eContext)); } } } diff --git a/sw/source/filter/ww8/tracer.hxx b/sw/source/filter/ww8/tracer.hxx index df6d7c497108..60923d5ad493 100644 --- a/sw/source/filter/ww8/tracer.hxx +++ b/sw/source/filter/ww8/tracer.hxx @@ -31,7 +31,6 @@ #include <rtl/ustring.hxx> //rtl::OUString -class MSFilterTracer; class SfxMedium; namespace sw @@ -71,12 +70,10 @@ namespace sw class Tracer { private: - MSFilterTracer *mpTrace; rtl::OUString GetContext(Environment eContext) const; rtl::OUString GetDetails(Environment eContext) const; public: Tracer(const SfxMedium &rMedium); - MSFilterTracer *GetTrace() const { return mpTrace; } void EnterEnvironment(Environment eContext); void EnterEnvironment(Environment eContext, const rtl::OUString &rDetails); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index a50a8ff5b15a..5d2fa423b54a 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -310,8 +310,7 @@ Sttb::getStringAtIndex( sal_uInt32 index ) SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr ) : SvxMSDffManager(*rRdr.pTableStream, rRdr.GetBaseURL(), rRdr.pWwFib->fcDggInfo, - rRdr.pDataStream, 0, 0, COL_WHITE, 12, rRdr.pStrm, - rRdr.maTracer.GetTrace()), + rRdr.pDataStream, 0, 0, COL_WHITE, 12, rRdr.pStrm), rReader(rRdr), pFallbackStream(0) { SetSvxMSDffSettings( GetSvxMSDffSettings() ); |