[Libreoffice-commits] core.git: sc/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Aug 15 06:34:51 UTC 2017
sc/source/core/data/fillinfo.cxx | 6
sc/source/core/tool/scmatrix.cxx | 28 +--
sc/source/filter/excel/xeescher.cxx | 8 -
sc/source/filter/excel/xepivot.cxx | 4
sc/source/filter/excel/xichart.cxx | 2
sc/source/filter/excel/xiescher.cxx | 4
sc/source/filter/excel/xlchart.cxx | 2
sc/source/filter/excel/xlescher.cxx | 2
sc/source/filter/html/htmlpars.cxx | 6
sc/source/filter/inc/connectionsbuffer.hxx | 2
sc/source/filter/inc/eeimport.hxx | 2
sc/source/filter/inc/htmlpars.hxx | 2
sc/source/filter/inc/orcusinterface.hxx | 2
sc/source/filter/inc/richstring.hxx | 4
sc/source/filter/inc/rtfparse.hxx | 2
sc/source/filter/inc/xcl97rec.hxx | 2
sc/source/filter/inc/xepivot.hxx | 2
sc/source/filter/inc/xiescher.hxx | 2
sc/source/filter/inc/xlchart.hxx | 1
sc/source/filter/inc/xlescher.hxx | 2
sc/source/filter/oox/connectionsbuffer.cxx | 2
sc/source/filter/oox/connectionsfragment.cxx | 2
sc/source/filter/oox/richstring.cxx | 4
sc/source/filter/oox/richstringcontext.cxx | 4
sc/source/filter/orcus/interface.cxx | 4
sc/source/filter/rtf/eeimpars.cxx | 4
sc/source/filter/rtf/rtfparse.cxx | 6
sc/source/filter/xcl97/xcl97rec.cxx | 2
sc/source/filter/xml/XMLCalculationSettingsContext.cxx | 7
sc/source/filter/xml/XMLCalculationSettingsContext.hxx | 6
sc/source/filter/xml/XMLCellRangeSourceContext.cxx | 1
sc/source/filter/xml/XMLCellRangeSourceContext.hxx | 1
sc/source/filter/xml/XMLConsolidationContext.cxx | 1
sc/source/filter/xml/XMLConsolidationContext.hxx | 1
sc/source/filter/xml/XMLDDELinksContext.cxx | 28 +--
sc/source/filter/xml/XMLDDELinksContext.hxx | 17 --
sc/source/filter/xml/XMLDetectiveContext.cxx | 7
sc/source/filter/xml/XMLDetectiveContext.hxx | 3
sc/source/filter/xml/XMLExportDataPilot.cxx | 2
sc/source/filter/xml/XMLExportDataPilot.hxx | 2
sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 4
sc/source/filter/xml/XMLTableHeaderFooterContext.hxx | 1
sc/source/filter/xml/XMLTableShapesContext.cxx | 4
sc/source/filter/xml/XMLTableShapesContext.hxx | 3
sc/source/filter/xml/XMLTableSourceContext.cxx | 1
sc/source/filter/xml/XMLTableSourceContext.hxx | 2
sc/source/filter/xml/XMLTrackedChangesContext.cxx | 133 +++++++----------
sc/source/filter/xml/XMLTrackedChangesContext.hxx | 2
sc/source/filter/xml/celltextparacontext.cxx | 36 ++--
sc/source/filter/xml/celltextparacontext.hxx | 14 -
sc/source/filter/xml/datastreamimport.cxx | 2
sc/source/filter/xml/datastreamimport.hxx | 2
sc/source/filter/xml/xmlannoi.cxx | 6
sc/source/filter/xml/xmlbodyi.cxx | 31 +--
sc/source/filter/xml/xmlcelli.cxx | 6
sc/source/filter/xml/xmlcoli.cxx | 12 -
sc/source/filter/xml/xmlcoli.hxx | 4
sc/source/filter/xml/xmlcondformat.cxx | 36 ++--
sc/source/filter/xml/xmlcondformat.hxx | 18 +-
sc/source/filter/xml/xmlconti.cxx | 1
sc/source/filter/xml/xmlconti.hxx | 3
sc/source/filter/xml/xmlcvali.cxx | 32 +---
sc/source/filter/xml/xmlcvali.hxx | 3
sc/source/filter/xml/xmldpimp.cxx | 73 +++------
sc/source/filter/xml/xmldpimp.hxx | 45 ++---
sc/source/filter/xml/xmldrani.cxx | 39 +---
sc/source/filter/xml/xmldrani.hxx | 21 +-
sc/source/filter/xml/xmlexprt.cxx | 8 -
sc/source/filter/xml/xmlexprt.hxx | 4
sc/source/filter/xml/xmlexternaltabi.cxx | 22 +-
sc/source/filter/xml/xmlexternaltabi.hxx | 12 -
sc/source/filter/xml/xmlfilti.cxx | 24 ---
sc/source/filter/xml/xmlfilti.hxx | 16 --
sc/source/filter/xml/xmlimprt.cxx | 18 --
sc/source/filter/xml/xmllabri.cxx | 7
sc/source/filter/xml/xmllabri.hxx | 5
sc/source/filter/xml/xmlmappingi.cxx | 7
sc/source/filter/xml/xmlmappingi.hxx | 5
sc/source/filter/xml/xmlnexpi.cxx | 10 -
sc/source/filter/xml/xmlnexpi.hxx | 7
sc/source/filter/xml/xmlsceni.cxx | 1
sc/source/filter/xml/xmlsceni.hxx | 2
sc/source/filter/xml/xmlsorti.cxx | 1
sc/source/filter/xml/xmlsorti.hxx | 2
sc/source/filter/xml/xmltabi.cxx | 28 +--
sc/source/filter/xml/xmltabi.hxx | 2
sc/source/ui/Accessibility/AccessibleCell.cxx | 7
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 5
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 5
sc/source/ui/attrdlg/scdlgfact.cxx | 4
sc/source/ui/inc/AccessibleCell.hxx | 3
sc/source/ui/inc/AccessiblePreviewCell.hxx | 3
sc/source/ui/inc/AccessibleSpreadsheet.hxx | 3
sc/source/ui/inc/datafdlg.hxx | 2
sc/source/ui/inc/namepast.hxx | 2
sc/source/ui/inc/viewdata.hxx | 2
sc/source/ui/miscdlgs/datafdlg.cxx | 18 +-
sc/source/ui/namedlg/namepast.cxx | 2
sc/source/ui/unoobj/exceldetect.cxx | 6
sc/source/ui/unoobj/exceldetect.hxx | 2
sc/source/ui/unoobj/scdetect.cxx | 6
sc/source/ui/unoobj/scdetect.hxx | 2
sc/source/ui/vba/vbaeventshelper.cxx | 6
sc/source/ui/vba/vbaeventshelper.hxx | 4
sc/source/ui/view/viewdata.cxx | 4
105 files changed, 417 insertions(+), 573 deletions(-)
New commits:
commit b3dfb1e807eba91eed35a02d74fe8a917c41ee6f
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Aug 2 11:22:38 2017 +0200
loplugin:checkunusedparams in sc
Change-Id: Ib4572899caeb7bc2dceb2c188ceb306b8ffc9193
Reviewed-on: https://gerrit.libreoffice.org/40629
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index a7d991275817..a27df4c048c3 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -50,7 +50,7 @@
static void lcl_GetMergeRange( SCCOL nX, SCROW nY, SCSIZE nArrY,
ScDocument* pDoc, RowInfo* pRowInfo,
- SCCOL nX1, SCROW nY1, SCCOL /* nX2 */, SCROW /* nY2 */, SCTAB nTab,
+ SCCOL nX1, SCROW nY1, SCTAB nTab,
SCCOL& rStartX, SCROW& rStartY, SCCOL& rEndX, SCROW& rEndY )
{
CellInfo* pInfo = &pRowInfo[nArrY].pCellInfo[nX+1];
@@ -739,7 +739,7 @@ void ScDocument::FillInfo(
SCROW nStartY;
SCCOL nEndX;
SCROW nEndY;
- lcl_GetMergeRange( nSignedX,nSignedY, nArrRow, this,pRowInfo, nCol1,nRow1,nCol2,nRow2,nTab,
+ lcl_GetMergeRange( nSignedX,nSignedY, nArrRow, this,pRowInfo, nCol1,nRow1,nTab,
nStartX,nStartY, nEndX,nEndY );
const ScPatternAttr* pStartPattern = GetPattern( nStartX,nStartY,nTab );
const SfxItemSet* pStartCond = GetCondResult( nStartX,nStartY,nTab );
@@ -976,7 +976,7 @@ void ScDocument::FillInfo(
SCCOL nFirstRealDocColS, nLastRealDocColS;
SCROW nFirstRealDocRowS, nLastRealDocRowS;
lcl_GetMergeRange( nCurrDocCol, nCurrDocRow,
- nCellInfoY, this, pRowInfo, nCol1,nRow1,nCol2,nRow2,nTab,
+ nCellInfoY, this, pRowInfo, nCol1,nRow1,nTab,
nFirstRealDocColS, nFirstRealDocRowS, nLastRealDocColS, nLastRealDocRowS );
// *complete* merged range in document coordinates
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index f1b9472e3fb2..670041ffe275 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -2539,7 +2539,7 @@ void ScMatrixImpl::CalcPosition(SCSIZE nIndex, SCSIZE& rC, SCSIZE& rR) const
namespace {
-size_t get_index(SCSIZE nMaxRow, SCSIZE /*nMaxCol*/, size_t nRow, size_t nCol, size_t nRowOffset, size_t nColOffset)
+size_t get_index(SCSIZE nMaxRow, size_t nRow, size_t nCol, size_t nRowOffset, size_t nColOffset)
{
return nMaxRow * (nCol + nColOffset) + nRow + nRowOffset;
}
@@ -2569,13 +2569,13 @@ void ScMatrixImpl::MatConcat(SCSIZE nMaxCol, SCSIZE nMaxRow, const ScMatrixRef&
FormulaError nErr = GetDoubleErrorValue(nVal);
if (nErr != FormulaError::NONE)
{
- aValid[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] = false;
- nErrors[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] = nErr;
+ aValid[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] = false;
+ nErrors[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] = nErr;
return;
}
OUString aStr;
rFormatter.GetInputLineString( nVal, nKey, aStr);
- aString[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] = aString[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] + aStr;
+ aString[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] = aString[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] + aStr;
};
std::function<void(size_t, size_t, bool)> aBoolFunc =
@@ -2583,13 +2583,13 @@ void ScMatrixImpl::MatConcat(SCSIZE nMaxCol, SCSIZE nMaxRow, const ScMatrixRef&
{
OUString aStr;
rFormatter.GetInputLineString( nVal ? 1.0 : 0.0, nKey, aStr);
- aString[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] = aString[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] + aStr;
+ aString[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] = aString[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] + aStr;
};
std::function<void(size_t, size_t, const svl::SharedString&)> aStringFunc =
[&](size_t nRow, size_t nCol, const svl::SharedString& aStr)
{
- aString[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] = aString[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] + aStr.getString();
+ aString[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] = aString[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] + aStr.getString();
};
std::function<void(size_t, size_t)> aEmptyFunc =
@@ -2631,13 +2631,13 @@ void ScMatrixImpl::MatConcat(SCSIZE nMaxCol, SCSIZE nMaxRow, const ScMatrixRef&
FormulaError nErr = GetDoubleErrorValue(nVal);
if (nErr != FormulaError::NONE)
{
- aValid[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] = false;
- nErrors[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] = nErr;
+ aValid[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] = false;
+ nErrors[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] = nErr;
return;
}
OUString aStr;
rFormatter.GetInputLineString( nVal, nKey, aStr);
- aSharedString[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] = rStringPool.intern(aString[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] + aStr);
+ aSharedString[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] = rStringPool.intern(aString[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] + aStr);
};
std::function<void(size_t, size_t, bool)> aBoolFunc2 =
@@ -2645,21 +2645,21 @@ void ScMatrixImpl::MatConcat(SCSIZE nMaxCol, SCSIZE nMaxRow, const ScMatrixRef&
{
OUString aStr;
rFormatter.GetInputLineString( nVal ? 1.0 : 0.0, nKey, aStr);
- aSharedString[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] = rStringPool.intern(aString[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] + aStr);
+ aSharedString[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] = rStringPool.intern(aString[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] + aStr);
};
std::function<void(size_t, size_t, const svl::SharedString&)> aStringFunc2 =
[&](size_t nRow, size_t nCol, const svl::SharedString& aStr)
{
- aSharedString[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] =
- rStringPool.intern(aString[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] + aStr.getString());
+ aSharedString[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] =
+ rStringPool.intern(aString[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] + aStr.getString());
};
std::function<void(size_t, size_t)> aEmptyFunc2 =
[&](size_t nRow, size_t nCol)
{
- aSharedString[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)] =
- rStringPool.intern(aString[get_index(nMaxRow, nMaxCol, nRow, nCol, nRowOffset, nColOffset)]);
+ aSharedString[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)] =
+ rStringPool.intern(aString[get_index(nMaxRow, nRow, nCol, nRowOffset, nColOffset)]);
};
nRowOffset = 0;
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 2e32dbb906af..f676b7ef9d0a 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -578,7 +578,7 @@ XclExpOcxControlObj::XclExpOcxControlObj( XclExpObjectManager& rObjMgr, Referenc
aPropOpt.Commit( mrEscherEx.GetStream() );
// anchor
- ImplWriteAnchor( GetRoot(), SdrObject::getSdrObjectFromXShape( xShape ), pChildAnchor );
+ ImplWriteAnchor( SdrObject::getSdrObjectFromXShape( xShape ), pChildAnchor );
mrEscherEx.AddAtom( 0, ESCHER_ClientData ); // OBJ record
mrEscherEx.CloseContainer(); // ESCHER_SpContainer
@@ -728,7 +728,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference<
aPropOpt.Commit( mrEscherEx.GetStream() );
// anchor
- ImplWriteAnchor( GetRoot(), SdrObject::getSdrObjectFromXShape( xShape ), pChildAnchor );
+ ImplWriteAnchor( SdrObject::getSdrObjectFromXShape( xShape ), pChildAnchor );
mrEscherEx.AddAtom( 0, ESCHER_ClientData ); // OBJ record
mrEscherEx.UpdateDffFragmentEnd();
@@ -1089,7 +1089,7 @@ XclExpChartObj::XclExpChartObj( XclExpObjectManager& rObjMgr, Reference< XShape
// anchor
SdrObject* pSdrObj = SdrObject::getSdrObjectFromXShape( xShape );
- ImplWriteAnchor( GetRoot(), pSdrObj, pChildAnchor );
+ ImplWriteAnchor( pSdrObj, pChildAnchor );
// client data (the following OBJ record)
mrEscherEx.AddAtom( 0, ESCHER_ClientData );
@@ -1366,7 +1366,7 @@ void XclMacroHelper::WriteMacroSubRec( XclExpStream& rStrm )
bool
XclMacroHelper::SetMacroLink( const ScriptEventDescriptor& rEvent, const XclTbxEventType& nEventType )
{
- OUString aMacroName = XclControlHelper::ExtractFromMacroDescriptor( rEvent, nEventType, GetDocShell() );
+ OUString aMacroName = XclControlHelper::ExtractFromMacroDescriptor( rEvent, nEventType );
if( !aMacroName.isEmpty() )
{
return SetMacroLink( aMacroName );
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index 653fd6f945fe..171837c8cac5 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -1168,7 +1168,7 @@ void XclExpPTField::WriteSxvdex( XclExpStream& rStrm ) const
rStrm.EndRecord();
}
-XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& rDPObj, const XclExpPivotCache& rPCache, size_t ) :
+XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& rDPObj, const XclExpPivotCache& rPCache ) :
XclExpRoot( rRoot ),
mrPCache( rPCache ),
maDataOrientField( *this, EXC_SXIVD_DATA ),
@@ -1622,7 +1622,7 @@ void XclExpPivotTableManager::CreatePivotTables()
{
ScDPObject& rDPObj = (*pDPColl)[ nDPObj ];
if( const XclExpPivotCache* pPCache = CreatePivotCache( rDPObj ) )
- maPTableList.AppendNewRecord( new XclExpPivotTable( GetRoot(), rDPObj, *pPCache, nDPObj ) );
+ maPTableList.AppendNewRecord( new XclExpPivotTable( GetRoot(), rDPObj, *pPCache ) );
}
}
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 941550bfb097..3d034c5d1db3 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -368,7 +368,7 @@ void XclImpChRoot::ConvertEscherFormat( ScfPropertySet& rPropSet,
sal_uInt32 nDffFillType, XclChPropertyMode ePropMode ) const
{
GetChartPropSetHelper().WriteEscherProperties( rPropSet,
- *mxChData->mxGradientTable, *mxChData->mxHatchTable, *mxChData->mxBitmapTable,
+ *mxChData->mxGradientTable, *mxChData->mxBitmapTable,
rEscherFmt, pPicFmt, nDffFillType, ePropMode );
}
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 8a8403f9b9e4..a5dfbf1b5332 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3827,7 +3827,7 @@ Graphic XclImpDrawing::ReadImgData( const XclImpRoot& rRoot, XclImpStream& rStrm
{
switch( nFormat )
{
- case EXC_IMGDATA_WMF: ReadWmf( aGraphic, rRoot, rStrm ); break;
+ case EXC_IMGDATA_WMF: ReadWmf( aGraphic, rStrm ); break;
case EXC_IMGDATA_BMP: ReadBmp( aGraphic, rRoot, rStrm ); break;
default: OSL_FAIL( "XclImpDrawing::ReadImgData - unknown image format" );
}
@@ -3984,7 +3984,7 @@ void XclImpDrawing::AppendRawObject( const XclImpDrawObjRef& rxDrawObj )
// private --------------------------------------------------------------------
-void XclImpDrawing::ReadWmf( Graphic& rGraphic, const XclImpRoot&, XclImpStream& rStrm ) // static helper
+void XclImpDrawing::ReadWmf( Graphic& rGraphic, XclImpStream& rStrm ) // static helper
{
// extract graphic data from IMGDATA and following CONTINUE records
rStrm.Ignore( 8 );
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index 24b852def5b0..05500c5b730d 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -1008,7 +1008,7 @@ void XclChPropSetHelper::WriteAreaProperties( ScfPropertySet& rPropSet,
}
void XclChPropSetHelper::WriteEscherProperties( ScfPropertySet& rPropSet,
- XclChObjectTable& rGradientTable, XclChObjectTable& /*rHatchTable*/, XclChObjectTable& rBitmapTable,
+ XclChObjectTable& rGradientTable, XclChObjectTable& rBitmapTable,
const XclChEscherFormat& rEscherFmt, const XclChPicFormat* pPicFmt,
sal_uInt32 nDffFillType, XclChPropertyMode ePropMode )
{
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index dc25c1bdc0d7..722922935069 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -330,7 +330,7 @@ bool XclControlHelper::FillMacroDescriptor( ScriptEventDescriptor& rDescriptor,
}
OUString XclControlHelper::ExtractFromMacroDescriptor(
- const ScriptEventDescriptor& rDescriptor, XclTbxEventType eEventType, SfxObjectShell* /*pShell*/ )
+ const ScriptEventDescriptor& rDescriptor, XclTbxEventType eEventType )
{
if( (!rDescriptor.ScriptCode.isEmpty()) &&
rDescriptor.ScriptType.equalsIgnoreAsciiCase("Script") &&
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index d5b406c1e0e6..408fbbc1ab24 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -2871,7 +2871,7 @@ void ScHTMLQueryParser::ProcessToken( const HtmlImportInfo& rInfo )
case HtmlTokenId::META: MetaOn( rInfo ); break; // <meta>
// --- title handling ---
- case HtmlTokenId::TITLE_ON: TitleOn( rInfo ); break; // <title>
+ case HtmlTokenId::TITLE_ON: TitleOn(); break; // <title>
case HtmlTokenId::TITLE_OFF: TitleOff( rInfo ); break; // </title>
case HtmlTokenId::STYLE_ON: break;
@@ -3010,7 +3010,7 @@ void ScHTMLQueryParser::MetaOn( const HtmlImportInfo& rInfo )
}
}
-void ScHTMLQueryParser::TitleOn( const HtmlImportInfo& /*rInfo*/ )
+void ScHTMLQueryParser::TitleOn()
{
mbTitleOn = true;
maTitle.setLength(0);
@@ -3092,7 +3092,7 @@ public:
static void at_rule_name(const char* /*p*/, size_t /*n*/)
{
- // TODO: For now, we ignore at-rule properties.
+ // TODO: For now, we ignore at-rule properties
}
void property_name(const char* p, size_t n)
diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx
index c6cba16e9a2f..5926a86bc85e 100644
--- a/sc/source/filter/inc/connectionsbuffer.hxx
+++ b/sc/source/filter/inc/connectionsbuffer.hxx
@@ -101,7 +101,7 @@ public:
/** Imports web query settings from the webPr element. */
void importWebPr( const AttributeList& rAttribs );
/** Imports web query table settings from the tables element. */
- void importTables( const AttributeList& rAttribs );
+ void importTables();
/** Imports a web query table identifier from the m, s, or x element. */
void importTable( const AttributeList& rAttribs, sal_Int32 nElement );
diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx
index c65db788e7d7..11101c94c73c 100644
--- a/sc/source/filter/inc/eeimport.hxx
+++ b/sc/source/filter/inc/eeimport.hxx
@@ -46,7 +46,7 @@ protected:
mpParser; // must reset before mpEngine resets
RowHeightMap maRowHeights;
- bool GraphicSize( SCCOL nCol, SCROW nRow, SCTAB nTab,
+ bool GraphicSize( SCCOL nCol, SCROW nRow,
ScEEParseEntry* );
void InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab,
ScEEParseEntry* );
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index 1e701a9eae50..649f5ca3b49f 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -586,7 +586,7 @@ private:
/** Processes the <meta> tag. */
void MetaOn( const HtmlImportInfo& rInfo );
/** Opens the title of the HTML document (<title> tag). */
- void TitleOn( const HtmlImportInfo& rInfo );
+ void TitleOn();
/** Closes the title of the HTML document (</title> tag). */
void TitleOff( const HtmlImportInfo& rInfo );
diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
index 8c1be9c65975..a6e62a1c870f 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -148,7 +148,7 @@ private:
class ScOrcusAutoFilter : public orcus::spreadsheet::iface::import_auto_filter
{
public:
- ScOrcusAutoFilter(ScDocument& rDoc);
+ ScOrcusAutoFilter();
virtual ~ScOrcusAutoFilter() override;
diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx
index 4be4a1fce142..6cf0fe1c3eed 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -211,9 +211,9 @@ public:
explicit RichString( const WorkbookHelper& rHelper );
/** Appends and returns a portion object for a plain string (t element). */
- RichStringPortionRef importText( const AttributeList& rAttribs );
+ RichStringPortionRef importText();
/** Appends and returns a portion object for a new formatting run (r element). */
- RichStringPortionRef importRun( const AttributeList& rAttribs );
+ RichStringPortionRef importRun();
/** Appends and returns a phonetic text object for a new phonetic run (rPh element). */
RichStringPhoneticRef importPhoneticRun( const AttributeList& rAttribs );
/** Imports phonetic settings from the rPhoneticPr element. */
diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx
index 9d6b052e62d5..9817dca66536 100644
--- a/sc/source/filter/inc/rtfparse.hxx
+++ b/sc/source/filter/inc/rtfparse.hxx
@@ -68,7 +68,7 @@ private:
void ProcToken( RtfImportInfo* );
void ColAdjust();
bool SeekTwips( sal_uInt16 nTwips, SCCOL* pCol );
- void NewCellRow( RtfImportInfo* );
+ void NewCellRow();
public:
ScRTFParser( EditEngine* );
diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx
index 2d352456f6ba..d8221286b3fb 100644
--- a/sc/source/filter/inc/xcl97rec.hxx
+++ b/sc/source/filter/inc/xcl97rec.hxx
@@ -105,7 +105,7 @@ protected:
See SetOwnEscher() for details. */
explicit XclObj( XclExpObjectManager& rObjMgr, sal_uInt16 nObjType, bool bOwnEscher = false );
- void ImplWriteAnchor( const XclExpRoot& rRoot, const SdrObject* pSdrObj, const tools::Rectangle* pChildAnchor );
+ void ImplWriteAnchor( const SdrObject* pSdrObj, const tools::Rectangle* pChildAnchor );
// overwritten for writing MSODRAWING record
virtual void WriteBody( XclExpStream& rStrm ) override;
diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx
index 7cdc3892bb26..a5e048fa986f 100644
--- a/sc/source/filter/inc/xepivot.hxx
+++ b/sc/source/filter/inc/xepivot.hxx
@@ -321,7 +321,7 @@ class XclExpPivotTable : public XclExpRecordBase, protected XclExpRoot
{
public:
explicit XclExpPivotTable( const XclExpRoot& rRoot,
- const ScDPObject& rDPObj, const XclExpPivotCache& rPCache, size_t nId );
+ const ScDPObject& rDPObj, const XclExpPivotCache& rPCache );
/** Returns a pivot cache field. */
const XclExpPCField* GetCacheField( sal_uInt16 nCacheIdx ) const;
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index d1a359e4c7b9..03c554495b90 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -1094,7 +1094,7 @@ protected:
private:
/** Reads and returns a bitmap from WMF/PICT format. */
- static void ReadWmf( Graphic& rGraphic, const XclImpRoot& rRoot, XclImpStream& rStrm );
+ static void ReadWmf( Graphic& rGraphic, XclImpStream& rStrm );
/** Reads and returns a bitmap from BMP format. */
static void ReadBmp( Graphic& rGraphic, const XclImpRoot& rRoot, XclImpStream& rStrm );
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index 67cc3646e379..f59901f88131 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -1352,7 +1352,6 @@ public:
void WriteEscherProperties(
ScfPropertySet& rPropSet,
XclChObjectTable& rGradientTable,
- XclChObjectTable& rHatchTable,
XclChObjectTable& rBitmapTable,
const XclChEscherFormat& rEscherFmt,
const XclChPicFormat* pPicFmt,
diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx
index 95672abf679f..dc28000ecce4 100644
--- a/sc/source/filter/inc/xlescher.hxx
+++ b/sc/source/filter/inc/xlescher.hxx
@@ -432,7 +432,7 @@ public:
/** Tries to extract an Excel macro name from the passed macro descriptor. */
static OUString ExtractFromMacroDescriptor(
const css::script::ScriptEventDescriptor& rDescriptor,
- XclTbxEventType eEventType, SfxObjectShell* pShell );
+ XclTbxEventType eEventType );
};
#endif
diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx
index c90d9ba408ba..dc7c9bc18b3b 100644
--- a/sc/source/filter/oox/connectionsbuffer.cxx
+++ b/sc/source/filter/oox/connectionsbuffer.cxx
@@ -152,7 +152,7 @@ void Connection::importWebPr( const AttributeList& rAttribs )
rWebPr.mbHtmlTables = rAttribs.getBool( XML_htmlTables, false );
}
-void Connection::importTables( const AttributeList& /*rAttribs*/ )
+void Connection::importTables()
{
if( maModel.mxWebPr.get() )
{
diff --git a/sc/source/filter/oox/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx
index 504c7ec5cbdc..d3874673f689 100644
--- a/sc/source/filter/oox/connectionsfragment.cxx
+++ b/sc/source/filter/oox/connectionsfragment.cxx
@@ -51,7 +51,7 @@ ContextHandlerRef ConnectionContext::onCreateContext( sal_Int32 nElement, const
case XLS_TOKEN( webPr ):
if( nElement == XLS_TOKEN( tables ) )
{
- mrConnection.importTables( rAttribs );
+ mrConnection.importTables();
return this;
}
break;
diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index e4c114b3af26..e222b34e4bef 100644
--- a/sc/source/filter/oox/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -300,12 +300,12 @@ RichString::RichString( const WorkbookHelper& rHelper ) :
{
}
-RichStringPortionRef RichString::importText( const AttributeList& )
+RichStringPortionRef RichString::importText()
{
return createPortion();
}
-RichStringPortionRef RichString::importRun( const AttributeList& )
+RichStringPortionRef RichString::importRun()
{
return createPortion();
}
diff --git a/sc/source/filter/oox/richstringcontext.cxx b/sc/source/filter/oox/richstringcontext.cxx
index df6cc4bc1c02..3788b01dd428 100644
--- a/sc/source/filter/oox/richstringcontext.cxx
+++ b/sc/source/filter/oox/richstringcontext.cxx
@@ -35,10 +35,10 @@ ContextHandlerRef RichStringContext::onCreateContext( sal_Int32 nElement, const
switch( nElement )
{
case XLS_TOKEN( t ):
- mxPortion = mxString->importText( rAttribs );
+ mxPortion = mxString->importText();
return this; // collect text in onCharacters()
case XLS_TOKEN( r ):
- mxPortion = mxString->importRun( rAttribs );
+ mxPortion = mxString->importRun();
return this;
case XLS_TOKEN( rPh ):
mxPhonetic = mxString->importPhoneticRun( rAttribs );
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index b6ed7040a934..9c5ac689a954 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -458,7 +458,7 @@ ScOrcusSheet::ScOrcusSheet(ScDocumentImport& rDoc, SCTAB nTab, ScOrcusFactory& r
mnTab(nTab),
mrFactory(rFactory),
mrStyles(static_cast<ScOrcusStyles&>(*mrFactory.get_styles())),
- maAutoFilter(rDoc.getDoc()),
+ maAutoFilter(),
maProperties(mnTab, mrDoc),
maConditionalFormat(mnTab, rDoc.getDoc()),
mnCellCount(0)
@@ -1589,7 +1589,7 @@ size_t ScOrcusStyles::commit_cell_style()
// auto filter import
-ScOrcusAutoFilter::ScOrcusAutoFilter(ScDocument&)
+ScOrcusAutoFilter::ScOrcusAutoFilter()
{
}
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index e7b99b25a137..e10c66972e2b 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -406,7 +406,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu
mpDoc->SetEditText(ScAddress(nCol,nRow,nTab), mpEngine->CreateTextObject(pE->aSel));
}
if ( !pE->maImageList.empty() )
- bHasGraphics |= GraphicSize( nCol, nRow, nTab, pE );
+ bHasGraphics |= GraphicSize( nCol, nRow, pE );
if ( pE->pName )
{ // Anchor Name => RangeName
if (!pRangeNames->findByUpperName(ScGlobal::pCharClass->uppercase(*pE->pName)))
@@ -477,7 +477,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu
}
}
-bool ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/, ScEEParseEntry* pE )
+bool ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, ScEEParseEntry* pE )
{
if ( pE->maImageList.empty() )
return false;
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index a846b4aee99b..a67d38bbced3 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -197,7 +197,7 @@ IMPL_LINK( ScRTFParser, RTFImportHdl, RtfImportInfo&, rInfo, void )
// Bad behavior:
// For RTF_INTBL or respectively at the start of the first RTF_CELL
// after RTF_CELLX if there was no RTF_INTBL
-void ScRTFParser::NewCellRow( RtfImportInfo* /*pInfo*/ )
+void ScRTFParser::NewCellRow()
{
if ( bNewDef )
{
@@ -316,7 +316,7 @@ void ScRTFParser::ProcToken( RtfImportInfo* pInfo )
// or e.g. \intbl ... \cell \pard \intbl ... \cell
if ( nRtfLastToken != RTF_INTBL && nRtfLastToken != RTF_CELL && nRtfLastToken != RTF_PAR )
{
- NewCellRow( pInfo );
+ NewCellRow();
nRtfLastToken = pInfo->nToken;
}
}
@@ -325,7 +325,7 @@ void ScRTFParser::ProcToken( RtfImportInfo* pInfo )
{
OSL_ENSURE( pActDefault, "RTF_CELL: pActDefault==0" );
if ( bNewDef || !pActDefault )
- NewCellRow( pInfo ); // before was no \intbl, bad behavior
+ NewCellRow(); // before was no \intbl, bad behavior
// Broken RTF? Let's save what we can
if ( !pActDefault )
pActDefault = pInsDefault;
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 96f6670ec1d0..fc840a6da51a 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -365,7 +365,7 @@ XclObj::~XclObj()
delete pTxo;
}
-void XclObj::ImplWriteAnchor( const XclExpRoot& /*rRoot*/, const SdrObject* pSdrObj, const tools::Rectangle* pChildAnchor )
+void XclObj::ImplWriteAnchor( const SdrObject* pSdrObj, const tools::Rectangle* pChildAnchor )
{
if( pChildAnchor )
{
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index 81fc1744ab4c..896e2e12b8ab 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -32,7 +32,6 @@ using namespace com::sun::star;
using namespace xmloff::token;
ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList) :
ScXMLImportContext( rImport ),
fIterationEpsilon(0.001),
@@ -102,9 +101,9 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLCalculationSetting
SvXMLImportContext *pContext = nullptr;
if (nElement == XML_ELEMENT( TABLE, XML_NULL_DATE ))
- pContext = new ScXMLNullDateContext(GetScImport(), nElement, xAttrList, this);
+ pContext = new ScXMLNullDateContext(GetScImport(), xAttrList, this);
else if (nElement == XML_ELEMENT( TABLE, XML_ITERATION ))
- pContext = new ScXMLIterationContext(GetScImport(), nElement, xAttrList, this);
+ pContext = new ScXMLIterationContext(GetScImport(), xAttrList, this);
if( !pContext )
pContext = new SvXMLImportContext( GetImport() );
@@ -143,7 +142,6 @@ void SAL_CALL ScXMLCalculationSettingsContext::endFastElement( sal_Int32 /*nElem
}
ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLCalculationSettingsContext* pCalcSet) :
ScXMLImportContext( rImport )
@@ -178,7 +176,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLNullDateContext::c
}
ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLCalculationSettingsContext* pCalcSet) :
ScXMLImportContext( rImport )
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
index 08c4e03cebd0..6614ab93e9a7 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
@@ -41,7 +41,7 @@ class ScXMLCalculationSettingsContext : public ScXMLImportContext
bool bMatchWholeCell;
public:
- ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLCalculationSettingsContext( ScXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList);
virtual ~ScXMLCalculationSettingsContext() override;
@@ -59,7 +59,7 @@ public:
class ScXMLNullDateContext : public ScXMLImportContext
{
public:
- ScXMLNullDateContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLNullDateContext( ScXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet);
virtual ~ScXMLNullDateContext() override;
@@ -71,7 +71,7 @@ public:
class ScXMLIterationContext : public ScXMLImportContext
{
public:
- ScXMLIterationContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLIterationContext( ScXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet);
virtual ~ScXMLIterationContext() override;
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
index 60a718196f1c..f6ba8340124f 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
@@ -37,7 +37,6 @@ ScMyImpCellRangeSource::ScMyImpCellRangeSource() :
ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext(
ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference< xml::sax::XFastAttributeList >& xAttrList,
ScMyImpCellRangeSource* pCellRangeSource ) :
ScXMLImportContext( rImport )
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
index a7725601b73f..c86d5fb54cc5 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
@@ -43,7 +43,6 @@ class ScXMLCellRangeSourceContext : public ScXMLImportContext
public:
ScXMLCellRangeSourceContext(
ScXMLImport& rImport,
- sal_Int32 nElement,
const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList,
ScMyImpCellRangeSource* pCellRangeSource
);
diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx
index cf4c16e4a9ae..37aa4c61e9b7 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.cxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.cxx
@@ -31,7 +31,6 @@ using namespace xmloff::token;
ScXMLConsolidationContext::ScXMLConsolidationContext(
ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference< xml::sax::XFastAttributeList >& xAttrList ) :
ScXMLImportContext( rImport ),
eFunction( SUBTOTAL_FUNC_NONE ),
diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx
index cfc0097182d4..e697497c2c6c 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.hxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.hxx
@@ -40,7 +40,6 @@ private:
public:
ScXMLConsolidationContext(
ScXMLImport& rImport,
- sal_Int32 nElement,
const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList
);
virtual ~ScXMLConsolidationContext() override;
diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx
index faaab9888728..b91cd269695b 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.cxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.cxx
@@ -31,9 +31,7 @@
using namespace com::sun::star;
using namespace xmloff::token;
-ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
- const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */ ) :
+ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport ) :
ScXMLImportContext( rImport )
{
// here are no attributes
@@ -46,12 +44,12 @@ ScXMLDDELinksContext::~ScXMLDDELinksContext()
}
uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDDELinksContext::createFastChildContext(
- sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList >& xAttrList )
+ sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList >& /*xAttrList*/ )
{
SvXMLImportContext *pContext = nullptr;
if ( nElement == XML_ELEMENT( TABLE, XML_DDE_LINK) )
- pContext = new ScXMLDDELinkContext(GetScImport(), nElement, xAttrList);
+ pContext = new ScXMLDDELinkContext(GetScImport());
if( !pContext )
pContext = new SvXMLImportContext( GetImport() );
@@ -59,9 +57,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDDELinksContext::c
return pContext;
}
-ScXMLDDELinkContext::ScXMLDDELinkContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
- const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */ ) :
+ScXMLDDELinkContext::ScXMLDDELinkContext( ScXMLImport& rImport ) :
ScXMLImportContext( rImport ),
aDDELinkTable(),
aDDELinkRow(),
@@ -88,10 +84,10 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDDELinkContext::cr
switch (nElement)
{
case XML_ELEMENT( OFFICE, XML_DDE_SOURCE ):
- pContext = new ScXMLDDESourceContext(GetScImport(), nElement, xAttrList, this);
+ pContext = new ScXMLDDESourceContext(GetScImport(), xAttrList, this);
break;
case XML_ELEMENT( TABLE, XML_TABLE ):
- pContext = new ScXMLDDETableContext(GetScImport(), nElement, xAttrList, this);
+ pContext = new ScXMLDDETableContext(GetScImport(), this);
break;
}
@@ -186,7 +182,6 @@ void SAL_CALL ScXMLDDELinkContext::endFastElement( sal_Int32 /*nElement*/ )
}
ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLDDELinkContext* pTempDDELink) :
ScXMLImportContext( rImport ),
@@ -233,8 +228,6 @@ void SAL_CALL ScXMLDDESourceContext::endFastElement( sal_Int32 /*nElement*/ )
}
ScXMLDDETableContext::ScXMLDDETableContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
- const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */,
ScXMLDDELinkContext* pTempDDELink) :
ScXMLImportContext( rImport ),
pDDELink(pTempDDELink)
@@ -254,10 +247,10 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDDETableContext::c
switch (nElement)
{
case XML_ELEMENT( TABLE, XML_TABLE_COLUMN ):
- pContext = new ScXMLDDEColumnContext(GetScImport(), nElement, xAttrList, pDDELink);
+ pContext = new ScXMLDDEColumnContext(GetScImport(), xAttrList, pDDELink);
break;
case XML_ELEMENT( TABLE, XML_TABLE_ROW ):
- pContext = new ScXMLDDERowContext(GetScImport(), nElement, xAttrList, pDDELink);
+ pContext = new ScXMLDDERowContext(GetScImport(), xAttrList, pDDELink);
break;
}
@@ -268,7 +261,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDDETableContext::c
}
ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLDDELinkContext* pTempDDELink) :
ScXMLImportContext( rImport ),
@@ -293,7 +285,6 @@ ScXMLDDEColumnContext::~ScXMLDDEColumnContext()
}
ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLDDELinkContext* pTempDDELink) :
ScXMLImportContext( rImport ),
@@ -323,7 +314,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDDERowContext::cre
SvXMLImportContext *pContext = nullptr;
if (nElement == XML_ELEMENT( TABLE, XML_TABLE_CELL ))
- pContext = new ScXMLDDECellContext(GetScImport(), nElement, xAttrList, pDDELink);
+ pContext = new ScXMLDDECellContext(GetScImport(), xAttrList, pDDELink);
if (!pContext)
pContext = new SvXMLImportContext( GetImport() );
@@ -337,7 +328,6 @@ void SAL_CALL ScXMLDDERowContext::endFastElement( sal_Int32 /*nElement*/ )
}
ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLDDELinkContext* pTempDDELink) :
ScXMLImportContext( rImport ),
diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx
index a08040677daf..86e6fbb5b747 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.hxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.hxx
@@ -28,8 +28,7 @@
class ScXMLDDELinksContext : public ScXMLImportContext
{
public:
- ScXMLDDELinksContext( ScXMLImport& rImport, sal_Int32 nElement,
- const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList);
+ ScXMLDDELinksContext( ScXMLImport& rImport);
virtual ~ScXMLDDELinksContext() override;
@@ -60,8 +59,7 @@ class ScXMLDDELinkContext : public ScXMLImportContext
sal_uInt8 nMode;
public:
- ScXMLDDELinkContext( ScXMLImport& rImport, sal_Int32 nElement,
- const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList);
+ ScXMLDDELinkContext( ScXMLImport& rImport);
virtual ~ScXMLDDELinkContext() override;
@@ -86,7 +84,7 @@ class ScXMLDDESourceContext : public ScXMLImportContext
ScXMLDDELinkContext* pDDELink;
public:
- ScXMLDDESourceContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLDDESourceContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLDDELinkContext* pDDELink);
@@ -100,8 +98,7 @@ class ScXMLDDETableContext : public ScXMLImportContext
ScXMLDDELinkContext* pDDELink;
public:
- ScXMLDDETableContext( ScXMLImport& rImport, sal_Int32 nElement,
- const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
+ ScXMLDDETableContext( ScXMLImport& rImport,
ScXMLDDELinkContext* pDDELink);
virtual ~ScXMLDDETableContext() override;
@@ -115,7 +112,7 @@ class ScXMLDDEColumnContext : public ScXMLImportContext
ScXMLDDELinkContext* pDDELink;
public:
- ScXMLDDEColumnContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLDDEColumnContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLDDELinkContext* pDDELink);
@@ -128,7 +125,7 @@ class ScXMLDDERowContext : public ScXMLImportContext
sal_Int32 nRows;
public:
- ScXMLDDERowContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLDDERowContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLDDELinkContext* pDDELink);
@@ -152,7 +149,7 @@ class ScXMLDDECellContext : public ScXMLImportContext
ScXMLDDELinkContext* pDDELink;
public:
- ScXMLDDECellContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLDDECellContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLDDELinkContext* pDDELink);
diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx
index f326f605d9e0..b55738341d28 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.cxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.cxx
@@ -62,7 +62,6 @@ bool ScMyImpDetectiveOpArray::GetFirstOp( ScMyImpDetectiveOp& rDetOp )
ScXMLDetectiveContext::ScXMLDetectiveContext(
ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
ScMyImpDetectiveObjVec* pNewDetectiveObjVec ) :
ScXMLImportContext( rImport ),
pDetectiveObjVec( pNewDetectiveObjVec )
@@ -81,10 +80,10 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDetectiveContext::
switch (nElement)
{
case XML_ELEMENT( TABLE, XML_HIGHLIGHTED_RANGE ):
- pContext = new ScXMLDetectiveHighlightedContext( GetScImport(), nElement, xAttrList, pDetectiveObjVec );
+ pContext = new ScXMLDetectiveHighlightedContext( GetScImport(), xAttrList, pDetectiveObjVec );
break;
case XML_ELEMENT( TABLE, XML_OPERATION ):
- pContext = new ScXMLDetectiveOperationContext( GetScImport(), nElement, xAttrList );
+ pContext = new ScXMLDetectiveOperationContext( GetScImport(), xAttrList );
break;
}
if( !pContext )
@@ -95,7 +94,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDetectiveContext::
ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext(
ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference< xml::sax::XFastAttributeList >& xAttrList,
ScMyImpDetectiveObjVec* pNewDetectiveObjVec ):
ScXMLImportContext( rImport ),
@@ -160,7 +158,6 @@ void SAL_CALL ScXMLDetectiveHighlightedContext::endFastElement( sal_Int32 /*nEle
ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext(
ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference< xml::sax::XFastAttributeList >& xAttrList ) :
ScXMLImportContext( rImport ),
aDetectiveOp(),
diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx
index 7f8a834c3e94..c3a11bdb1177 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.hxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.hxx
@@ -80,7 +80,6 @@ private:
public:
ScXMLDetectiveContext(
ScXMLImport& rImport,
- sal_Int32 nElement,
ScMyImpDetectiveObjVec* pNewDetectiveObjVec
);
virtual ~ScXMLDetectiveContext() override;
@@ -102,7 +101,6 @@ private:
public:
ScXMLDetectiveHighlightedContext(
ScXMLImport& rImport,
- sal_Int32 nElement,
const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList,
ScMyImpDetectiveObjVec* pNewDetectiveObjVec
);
@@ -120,7 +118,6 @@ private:
public:
ScXMLDetectiveOperationContext(
ScXMLImport& rImport,
- sal_Int32 nElement,
const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList
);
virtual ~ScXMLDetectiveOperationContext() override;
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
index 515619c697bf..8b3edddc997e 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -733,7 +733,7 @@ void ScXMLExportDataPilot::WriteGrandTotal(::xmloff::token::XMLTokenEnum eOrient
SvXMLElementExport aElemGrandTotal(rExport, XML_NAMESPACE_TABLE_EXT, XML_DATA_PILOT_GRAND_TOTAL, true, true);
}
-void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreadsheetDocument>& /* xSpreadDoc */)
+void ScXMLExportDataPilot::WriteDataPilots()
{
pDoc = rExport.GetDocument();
if (!pDoc)
diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx
index 835924c8d0a7..48a0b8b8adce 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.hxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.hxx
@@ -67,7 +67,7 @@ class ScXMLExportDataPilot
public:
explicit ScXMLExportDataPilot(ScXMLExport& rExport);
~ScXMLExportDataPilot();
- void WriteDataPilots(const css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreaDoc);
+ void WriteDataPilots();
};
#endif
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index 2c97450e5d1c..9feeb9308595 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -157,7 +157,7 @@ SvXMLImportContext *XMLTableHeaderFooterContext::CreateChildContext(
xText->setString("");
//SvXMLImport aSvXMLImport( GetImport() );
uno::Reference < text::XTextCursor > xTempTextCursor(xText->createTextCursor());
- pContext = new XMLHeaderFooterRegionContext( GetImport(), nPrefix, rLocalName, xAttrList, xTempTextCursor);
+ pContext = new XMLHeaderFooterRegionContext( GetImport(), nPrefix, rLocalName, xTempTextCursor);
}
}
}
@@ -199,8 +199,6 @@ void XMLTableHeaderFooterContext::EndElement()
XMLHeaderFooterRegionContext::XMLHeaderFooterRegionContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
- const uno::Reference<
- xml::sax::XAttributeList > & /* xAttrList */,
uno::Reference< text::XTextCursor >& xCursor ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
xTextCursor ( xCursor )
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
index 0a54d0a82178..8a26a55aac0a 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
@@ -75,7 +75,6 @@ public:
XMLHeaderFooterRegionContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
- const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
css::uno::Reference< css::text::XTextCursor >& xCursor );
virtual ~XMLHeaderFooterRegionContext() override;
diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx
index 35ca7bace2a9..6225a7742057 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.cxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.cxx
@@ -24,9 +24,7 @@
using namespace com::sun::star;
-ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
- const css::uno::Reference<css::xml::sax::XFastAttributeList>& /* xAttrList */ ) :
+ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rImport ) :
ScXMLImportContext( rImport )
{
// here are no attributes
diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx
index 93d85e3a47d6..743e4e7f0c74 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.hxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.hxx
@@ -27,8 +27,7 @@
class ScXMLTableShapesContext : public ScXMLImportContext
{
public:
- ScXMLTableShapesContext( ScXMLImport& rImport, sal_Int32 nElement,
- const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList);
+ ScXMLTableShapesContext( ScXMLImport& rImport );
virtual ~ScXMLTableShapesContext() override;
diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx
index 7d0c936a0346..24e2356d8e3e 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.cxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.cxx
@@ -32,7 +32,6 @@ using namespace com::sun::star;
using namespace xmloff::token;
ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList) :
ScXMLImportContext( rImport ),
sLink(),
diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx
index 32805d92b933..1a74d00f10cd 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.hxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.hxx
@@ -35,7 +35,7 @@ class ScXMLTableSourceContext : public ScXMLImportContext
css::sheet::SheetLinkMode nMode;
public:
- ScXMLTableSourceContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLTableSourceContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList);
virtual ~ScXMLTableSourceContext() override;
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index ff843fa7df51..a6cefe70e719 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -49,7 +49,7 @@ class ScXMLChangeInfoContext : public ScXMLImportContext
sal_uInt32 nParagraphCount;
public:
- ScXMLChangeInfoContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLChangeInfoContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
@@ -65,7 +65,7 @@ class ScXMLBigRangeContext : public ScXMLImportContext
ScBigRange& rBigRange;
public:
- ScXMLBigRangeContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLBigRangeContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScBigRange& rBigRange);
@@ -91,7 +91,7 @@ class ScXMLCellContentDeletionContext : public ScXMLImportContext
ScMatrixMode nMatrixFlag;
public:
- ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLCellContentDeletionContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
@@ -106,7 +106,7 @@ class ScXMLDependenceContext : public ScXMLImportContext
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
public:
- ScXMLDependenceContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLDependenceContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
@@ -119,8 +119,7 @@ class ScXMLDependingsContext : public ScXMLImportContext
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
public:
- ScXMLDependingsContext( ScXMLImport& rImport, sal_Int32 nElement,
- const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
+ ScXMLDependingsContext( ScXMLImport& rImport,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
@@ -132,9 +131,9 @@ class ScXMLChangeDeletionContext : public ScXMLImportContext
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
public:
- ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_Int32 nElement,
- const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
+ ScXMLChangeDeletionContext( ScXMLImport& rImport,
+ const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override;
@@ -145,9 +144,8 @@ class ScXMLDeletionsContext : public ScXMLImportContext
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
public:
- ScXMLDeletionsContext( ScXMLImport& rImport, sal_Int32 nElement,
- const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
+ ScXMLDeletionsContext( ScXMLImport& rImport,
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override;
@@ -197,7 +195,7 @@ class ScXMLChangeCellContext : public ScXMLImportContext
bool bFormula;
public:
- ScXMLChangeCellContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLChangeCellContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScCellValue& rOldCell, OUString& sAddress,
OUString& rFormula, OUString& rFormulaNmsp,
@@ -233,7 +231,7 @@ class ScXMLPreviousContext : public ScXMLImportContext
ScMatrixMode nMatrixFlag;
public:
- ScXMLPreviousContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLPreviousContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
@@ -249,7 +247,7 @@ class ScXMLContentChangeContext : public ScXMLImportContext
ScBigRange aBigRange;
public:
- ScXMLContentChangeContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLContentChangeContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
@@ -264,7 +262,7 @@ class ScXMLInsertionContext : public ScXMLImportContext
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
public:
- ScXMLInsertionContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLInsertionContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
@@ -310,7 +308,6 @@ class ScXMLCutOffsContext : public ScXMLImportContext
public:
ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
- const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
@@ -324,7 +321,7 @@ class ScXMLDeletionContext : public ScXMLImportContext
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
public:
- ScXMLDeletionContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLDeletionContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
@@ -345,7 +342,7 @@ class ScXMLMovementContext : public ScXMLImportContext
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
public:
- ScXMLMovementContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLMovementContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
@@ -360,7 +357,7 @@ class ScXMLRejectionContext : public ScXMLImportContext
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
public:
- ScXMLRejectionContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLRejectionContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
@@ -371,7 +368,6 @@ public:
};
ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference<xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
ScXMLImportContext( rImport ),
@@ -410,19 +406,19 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLTrackedChangesCont
switch (nElement)
{
case XML_ELEMENT( TABLE, XML_CELL_CONTENT_CHANGE ):
- pContext = new ScXMLContentChangeContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLContentChangeContext(GetScImport(), xAttrList, pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_INSERTION ):
- pContext = new ScXMLInsertionContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLInsertionContext(GetScImport(), xAttrList, pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_DELETION ):
- pContext = new ScXMLDeletionContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLDeletionContext(GetScImport(), xAttrList, pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_MOVEMENT ):
- pContext = new ScXMLMovementContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLMovementContext(GetScImport(), xAttrList, pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_REJECTION ):
- pContext = new ScXMLRejectionContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLRejectionContext(GetScImport(), xAttrList, pChangeTrackingImportHelper);
break;
}
@@ -433,7 +429,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLTrackedChangesCont
}
ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference<xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
ScXMLImportContext( rImport ),
@@ -459,7 +454,7 @@ ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport,
SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList )
+ const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttrList*/ )
{
SvXMLImportContext *pContext(nullptr);
@@ -467,17 +462,17 @@ SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( sal_uInt16 nPref
{
if( IsXMLToken( rLocalName, XML_CREATOR ) )
pContext = new ScXMLContentContext(GetScImport(), nPrefix,
- rLocalName, xAttrList, sAuthorBuffer);
+ rLocalName, sAuthorBuffer);
else if( IsXMLToken( rLocalName, XML_DATE ) )
pContext = new ScXMLContentContext(GetScImport(), nPrefix,
- rLocalName, xAttrList, sDateTimeBuffer);
+ rLocalName, sDateTimeBuffer);
}
else if ((nPrefix == XML_NAMESPACE_TEXT) && (IsXMLToken(rLocalName, XML_P)) )
{
if(nParagraphCount)
sCommentBuffer.append('\n');
++nParagraphCount;
- pContext = new ScXMLContentContext( GetScImport(), nPrefix, rLocalName, xAttrList, sCommentBuffer);
+ pContext = new ScXMLContentContext( GetScImport(), nPrefix, rLocalName, sCommentBuffer);
}
if( !pContext )
@@ -496,7 +491,6 @@ void SAL_CALL ScXMLChangeInfoContext::endFastElement( sal_Int32 /*nElement*/ )
}
ScXMLBigRangeContext::ScXMLBigRangeContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference<xml::sax::XFastAttributeList>& xAttrList,
ScBigRange& rTempBigRange ) :
ScXMLImportContext( rImport ),
@@ -574,7 +568,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLBigRangeContext::c
}
ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference<xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper) :
ScXMLImportContext( rImport ),
@@ -606,12 +599,12 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLCellContentDeletio
switch (nElement)
{
case XML_ELEMENT( TABLE, XML_CHANGE_TRACK_TABLE_CELL ):
- pContext = new ScXMLChangeCellContext(GetScImport(), nElement, xAttrList,
+ pContext = new ScXMLChangeCellContext(GetScImport(), xAttrList,
maCell, sFormulaAddress, sFormula, sFormulaNmsp, eGrammar, sInputString, fValue, nType, nMatrixFlag, nMatrixCols, nMatrixRows );
break;
case XML_ELEMENT( TABLE, XML_CELL_ADDRESS ):
OSL_ENSURE(!nID, "a action with a ID should not contain a BigRange");
- pContext = new ScXMLBigRangeContext(GetScImport(), nElement, xAttrList, aBigRange);
+ pContext = new ScXMLBigRangeContext(GetScImport(), xAttrList, aBigRange);
break;
}
@@ -632,7 +625,6 @@ void SAL_CALL ScXMLCellContentDeletionContext::endFastElement( sal_Int32 /*nElem
}
ScXMLDependenceContext::ScXMLDependenceContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference<xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
ScXMLImportContext( rImport ),
@@ -658,8 +650,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDependenceContext:
}
ScXMLDependingsContext::ScXMLDependingsContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
- const uno::Reference<xml::sax::XFastAttributeList>& /* xAttrList */,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
ScXMLImportContext( rImport ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
@@ -676,7 +666,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDependingsContext:
if (nElement == XML_ELEMENT( TABLE, XML_DEPENDENCE ) ||
nElement == XML_ELEMENT( TABLE, XML_DEPENDENCY ))
{
- pContext = new ScXMLDependenceContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLDependenceContext(GetScImport(), xAttrList, pChangeTrackingImportHelper);
}
if( !pContext )
@@ -686,7 +676,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDependingsContext:
}
ScXMLChangeDeletionContext::ScXMLChangeDeletionContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference<xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
ScXMLImportContext( rImport ),
@@ -712,8 +701,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLChangeDeletionCont
}
ScXMLDeletionsContext::ScXMLDeletionsContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
- const uno::Reference<xml::sax::XFastAttributeList>& /* xAttrList */,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
ScXMLImportContext( rImport ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
@@ -729,10 +716,10 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDeletionsContext::
switch (nElement)
{
case XML_ELEMENT( TABLE, XML_CHANGE_DELETION ):
- pContext = new ScXMLChangeDeletionContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLChangeDeletionContext(GetScImport(), xAttrList, pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_CELL_CONTENT_DELETION ):
- pContext = new ScXMLCellContentDeletionContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLCellContentDeletionContext(GetScImport(), xAttrList, pChangeTrackingImportHelper);
break;
}
@@ -824,7 +811,6 @@ void ScXMLChangeTextPContext::EndElement()
}
ScXMLChangeCellContext::ScXMLChangeCellContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference<xml::sax::XFastAttributeList>& xAttrList,
ScCellValue& rOldCell, OUString& rAddress,
OUString& rFormula, OUString& rFormulaNmsp,
@@ -1010,7 +996,6 @@ void SAL_CALL ScXMLChangeCellContext::endFastElement( sal_Int32 /*nElement*/ )
}
ScXMLPreviousContext::ScXMLPreviousContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference<xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
ScXMLImportContext( rImport ),
@@ -1040,7 +1025,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLPreviousContext::c
SvXMLImportContext *pContext(nullptr);
if ( nElement == XML_ELEMENT( TABLE, XML_CHANGE_TRACK_TABLE_CELL ) )
- pContext = new ScXMLChangeCellContext(GetScImport(), nElement, xAttrList,
+ pContext = new ScXMLChangeCellContext(GetScImport(), xAttrList,
maOldCell, sFormulaAddress, sFormula, sFormulaNmsp, eGrammar, sInputString, fValue, nType, nMatrixFlag, nMatrixCols, nMatrixRows);
if( !pContext )
@@ -1056,7 +1041,6 @@ void SAL_CALL ScXMLPreviousContext::endFastElement( sal_Int32 /*nElement*/ )
}
ScXMLContentChangeContext::ScXMLContentChangeContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference<xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
ScXMLImportContext( rImport ),
@@ -1104,19 +1088,19 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLContentChangeConte
switch (nElement)
{
case XML_ELEMENT( OFFICE, XML_CHANGE_INFO ):
- pContext = new ScXMLChangeInfoContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLChangeInfoContext(GetScImport(), xAttrList, pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_CELL_ADDRESS ):
- pContext = new ScXMLBigRangeContext(GetScImport(), nElement, xAttrList, aBigRange);
+ pContext = new ScXMLBigRangeContext(GetScImport(), xAttrList, aBigRange);
break;
case XML_ELEMENT( TABLE, XML_DEPENDENCIES ):
- pContext = new ScXMLDependingsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLDependingsContext(GetScImport(), pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_DELETIONS ):
- pContext = new ScXMLDeletionsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLDeletionsContext(GetScImport(), pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_PREVIOUS ):
- pContext = new ScXMLPreviousContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLPreviousContext(GetScImport(), xAttrList, pChangeTrackingImportHelper);
break;
}
@@ -1133,7 +1117,6 @@ void SAL_CALL ScXMLContentChangeContext::endFastElement( sal_Int32 /*nElement*/
}
ScXMLInsertionContext::ScXMLInsertionContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference<xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
ScXMLImportContext( rImport ),
@@ -1202,13 +1185,13 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLInsertionContext::
switch (nElement)
{
case XML_ELEMENT( OFFICE, XML_CHANGE_INFO ):
- pContext = new ScXMLChangeInfoContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLChangeInfoContext(GetScImport(), xAttrList, pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_DEPENDENCIES ):
- pContext = new ScXMLDependingsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLDependingsContext(GetScImport(), pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_DELETIONS ):
- pContext = new ScXMLDeletionsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLDeletionsContext(GetScImport(), pChangeTrackingImportHelper);
break;
}
@@ -1328,10 +1311,9 @@ void ScXMLMovementCutOffContext::EndElement()
}
ScXMLCutOffsContext::ScXMLCutOffsContext( ScXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLName,
- const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */,
- ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
+ sal_uInt16 nPrfx,
+ const OUString& rLName,
+ ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
ScXMLImportContext( rImport, nPrfx, rLName ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
{
@@ -1363,7 +1345,6 @@ void ScXMLCutOffsContext::EndElement()
}
ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference<xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
ScXMLImportContext( rImport ),
@@ -1428,14 +1409,14 @@ ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport,
SvXMLImportContext *ScXMLDeletionContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
- const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList )
+ const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttrList*/ )
{
SvXMLImportContext *pContext(nullptr);
if (nPrefix == XML_NAMESPACE_TABLE)
{
if (IsXMLToken(rLocalName, XML_CUT_OFFS) || rLocalName == "cut_offs")
- pContext = new ScXMLCutOffsContext(GetScImport(), nPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLCutOffsContext(GetScImport(), nPrefix, rLocalName, pChangeTrackingImportHelper);
else
{
OSL_FAIL("don't know this");
@@ -1456,13 +1437,13 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDeletionContext::c
switch (nElement)
{
case XML_ELEMENT( OFFICE, XML_CHANGE_INFO ):
- pContext = new ScXMLChangeInfoContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLChangeInfoContext(GetScImport(), xAttrList, pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_DEPENDENCIES ):
- pContext = new ScXMLDependingsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLDependingsContext(GetScImport(), pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_DELETIONS ):
- pContext = new ScXMLDeletionsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLDeletionsContext(GetScImport(), pChangeTrackingImportHelper);
break;
}
@@ -1478,7 +1459,6 @@ void SAL_CALL ScXMLDeletionContext::endFastElement( sal_Int32 /*nElement*/ )
}
ScXMLMovementContext::ScXMLMovementContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference<xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
ScXMLImportContext( rImport ),
@@ -1527,19 +1507,19 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLMovementContext::c
switch (nElement)
{
case XML_ELEMENT( OFFICE, XML_CHANGE_INFO ):
- pContext = new ScXMLChangeInfoContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLChangeInfoContext(GetScImport(), xAttrList, pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_DEPENDENCIES ):
- pContext = new ScXMLDependingsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLDependingsContext(GetScImport(), pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_DELETIONS ):
- pContext = new ScXMLDeletionsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLDeletionsContext(GetScImport(), pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_SOURCE_RANGE_ADDRESS ):
- pContext = new ScXMLBigRangeContext(GetScImport(), nElement, xAttrList, aSourceRange);
+ pContext = new ScXMLBigRangeContext(GetScImport(), xAttrList, aSourceRange);
break;
case XML_ELEMENT( TABLE, XML_TARGET_RANGE_ADDRESS ):
- pContext = new ScXMLBigRangeContext(GetScImport(), nElement, xAttrList, aTargetRange);
+ pContext = new ScXMLBigRangeContext(GetScImport(), xAttrList, aTargetRange);
break;
}
@@ -1556,7 +1536,6 @@ void SAL_CALL ScXMLMovementContext::endFastElement( sal_Int32 /*nElement*/ )
}
ScXMLRejectionContext::ScXMLRejectionContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const uno::Reference<xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
ScXMLImportContext( rImport ),
@@ -1605,13 +1584,13 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLRejectionContext::
switch (nElement)
{
case XML_ELEMENT( OFFICE, XML_CHANGE_INFO ):
- pContext = new ScXMLChangeInfoContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLChangeInfoContext(GetScImport(), xAttrList, pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_DEPENDENCIES ):
- pContext = new ScXMLDependingsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLDependingsContext(GetScImport(), pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_DELETIONS ):
- pContext = new ScXMLDeletionsContext(GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLDeletionsContext(GetScImport(), pChangeTrackingImportHelper);
break;
}
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx
index 5d12000a295f..fe0d5f8a12c6 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx
@@ -34,7 +34,7 @@ class ScXMLTrackedChangesContext : public ScXMLImportContext
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
public:
- ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLTrackedChangesContext( ScXMLImport& rImport,
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
virtual ~ScXMLTrackedChangesContext() override;
diff --git a/sc/source/filter/xml/celltextparacontext.cxx b/sc/source/filter/xml/celltextparacontext.cxx
index ea4349011fae..17d391fc4523 100644
--- a/sc/source/filter/xml/celltextparacontext.cxx
+++ b/sc/source/filter/xml/celltextparacontext.cxx
@@ -21,7 +21,7 @@ using namespace com::sun::star;
using namespace xmloff::token;
ScXMLCellTextParaContext::ScXMLCellTextParaContext(
- ScXMLImport& rImport, sal_Int32 /*nElement*/, ScXMLTableRowCellContext& rParent) :
+ ScXMLImport& rImport, ScXMLTableRowCellContext& rParent) :
ScXMLImportContext(rImport),
mrParentCxt(rParent)
{
@@ -52,17 +52,17 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLCellTextParaContex
switch (nElement)
{
case XML_ELEMENT( TEXT, XML_S ):
- return new ScXMLCellFieldSContext(GetScImport(), nElement, *this);
+ return new ScXMLCellFieldSContext(GetScImport(), *this);
case XML_ELEMENT( TEXT, XML_SPAN ):
- return new ScXMLCellTextSpanContext(GetScImport(), nElement, *this);
+ return new ScXMLCellTextSpanContext(GetScImport(), *this);
case XML_ELEMENT( TEXT, XML_SHEET_NAME ):
- return new ScXMLCellFieldSheetNameContext(GetScImport(), nElement, *this);
+ return new ScXMLCellFieldSheetNameContext(GetScImport(), *this);
case XML_ELEMENT( TEXT, XML_DATE ):
- return new ScXMLCellFieldDateContext(GetScImport(), nElement, *this);
+ return new ScXMLCellFieldDateContext(GetScImport(), *this);
case XML_ELEMENT( TEXT, XML_TITLE ):
- return new ScXMLCellFieldTitleContext(GetScImport(), nElement, *this);
+ return new ScXMLCellFieldTitleContext(GetScImport(), *this);
case XML_ELEMENT( TEXT, XML_A ):
- return new ScXMLCellFieldURLContext(GetScImport(), nElement, *this);
+ return new ScXMLCellFieldURLContext(GetScImport(), *this);
default:
;
}
@@ -97,7 +97,7 @@ void ScXMLCellTextParaContext::PushFieldURL(
}
ScXMLCellTextSpanContext::ScXMLCellTextSpanContext(
- ScXMLImport& rImport, sal_Int32 /*nElement*/, ScXMLCellTextParaContext& rParent) :
+ ScXMLImport& rImport, ScXMLCellTextParaContext& rParent) :
ScXMLImportContext(rImport),
mrParentCxt(rParent)
{
@@ -151,31 +151,31 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLCellTextSpanContex
{
case XML_ELEMENT( TEXT, XML_SHEET_NAME ):
{
- ScXMLCellFieldSheetNameContext* p = new ScXMLCellFieldSheetNameContext(GetScImport(), nElement, mrParentCxt);
+ ScXMLCellFieldSheetNameContext* p = new ScXMLCellFieldSheetNameContext(GetScImport(), mrParentCxt);
p->SetStyleName(maStyleName);
return p;
}
case XML_ELEMENT( TEXT, XML_DATE ):
{
- ScXMLCellFieldDateContext* p = new ScXMLCellFieldDateContext(GetScImport(), nElement, mrParentCxt);
+ ScXMLCellFieldDateContext* p = new ScXMLCellFieldDateContext(GetScImport(), mrParentCxt);
p->SetStyleName(maStyleName);
return p;
}
case XML_ELEMENT( TEXT, XML_TITLE ):
{
- ScXMLCellFieldTitleContext* p = new ScXMLCellFieldTitleContext(GetScImport(), nElement, mrParentCxt);
+ ScXMLCellFieldTitleContext* p = new ScXMLCellFieldTitleContext(GetScImport(), mrParentCxt);
p->SetStyleName(maStyleName);
return p;
}
case XML_ELEMENT( TEXT, XML_A ):
{
- ScXMLCellFieldURLContext* p = new ScXMLCellFieldURLContext(GetScImport(), nElement, mrParentCxt);
+ ScXMLCellFieldURLContext* p = new ScXMLCellFieldURLContext(GetScImport(), mrParentCxt);
p->SetStyleName(maStyleName);
return p;
}
case XML_ELEMENT( TEXT, XML_S ):
{
- ScXMLCellFieldSContext* p = new ScXMLCellFieldSContext(GetScImport(), nElement, mrParentCxt);
+ ScXMLCellFieldSContext* p = new ScXMLCellFieldSContext(GetScImport(), mrParentCxt);
p->SetStyleName(maStyleName);
return p;
}
@@ -187,7 +187,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLCellTextSpanContex
}
ScXMLCellFieldSheetNameContext::ScXMLCellFieldSheetNameContext(
- ScXMLImport& rImport, sal_Int32 /*nElement*/, ScXMLCellTextParaContext& rParent) :
+ ScXMLImport& rImport, ScXMLCellTextParaContext& rParent) :
ScXMLImportContext(rImport),
mrParentCxt(rParent)
{
@@ -210,7 +210,7 @@ void SAL_CALL ScXMLCellFieldSheetNameContext::endFastElement( sal_Int32 /*nEleme
}
ScXMLCellFieldDateContext::ScXMLCellFieldDateContext(
- ScXMLImport& rImport, sal_Int32 /*nElement*/, ScXMLCellTextParaContext& rParent) :
+ ScXMLImport& rImport, ScXMLCellTextParaContext& rParent) :
ScXMLImportContext(rImport),
mrParentCxt(rParent)
{
@@ -227,7 +227,7 @@ void SAL_CALL ScXMLCellFieldDateContext::endFastElement( sal_Int32 /*nElement*/
}
ScXMLCellFieldTitleContext::ScXMLCellFieldTitleContext(
- ScXMLImport& rImport, sal_Int32 /*nElement*/, ScXMLCellTextParaContext& rParent) :
+ ScXMLImport& rImport, ScXMLCellTextParaContext& rParent) :
ScXMLImportContext(rImport),
mrParentCxt(rParent)
{
@@ -244,7 +244,7 @@ void SAL_CALL ScXMLCellFieldTitleContext::endFastElement( sal_Int32 /*nElement*/
}
ScXMLCellFieldURLContext::ScXMLCellFieldURLContext(
- ScXMLImport& rImport, sal_Int32 /*nElement*/, ScXMLCellTextParaContext& rParent) :
+ ScXMLImport& rImport, ScXMLCellTextParaContext& rParent) :
ScXMLImportContext(rImport),
mrParentCxt(rParent)
{
@@ -294,7 +294,7 @@ void SAL_CALL ScXMLCellFieldURLContext::characters( const OUString& rChars )
}
ScXMLCellFieldSContext::ScXMLCellFieldSContext(
- ScXMLImport& rImport, sal_Int32 /*nElement*/, ScXMLCellTextParaContext& rParent) :
+ ScXMLImport& rImport, ScXMLCellTextParaContext& rParent) :
ScXMLImportContext(rImport),
mrParentCxt(rParent),
mnCount(1)
diff --git a/sc/source/filter/xml/celltextparacontext.hxx b/sc/source/filter/xml/celltextparacontext.hxx
index fed9ac9dab54..3d62077c329e 100644
--- a/sc/source/filter/xml/celltextparacontext.hxx
+++ b/sc/source/filter/xml/celltextparacontext.hxx
@@ -23,7 +23,7 @@ class ScXMLCellTextParaContext : public ScXMLImportContext
ScXMLTableRowCellContext& mrParentCxt;
OUString maContent;
public:
- ScXMLCellTextParaContext(ScXMLImport& rImport, sal_Int32 nElement, ScXMLTableRowCellContext& rParent);
+ ScXMLCellTextParaContext(ScXMLImport& rImport, ScXMLTableRowCellContext& rParent);
virtual void SAL_CALL endFastElement( sal_Int32 nElement ) override;
virtual void SAL_CALL characters( const OUString& aChars ) override;
@@ -46,7 +46,7 @@ class ScXMLCellTextSpanContext : public ScXMLImportContext
OUString maStyleName;
OUString maContent;
public:
- ScXMLCellTextSpanContext(ScXMLImport& rImport, sal_Int32 nElement, ScXMLCellTextParaContext& rParent);
+ ScXMLCellTextSpanContext(ScXMLImport& rImport, ScXMLCellTextParaContext& rParent);
virtual void SAL_CALL startFastElement( sal_Int32 nElement,
const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override;
@@ -64,7 +64,7 @@ class ScXMLCellFieldSheetNameContext : public ScXMLImportContext
ScXMLCellTextParaContext& mrParentCxt;
OUString maStyleName;
public:
- ScXMLCellFieldSheetNameContext(ScXMLImport& rImport, sal_Int32 nElement, ScXMLCellTextParaContext& rParent);
+ ScXMLCellFieldSheetNameContext(ScXMLImport& rImport, ScXMLCellTextParaContext& rParent);
void SetStyleName(const OUString& rStyleName);
@@ -81,7 +81,7 @@ class ScXMLCellFieldDateContext : public ScXMLImportContext
ScXMLCellTextParaContext& mrParentCxt;
OUString maStyleName;
public:
- ScXMLCellFieldDateContext(ScXMLImport& rImport, sal_Int32 nElement, ScXMLCellTextParaContext& rParent);
+ ScXMLCellFieldDateContext(ScXMLImport& rImport, ScXMLCellTextParaContext& rParent);
void SetStyleName(const OUString& rStyleName);
@@ -96,7 +96,7 @@ class ScXMLCellFieldTitleContext : public ScXMLImportContext
ScXMLCellTextParaContext& mrParentCxt;
OUString maStyleName;
public:
- ScXMLCellFieldTitleContext(ScXMLImport& rImport, sal_Int32 nElement, ScXMLCellTextParaContext& rParent);
+ ScXMLCellFieldTitleContext(ScXMLImport& rImport, ScXMLCellTextParaContext& rParent);
void SetStyleName(const OUString& rStyleName);
@@ -114,7 +114,7 @@ class ScXMLCellFieldURLContext : public ScXMLImportContext
OUString maRep;
OUString maTargetFrame;
public:
- ScXMLCellFieldURLContext(ScXMLImport& rImport, sal_Int32 nElement, ScXMLCellTextParaContext& rParent);
+ ScXMLCellFieldURLContext(ScXMLImport& rImport, ScXMLCellTextParaContext& rParent);
void SetStyleName(const OUString& rStyleName);
@@ -135,7 +135,7 @@ class ScXMLCellFieldSContext : public ScXMLImportContext
void PushSpaces();
public:
- ScXMLCellFieldSContext(ScXMLImport& rImport, sal_Int32 nElement, ScXMLCellTextParaContext& rParent);
+ ScXMLCellFieldSContext(ScXMLImport& rImport, ScXMLCellTextParaContext& rParent);
void SetStyleName(const OUString& rStyleName);
diff --git a/sc/source/filter/xml/datastreamimport.cxx b/sc/source/filter/xml/datastreamimport.cxx
index 156ee52e02bd..f6d2428ceea3 100644
--- a/sc/source/filter/xml/datastreamimport.cxx
+++ b/sc/source/filter/xml/datastreamimport.cxx
@@ -21,7 +21,7 @@ using namespace com::sun::star;
using namespace xmloff::token;
ScXMLDataStreamContext::ScXMLDataStreamContext(
- ScXMLImport& rImport, sal_Int32 /*nElement*/,
+ ScXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList ) :
ScXMLImportContext(rImport),
mbRefreshOnEmpty(false),
diff --git a/sc/source/filter/xml/datastreamimport.hxx b/sc/source/filter/xml/datastreamimport.hxx
index 91980ea2f4f0..6e174db07177 100644
--- a/sc/source/filter/xml/datastreamimport.hxx
+++ b/sc/source/filter/xml/datastreamimport.hxx
@@ -24,7 +24,7 @@ class ScXMLDataStreamContext : public ScXMLImportContext
public:
ScXMLDataStreamContext(
- ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLImport& rImport,
const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList );
virtual ~ScXMLDataStreamContext() override;
diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx
index 5abb51937c4f..f88643686540 100644
--- a/sc/source/filter/xml/xmlannoi.cxx
+++ b/sc/source/filter/xml/xmlannoi.cxx
@@ -124,16 +124,16 @@ SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( sal_uInt16 nPref
{
if( IsXMLToken( rLName, XML_CREATOR ) )
pContext = new ScXMLContentContext(GetScImport(), nPrefix,
- rLName, xAttrList, maAuthorBuffer);
+ rLName, maAuthorBuffer);
else if( IsXMLToken( rLName, XML_DATE ) )
pContext = new ScXMLContentContext(GetScImport(), nPrefix,
- rLName, xAttrList, maCreateDateBuffer);
+ rLName, maCreateDateBuffer);
}
else if( XML_NAMESPACE_META == nPrefix )
{
if( IsXMLToken( rLName, XML_DATE_STRING ) )
pContext = new ScXMLContentContext(GetScImport(), nPrefix,
- rLName, xAttrList, maCreateDateStringBuffer);
+ rLName, maCreateDateStringBuffer);
}
if( !pContext && pShapeContext )
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index 159c25a2e023..e560028ccd79 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -141,17 +141,17 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
case XML_ELEMENT( TABLE, XML_TRACKED_CHANGES ):
pChangeTrackingImportHelper = GetScImport().GetChangeTrackingImportHelper();
if (pChangeTrackingImportHelper)
- pContext = new ScXMLTrackedChangesContext( GetScImport(), nElement, xAttrList, pChangeTrackingImportHelper);
+ pContext = new ScXMLTrackedChangesContext( GetScImport(), xAttrList, pChangeTrackingImportHelper);
break;
case XML_ELEMENT( TABLE, XML_CALCULATION_SETTINGS ):
- pContext = new ScXMLCalculationSettingsContext( GetScImport(), nElement, xAttrList );
+ pContext = new ScXMLCalculationSettingsContext( GetScImport(), xAttrList );
bHadCalculationSettings = true;
break;
case XML_ELEMENT( TABLE, XML_CONTENT_VALIDATIONS ):
- pContext = new ScXMLContentValidationsContext( GetScImport(), nElement, xAttrList );
+ pContext = new ScXMLContentValidationsContext( GetScImport() );
break;
case XML_ELEMENT( TABLE, XML_LABEL_RANGES ):
- pContext = new ScXMLLabelRangesContext( GetScImport(), nElement, xAttrList );
+ pContext = new ScXMLLabelRangesContext( GetScImport() );
break;
case XML_ELEMENT( TABLE, XML_TABLE ):
if (GetScImport().GetTables().GetCurrentSheet() >= MAXTAB)
@@ -166,35 +166,30 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
break;
case XML_ELEMENT( TABLE, XML_NAMED_EXPRESSIONS ):
pContext = new ScXMLNamedExpressionsContext (
- GetScImport(), nElement, xAttrList,
+ GetScImport(),
new ScXMLNamedExpressionsContext::GlobalInserter(GetScImport()) );
break;
case XML_ELEMENT( TABLE, XML_DATABASE_RANGES ):
- pContext = new ScXMLDatabaseRangesContext ( GetScImport(), nElement,
- xAttrList );
+ pContext = new ScXMLDatabaseRangesContext ( GetScImport() );
break;
case XML_ELEMENT( CALC_EXT, XML_DATA_MAPPINGS ):
- pContext = new ScXMLMappingsContext(GetScImport(), nElement,
- xAttrList);
+ pContext = new ScXMLMappingsContext(GetScImport());
break;
case XML_ELEMENT( TABLE, XML_DATABASE_RANGE ):
- pContext = new ScXMLDatabaseRangeContext ( GetScImport(), nElement,
+ pContext = new ScXMLDatabaseRangeContext ( GetScImport(),
xAttrList );
break;
case XML_ELEMENT( TABLE, XML_DATA_PILOT_TABLES ):
- pContext = new ScXMLDataPilotTablesContext ( GetScImport(), nElement,
- xAttrList );
+ pContext = new ScXMLDataPilotTablesContext ( GetScImport() );
break;
case XML_ELEMENT( TABLE, XML_CONSOLIDATION ):
- pContext = new ScXMLConsolidationContext ( GetScImport(), nElement,
- xAttrList );
+ pContext = new ScXMLConsolidationContext ( GetScImport(), xAttrList );
break;
case XML_ELEMENT( TABLE, XML_DDE_LINKS ):
- pContext = new ScXMLDDELinksContext ( GetScImport(), nElement,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list