sc/source/filter/excel/impop.cxx | 2
sc/source/filter/excel/xlroot.cxx | 4 -
sc/source/filter/excel/xltracer.cxx | 103 ++----------------------------------
sc/source/filter/inc/xltracer.hxx | 19 +-----
4 files changed, 11 insertions(+), 117 deletions(-)
New commits:
commit 4c5f388aa40036afea2a51156a41f4eea7ef1d7a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Feb 24 14:04:20 2012 +0100
-Werror=unused-parameter
Not sure if this rather radical shrinking of XclTracer is good, though (or
if the class already has become obsolete anyway)?
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 533bbb9..c7504ce 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -1088,7 +1088,7 @@ void ImportExcel::TableOp( void )
else
{
bTabTruncated = sal_True;
- GetTracer().TraceInvalidRow(GetCurrScTab(), nLastRow, MAXROW);
+ GetTracer().TraceInvalidRow(nLastRow, MAXROW);
}
}
diff --git a/sc/source/filter/excel/xlroot.cxx
b/sc/source/filter/excel/xlroot.cxx
index 0177ce4..cfd8805 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -183,9 +183,7 @@ XclRoot::XclRoot( XclRootData& rRootData ) :
// filter tracer
// do not use CREATE_OUSTRING for conditional expression
- mrData.mxTracer.reset( new XclTracer( GetDocUrl(), IsExport() ?
-
OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Tracing/Export/Excel"))
- :
OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Tracing/Import/Excel" )) ) );
+ mrData.mxTracer.reset( new XclTracer( GetDocUrl() ) );
}
XclRoot::XclRoot( const XclRoot& rRoot ) :
diff --git a/sc/source/filter/excel/xltracer.cxx
b/sc/source/filter/excel/xltracer.cxx
index 586d47f..8600d80 100644
--- a/sc/source/filter/excel/xltracer.cxx
+++ b/sc/source/filter/excel/xltracer.cxx
@@ -36,48 +36,7 @@ using ::rtl::OUString;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::PropertyValue;
-// ============================================================================
-
-// Trace Table details are grouped by functionality using the context entry.
-// Each separate context starts at the next 1000 interval. New entries should
-// be added to their appropriate context. New contexts should be added onto
-// the end. Any gaps in the 1000 sequence or within the 1000 are the result
-// of trace events no longer present.
-static const XclTracerDetails pTracerDetails[] =
-{
- { eUnKnown, 0, "UNKNOWN", "UNKNOWN",
"Unknown trace property." },
- { eRowLimitExceeded, 1000, "Limits", "Sheet", "Row
limit exceeded." },
- { eTabLimitExceeded, 1001, "Limits", "Sheet", "Sheet
limit exceeded." },
- { ePassword, 2000, "Protection", "Password",
"Document is password protected." },
- { ePrintRange, 3000, "Print", "Print Range", "Print
Range present." },
- { eShortDate, 4000, "CellFormatting", "Short Dates",
"Possible Date format issue." },
- { eBorderLineStyle, 4004, "CellFormatting", "Border", "Line
style not supported.", },
- { eFillPattern, 4005, "CellFormatting", "Pattern", "Fill
Pattern not supported.", },
- { eInvisibleGrid, 5000, "Properties", "Grid Invisible", "Grid
invisible on first sheet." },
- { eFormattedNote, 6000, "Notes", "Formatting", "Text
may be formatted." },
- { eFormulaExtName, 7000, "Formula", "External Name",
"External names not supported." },
- { eFormulaMissingArg, 7001, "Formula", "Missing
Argument","Parameter missing." },
- { ePivotDataSource, 8000, "Chart", "Pivot",
"External data source not supported."},
- { ePivotChartExists, 8001, "Chart", "Pivot", "Pivot
Chart not supported."},
- { eChartUnKnownType, 8002, "Chart", "Type", "Chart
Type not supported."},
- { eChartTrendLines, 8003, "Chart", "Type", "Chart
trendlines not supported."},
- { eChartOnlySheet, 8004, "Chart", "Type", "Chart
only sheet not supported."},
- { eChartRange, 8005, "Chart", "Source Data", "Chart
source ranges too complex."},
- { eChartDSName, 8006, "Chart", "Source Data",
"Series titles not linked to cells."},
- { eChartDataTable, 8007, "Chart", "Legend", "Data
table not supported."},
- { eChartLegendPosition, 8008, "Chart", "Legend",
"Position not guaranteed."},
- { eChartTextFormatting, 8009, "Chart", "Formatting", "Text
formatting present."},
- { eChartEmbeddedObj, 8010, "Chart", "Area",
"Object inside chart."},
- { eChartAxisAuto, 8012, "Chart", "Axis", "Axis
interval is automatic."},
- { eChartInvalidXY, 8013, "Chart", "Scatter",
"Unsupported or invalid data range for XY chart."},
- { eChartErrorBars, 8014, "Chart", "Type", "Chart
error bars not supported."},
- { eChartAxisManual, 8015, "Chart", "Axis",
"Manual axis crossing point adjusted."},
- { eUnsupportedObject, 9000, "Object", "Type",
"Limited Object support."},
- { eObjectNotPrintable, 9001, "Object", "Print",
"Object not printable."},
- { eDVType, 10000, "DataValidation", "Type",
"Custom type present."}
-};
-
-XclTracer::XclTracer( const String& rDocUrl, const OUString& rConfigPath ) :
+XclTracer::XclTracer( const String& rDocUrl ) :
maFirstTimes(eTraceLength,true)
{
Sequence< PropertyValue > aConfigData( 1 );
@@ -89,80 +48,30 @@ XclTracer::~XclTracer()
{
}
-void XclTracer::AddAttribute( const OUString& rName, const OUString& rValue )
-{
-}
-
-void XclTracer::Trace( const OUString& rElementID, const OUString& rMessage )
-{
-}
-
-void XclTracer::TraceLog( XclTracerId eProblem, sal_Int32 nValue )
-{
- if( mbEnabled )
- {
- OUString sID( CREATE_STRING( "SC" ) );
- sID += OUString::valueOf( static_cast< sal_Int32 >( pTracerDetails[
eProblem ].mnID ) );
- OUString sProblem = OUString::createFromAscii( pTracerDetails[
eProblem ].mpProblem );
-
- switch (eProblem)
- {
- case eRowLimitExceeded:
- Context(eProblem,static_cast<SCTAB>(nValue));
- break;
- case eTabLimitExceeded:
- Context(eProblem,static_cast<SCTAB>(nValue));
- break;
- default:
- Context(eProblem);
- break;
- }
- Trace(sID, sProblem);
- }
-}
-
-void XclTracer::Context( XclTracerId eProblem, SCTAB nTab )
-{
- OUString sContext = OUString::createFromAscii( pTracerDetails[ eProblem
].mpContext );
- OUString sDetail = OUString::createFromAscii( pTracerDetails[ eProblem
].mpDetail );
-
- switch (eProblem)
- {
- case eRowLimitExceeded:
- case eTabLimitExceeded:
- sDetail += OUString::valueOf( static_cast< sal_Int32 >( nTab + 1 )
);
- break;
- default:
- break;
- }
- AddAttribute(sContext, sDetail);
-}
-
-void XclTracer::ProcessTraceOnce(XclTracerId eProblem, SCTAB nTab)
+void XclTracer::ProcessTraceOnce(XclTracerId eProblem)
{
if( mbEnabled && maFirstTimes[eProblem])
{
- TraceLog(pTracerDetails[eProblem].meProblemId, nTab);
maFirstTimes[eProblem] = false;
}
}
void XclTracer::TraceInvalidAddress( const ScAddress& rPos, const ScAddress&
rMaxPos )
{
- TraceInvalidRow(rPos.Tab(), rPos.Row(), rMaxPos.Row());
+ TraceInvalidRow(rPos.Row(), rMaxPos.Row());
TraceInvalidTab(rPos.Tab(), rMaxPos.Tab());
}
-void XclTracer::TraceInvalidRow( SCTAB nTab, sal_uInt32 nRow, sal_uInt32
nMaxRow )
+void XclTracer::TraceInvalidRow( sal_uInt32 nRow, sal_uInt32 nMaxRow )
{
if(nRow > nMaxRow)
- ProcessTraceOnce(eRowLimitExceeded, nTab);
+ ProcessTraceOnce(eRowLimitExceeded);
}
void XclTracer::TraceInvalidTab( SCTAB nTab, SCTAB nMaxTab )
{
if(nTab > nMaxTab)
- ProcessTraceOnce(eTabLimitExceeded, nTab);
+ ProcessTraceOnce(eTabLimitExceeded);
}
void XclTracer::TracePrintRange()
diff --git a/sc/source/filter/inc/xltracer.hxx
b/sc/source/filter/inc/xltracer.hxx
index 7186569..6c3ac78 100644
--- a/sc/source/filter/inc/xltracer.hxx
+++ b/sc/source/filter/inc/xltracer.hxx
@@ -87,30 +87,17 @@ struct XclTracerDetails
class XclTracer
{
public:
- explicit XclTracer( const String& rDocUrl, const
::rtl::OUString& rConfigPath );
+ explicit XclTracer( const String& rDocUrl );
virtual ~XclTracer();
/** Returns true, if tracing is enabled. */
inline bool IsEnabled() const { return mbEnabled; }
- /** Adds an attribute to be traced with the next Trace() call. */
- void AddAttribute( const ::rtl::OUString& rName,
const ::rtl::OUString& rValue );
-
- /** Creates an element including all attributes set up to this call.
- @descr Removes all attributes after the element is traced. */
- void Trace( const ::rtl::OUString& rElementID,
const ::rtl::OUString& rMessage );
-
- /** Calls Trace() with a known document properties problem. */
- void TraceLog( XclTracerId eProblem, sal_Int32
nValue = 0 );
-
- /** Calls AddAttribute() to create the Context & Detail for known
problems. */
- void Context( XclTracerId eProblem, SCTAB nTab = 0
);
-
/** Ensure that particular traces are logged once per document. */
- void ProcessTraceOnce(XclTracerId eProblem, SCTAB
nTab = 0);
+ void ProcessTraceOnce(XclTracerId eProblem);
void TraceInvalidAddress(const ScAddress& rPos,
const ScAddress& rMaxPos);
- void TraceInvalidRow( SCTAB nTab, sal_uInt32 nRow,
sal_uInt32 nMaxrow );
+ void TraceInvalidRow( sal_uInt32 nRow, sal_uInt32
nMaxrow );
void TraceInvalidTab( SCTAB nTab, SCTAB nMaxTab);
void TracePrintRange();
void TraceDates(sal_uInt16 nNumFmt);
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
