sc/inc/table.hxx | 2
sc/source/core/data/document.cxx | 2
sc/source/core/data/table1.cxx | 2
sc/source/core/data/table2.cxx | 6 +-
sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx | 4 -
sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx | 2
sc/source/filter/xml/XMLEmptyContext.cxx | 7 +--
sc/source/filter/xml/XMLEmptyContext.hxx | 2
sc/source/filter/xml/XMLStylesImportHelper.cxx | 6 +-
sc/source/filter/xml/XMLStylesImportHelper.hxx | 4 -
sc/source/filter/xml/xmlbodyi.cxx | 5 --
sc/source/filter/xml/xmlbodyi.hxx | 2
sc/source/filter/xml/xmlcelli.cxx | 1
sc/source/filter/xml/xmlcelli.hxx | 2
sc/source/filter/xml/xmlimprt.cxx | 38 ++++++-----------
sc/source/filter/xml/xmlimprt.hxx | 1
sc/source/filter/xml/xmlrowi.cxx | 17 ++-----
sc/source/filter/xml/xmlrowi.hxx | 4 -
sc/source/filter/xml/xmlsubti.cxx | 2
sc/source/filter/xml/xmltabi.cxx | 12 +----
sc/source/filter/xml/xmltabi.hxx | 2
sc/source/ui/Accessibility/AccessibleDocument.cxx | 8 +--
22 files changed, 55 insertions(+), 76 deletions(-)
New commits:
commit 3db6a7fddf880610f1b0a35ff191816f046e8c4a
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Wed May 10 09:59:41 2017 +0200
loplugin:checkunusedparams in sc(part3)
Change-Id: I61fc2ba762983d7bafb6ed8baafba458590af59a
Reviewed-on: https://gerrit.libreoffice.org/37458
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index ecbdb580f37a..66ded63e9472 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -738,7 +738,7 @@ public:
void SetColWidthOnly( SCCOL nCol, sal_uInt16 nNewWidth );
void SetRowHeight( SCROW nRow, sal_uInt16 nNewHeight );
bool SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, sal_uInt16
nNewHeight,
- double nPPTX, double nPPTY );
+ double nPPTY );
/**
* Set specified row height to specified ranges. Don't check for drawing
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 49f976a237e5..918cce784866 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -4027,7 +4027,7 @@ void ScDocument::SetRowHeightRange( SCROW nStartRow,
SCROW nEndRow, SCTAB nTab,
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) &&
maTabs[nTab] )
maTabs[nTab]->SetRowHeightRange
- ( nStartRow, nEndRow, nNewHeight, 1.0, 1.0 );
+ ( nStartRow, nEndRow, nNewHeight, 1.0 );
}
void ScDocument::SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, SCTAB nTab,
sal_uInt16 nNewHeight )
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 73133b0c1933..a2712f1696c9 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -160,7 +160,7 @@ struct SetRowHeightRangeFunc : public
OptimalHeightsFuncObjBase
virtual bool operator() (SCROW nStartRow, SCROW nEndRow, sal_uInt16
nHeight) override
{
- return mpTab->SetRowHeightRange(nStartRow, nEndRow, nHeight, mnPPTX,
mnPPTY);
+ return mpTab->SetRowHeightRange(nStartRow, nEndRow, nHeight, mnPPTY);
}
};
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 9286e9c0343b..edd9378bd200 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2808,7 +2808,7 @@ bool lcl_pixelSizeChanged(
}
bool ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, sal_uInt16
nNewHeight,
- double /* nPPTX */, double nPPTY )
+ double nPPTY )
{
bool bChanged = false;
if (ValidRow(nStartRow) && ValidRow(nEndRow) && mpRowHeights)
@@ -2846,9 +2846,9 @@ bool ScTable::SetRowHeightRange( SCROW nStartRow, SCROW
nEndRow, sal_uInt16 nNew
else
{
SCROW nMid = (nStartRow+nEndRow) / 2;
- if (SetRowHeightRange( nStartRow, nMid, nNewHeight, 1.0, 1.0 ))
+ if (SetRowHeightRange( nStartRow, nMid, nNewHeight, 1.0 ))
bChanged = true;
- if (SetRowHeightRange( nMid+1, nEndRow, nNewHeight, 1.0, 1.0 ))
+ if (SetRowHeightRange( nMid+1, nEndRow, nNewHeight, 1.0 ))
bChanged = true;
}
}
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
index d5a4c899e70a..177bb7ea6799 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
@@ -472,7 +472,7 @@ void
ScChangeTrackingExportHelper::WriteInsertion(ScChangeAction* pAction)
WriteDependings(pAction);
}
-void ScChangeTrackingExportHelper::AddDeletionAttributes(const
ScChangeActionDel* pDelAction, const ScChangeActionDel* /* pLastAction */)
+void ScChangeTrackingExportHelper::AddDeletionAttributes(const
ScChangeActionDel* pDelAction)
{
sal_Int32 nPosition(0);
const ScBigRange& rBigRange = pDelAction->GetBigRange();
@@ -576,7 +576,7 @@ void ScChangeTrackingExportHelper::WriteCutOffs(const
ScChangeActionDel* pAction
void ScChangeTrackingExportHelper::WriteDeletion(ScChangeAction* pAction)
{
ScChangeActionDel* pDelAction = static_cast<ScChangeActionDel*> (pAction);
- AddDeletionAttributes(pDelAction, pDelAction);
+ AddDeletionAttributes(pDelAction);
SvXMLElementExport aElemChange(rExport, XML_NAMESPACE_TABLE, XML_DELETION,
true, true);
WriteChangeInfo(pDelAction);
WriteDependings(pDelAction);
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
index 8dc937f2ebef..5d44d81688f9 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
@@ -68,7 +68,7 @@ class ScChangeTrackingExportHelper
void WriteContentChange(ScChangeAction* pAction);
void AddInsertionAttributes(const ScChangeAction* pAction);
void WriteInsertion(ScChangeAction* pAction);
- void AddDeletionAttributes(const ScChangeActionDel* pAction, const
ScChangeActionDel* pLastAction);
+ void AddDeletionAttributes(const ScChangeActionDel* pAction);
void WriteCutOffs(const ScChangeActionDel* pAction);
void WriteDeletion(ScChangeAction* pAction);
void WriteMovement(ScChangeAction* pAction);
diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx
b/sc/source/filter/xml/XMLEmptyContext.cxx
index e7fa6a6d6532..b2e85896cece 100644
--- a/sc/source/filter/xml/XMLEmptyContext.cxx
+++ b/sc/source/filter/xml/XMLEmptyContext.cxx
@@ -20,8 +20,7 @@
#include "XMLEmptyContext.hxx"
#include "xmlimprt.hxx"
-ScXMLEmptyContext::ScXMLEmptyContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/ ) :
+ScXMLEmptyContext::ScXMLEmptyContext( ScXMLImport& rImport ) :
ScXMLImportContext( rImport )
{
}
@@ -31,10 +30,10 @@ ScXMLEmptyContext::~ScXMLEmptyContext()
}
css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
- ScXMLEmptyContext::createFastChildContext( sal_Int32 nElement,
+ ScXMLEmptyContext::createFastChildContext( sal_Int32 /*nElement*/,
const css::uno::Reference< css::xml::sax::XFastAttributeList > &
/*xAttrList*/ )
{
- SvXMLImportContext *pContext = new ScXMLEmptyContext( GetScImport(),
nElement );
+ SvXMLImportContext *pContext = new ScXMLEmptyContext( GetScImport() );
return pContext;
}
diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx
b/sc/source/filter/xml/XMLEmptyContext.hxx
index 49679d2dda4b..cf0b3778ec5e 100644
--- a/sc/source/filter/xml/XMLEmptyContext.hxx
+++ b/sc/source/filter/xml/XMLEmptyContext.hxx
@@ -27,7 +27,7 @@
class ScXMLEmptyContext : public ScXMLImportContext
{
public:
- ScXMLEmptyContext( ScXMLImport& rImport, sal_Int32 nElement );
+ ScXMLEmptyContext( ScXMLImport& rImport );
virtual ~ScXMLEmptyContext() override;
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx
b/sc/source/filter/xml/XMLStylesImportHelper.cxx
index 43d7e9a51ec5..2840bf46bfe2 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx
@@ -131,7 +131,7 @@ void ScMyStyleRanges::AddCurrencyRange(const ScRange&
rRange, const OUString* pC
aItr->mpRanges->addRange(rRange);
}
-void ScMyStyleRanges::InsertCol(const sal_Int32 nCol, const sal_Int32 nTab,
ScDocument* /*pDoc*/)
+void ScMyStyleRanges::InsertCol(const sal_Int32 nCol, const sal_Int32 nTab)
{
if (mpTextList)
mpTextList->insertCol(static_cast<SCCOL>(nCol),
static_cast<SCTAB>(nTab));
@@ -444,14 +444,14 @@ void ScMyStylesImportHelper::AddCell(const ScAddress&
rAddress)
AddRange(aScRange);
}
-void ScMyStylesImportHelper::InsertCol(const sal_Int32 nCol, const sal_Int32
nTab, ScDocument* pDoc)
+void ScMyStylesImportHelper::InsertCol(const sal_Int32 nCol, const sal_Int32
nTab)
{
ScXMLImport::MutexGuard aGuard(rImport);
ScMyStylesSet::iterator aItr(aCellStyles.begin());
ScMyStylesSet::iterator aEndItr(aCellStyles.end());
while (aItr != aEndItr)
{
- aItr->xRanges->InsertCol(nCol, nTab, pDoc);
+ aItr->xRanges->InsertCol(nCol, nTab);
++aItr;
}
}
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx
b/sc/source/filter/xml/XMLStylesImportHelper.hxx
index bc5d9f3efb0a..36b2f8d583e2 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx
@@ -100,7 +100,7 @@ public:
virtual ~ScMyStyleRanges() override;
void AddRange(const ScRange& rRange, const sal_Int16 nType);
void AddCurrencyRange(const ScRange& rRange, const OUString* pCurrency);
- void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument*
pDoc);
+ void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab);
void SetStylesToRanges(const OUString* pStyleName, ScXMLImport& rImport);
};
@@ -158,7 +158,7 @@ public:
OUString* pCurrency, const sal_Int16 nCellType);
void AddRange(const ScRange& rRange);
void AddCell(const ScAddress& rAddress);
- void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument*
pDoc); // a col is inserted before nCol
+ void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab); // a col is
inserted before nCol
void EndTable();
void SetStylesToRanges();
};
diff --git a/sc/source/filter/xml/xmlbodyi.cxx
b/sc/source/filter/xml/xmlbodyi.cxx
index dcddb221cc92..d55049298f9d 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -57,7 +57,6 @@ using namespace com::sun::star;
using namespace xmloff::token;
ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const
uno::Reference<xml::sax::XFastAttributeList>& xAttrList ) :
ScXMLImportContext( rImport ),
sPassword(),
@@ -213,11 +212,11 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
if (GetScImport().GetTables().GetCurrentSheet() >= MAXTAB)
{
GetScImport().SetRangeOverflowType(SCWARN_IMPORT_SHEET_OVERFLOW);
- pContext = new ScXMLEmptyContext(GetScImport(), nElement );
+ pContext = new ScXMLEmptyContext(GetScImport() );
}
else
{
- pContext = new ScXMLTableContext( GetScImport(),nElement,
xAttrList );
+ pContext = new ScXMLTableContext( GetScImport(), xAttrList );
}
break;
diff --git a/sc/source/filter/xml/xmlbodyi.hxx
b/sc/source/filter/xml/xmlbodyi.hxx
index b80bbd8cd044..e0b9db6458e1 100644
--- a/sc/source/filter/xml/xmlbodyi.hxx
+++ b/sc/source/filter/xml/xmlbodyi.hxx
@@ -41,7 +41,7 @@ class ScXMLBodyContext : public ScXMLImportContext
public:
- ScXMLBodyContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLBodyContext( ScXMLImport& rImport,
const
css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList );
virtual ~ScXMLBodyContext() override;
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index 8d31e4f9b374..43e51e653886 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -118,7 +118,6 @@ ScXMLTableRowCellContext::Field::~Field()
}
ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const
css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
const bool bTempIsCovered,
const sal_Int32 nTempRepeatedRows ) :
diff --git a/sc/source/filter/xml/xmlcelli.hxx
b/sc/source/filter/xml/xmlcelli.hxx
index 284c8ffe1136..d7a706388a5c 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -129,7 +129,7 @@ class ScXMLTableRowCellContext : public ScXMLImportContext
public:
- ScXMLTableRowCellContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLTableRowCellContext( ScXMLImport& rImport,
const
css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
const bool bIsCovered, const sal_Int32 nRepeatedRows );
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 758d27951432..c8f94d7c4096 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -234,9 +234,7 @@ public:
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList );
- ScXMLDocContext_Impl( ScXMLImport& rImport,
- sal_Int32 nElement,
- const uno::Reference<xml::sax::XFastAttributeList>& xAttrList );
+ ScXMLDocContext_Impl( ScXMLImport& rImport );
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -262,8 +260,7 @@ SvXMLImportContext( rImport, nPrfx, rLName )
}
-ScXMLDocContext_Impl::ScXMLDocContext_Impl( ScXMLImport& rImport, sal_Int32
/*nElement*/,
- const
uno::Reference<xml::sax::XFastAttributeList>& /*xAttrList*/ ) :
+ScXMLDocContext_Impl::ScXMLDocContext_Impl( ScXMLImport& rImport ) :
SvXMLImportContext( rImport )
{
}
@@ -279,7 +276,6 @@ public:
const uno::Reference<document::XDocumentProperties>& i_xDocProps);
ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport,
- sal_Int32 nElement,
const uno::Reference<xml::sax::XFastAttributeList>& i_xAttrList,
const uno::Reference<document::XDocumentProperties>& i_xDocProps);
@@ -308,11 +304,11 @@ SvXMLMetaDocumentContext(i_rImport, i_nPrefix, i_rLName,
{
}
-ScXMLFlatDocContext_Impl::ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport,
sal_Int32 nElement,
- const
uno::Reference<xml::sax::XFastAttributeList>& i_xAttrList,
+ScXMLFlatDocContext_Impl::ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport,
+ const
uno::Reference<xml::sax::XFastAttributeList>& /*i_xAttrList*/,
const
uno::Reference<document::XDocumentProperties>& i_xDocProps) :
SvXMLImportContext(i_rImport),
-ScXMLDocContext_Impl(i_rImport, nElement, i_xAttrList),
+ScXMLDocContext_Impl(i_rImport),
SvXMLMetaDocumentContext(i_rImport, i_xDocProps)
{
}
@@ -356,25 +352,23 @@ void SAL_CALL
ScXMLFlatDocContext_Impl::endFastElement(sal_Int32 nElement)
class ScXMLBodyContext_Impl : public ScXMLImportContext
{
public:
- ScXMLBodyContext_Impl( ScXMLImport& rImport, sal_Int32 nElement,
- const uno::Reference< xml::sax::XFastAttributeList > & xAttrList );
+ ScXMLBodyContext_Impl( ScXMLImport& rImport );
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext( sal_Int32 nElement,
const css::uno::Reference<css::xml::sax::XFastAttributeList>&
xAttrList ) override;
};
-ScXMLBodyContext_Impl::ScXMLBodyContext_Impl( ScXMLImport& rImport, sal_Int32
/*nElement*/,
- const uno::Reference<
xml::sax::XFastAttributeList > & /* xAttrList */ ) :
+ScXMLBodyContext_Impl::ScXMLBodyContext_Impl( ScXMLImport& rImport ) :
ScXMLImportContext( rImport )
{
}
uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
- ScXMLBodyContext_Impl::createFastChildContext( sal_Int32 nElement,
+ ScXMLBodyContext_Impl::createFastChildContext( sal_Int32 /*nElement*/,
const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
{
- return GetScImport().CreateBodyContext( nElement, xAttrList );
+ return GetScImport().CreateBodyContext( xAttrList );
}
SvXMLImportContext *ScXMLDocContext_Impl::CreateChildContext( sal_uInt16
nPrefix,
@@ -424,7 +418,7 @@ SvXMLImportContext
*ScXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix
uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
ScXMLDocContext_Impl::createFastChildContext( sal_Int32 nElement,
- const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
+ const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList*/ )
{
SvXMLImportContext *pContext(nullptr);
@@ -433,8 +427,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
{
case XML_TOK_DOC_BODY:
if (GetScImport().getImportFlags() & SvXMLImportFlags::CONTENT)
- pContext = new ScXMLBodyContext_Impl( GetScImport(),
- nElement, xAttrList );
+ pContext = new ScXMLBodyContext_Impl( GetScImport() );
break;
//TODO: handle all other cases
@@ -2052,7 +2045,7 @@ SvXMLImportContext *ScXMLImport::CreateFastContext(
sal_Int32 nElement,
case ( NAMESPACE_TOKEN( XML_NAMESPACE_OFFICE ) | XML_DOCUMENT_STYLES ):
case ( NAMESPACE_TOKEN( XML_NAMESPACE_OFFICE ) | XML_DOCUMENT_CONTENT ):
case ( NAMESPACE_TOKEN( XML_NAMESPACE_OFFICE ) | XML_DOCUMENT_SETTINGS ):
- pContext = new ScXMLDocContext_Impl( *this, nElement, xAttrList );
+ pContext = new ScXMLDocContext_Impl( *this );
break;
case ( NAMESPACE_TOKEN( XML_NAMESPACE_OFFICE ) | XML_DOCUMENT ):
@@ -2060,7 +2053,7 @@ SvXMLImportContext *ScXMLImport::CreateFastContext(
sal_Int32 nElement,
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
GetModel(), uno::UNO_QUERY_THROW);
// flat OpenDocument file format
- pContext = new ScXMLFlatDocContext_Impl( *this, nElement,
+ pContext = new ScXMLFlatDocContext_Impl( *this,
xAttrList, xDPS->getDocumentProperties());
break;
}
@@ -2361,10 +2354,9 @@ SvXMLImportContext
*ScXMLImport::CreateStylesContext(const OUString& rLocalName,
return pContext;
}
-SvXMLImportContext *ScXMLImport::CreateBodyContext(const sal_Int32 nElement,
- const
uno::Reference<xml::sax::XFastAttributeList>& xAttrList)
+SvXMLImportContext *ScXMLImport::CreateBodyContext(const
uno::Reference<xml::sax::XFastAttributeList>& xAttrList)
{
- return new ScXMLBodyContext(*this, nElement, xAttrList);
+ return new ScXMLBodyContext(*this, xAttrList);
}
SvXMLImportContext *ScXMLImport::CreateMetaContext(
diff --git a/sc/source/filter/xml/xmlimprt.hxx
b/sc/source/filter/xml/xmlimprt.hxx
index 7cf62782732a..02c2ccfb3504 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -983,7 +983,6 @@ public:
bool bAutoStyles );
SvXMLImportContext *CreateBodyContext(
- const sal_Int32 nElement,
const
css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList );
virtual void SetStatistics( const css::uno::Sequence<
css::beans::NamedValue> & i_rStats) override;
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index 815007fe3cd0..f6eb8c28c3e8 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -44,7 +44,6 @@ using namespace com::sun::star;
using namespace xmloff::token;
ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const
css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) :
ScXMLImportContext( rImport ),
sVisibility(GetXMLToken(XML_VISIBLE)),
@@ -114,7 +113,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
// if( IsInsertCellPossible() )
{
bHasCell = true;
- pContext = new ScXMLTableRowCellContext( GetScImport(), nElement,
+ pContext = new ScXMLTableRowCellContext( GetScImport(),
xAttrList, false,
static_cast<SCROW>(nRepeatedRows)
//this
);
@@ -124,7 +123,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
// if( IsInsertCellPossible() )
{
bHasCell = true;
- pContext = new ScXMLTableRowCellContext( GetScImport(), nElement,
+ pContext = new ScXMLTableRowCellContext( GetScImport(),
xAttrList, true,
static_cast<SCROW>(nRepeatedRows)
//this
);
@@ -210,7 +209,6 @@ void SAL_CALL
ScXMLTableRowContext::endFastElement(sal_Int32 /*nElement*/)
}
ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const
css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
const bool bTempHeader,
const bool bTempGroup ) :
@@ -255,22 +253,19 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
switch( rTokenMap.Get( nElement ) )
{
case XML_TOK_TABLE_ROWS_ROW_GROUP:
- pContext = new ScXMLTableRowsContext( GetScImport(), nElement,
xAttrList,
+ pContext = new ScXMLTableRowsContext( GetScImport(), xAttrList,
false, true );
break;
case XML_TOK_TABLE_ROWS_HEADER_ROWS:
- pContext = new ScXMLTableRowsContext( GetScImport(), nElement,
xAttrList,
+ pContext = new ScXMLTableRowsContext( GetScImport(), xAttrList,
true, false );
break;
case XML_TOK_TABLE_ROWS_ROWS:
- pContext = new ScXMLTableRowsContext( GetScImport(), nElement,
xAttrList,
+ pContext = new ScXMLTableRowsContext( GetScImport(), xAttrList,
false, false );
break;
case XML_TOK_TABLE_ROWS_ROW:
- pContext = new ScXMLTableRowContext( GetScImport(), nElement,
- xAttrList//,
- //this
- );
+ pContext = new ScXMLTableRowContext( GetScImport(), xAttrList );
break;
}
diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx
index 1b3839349dc2..0bcc6f595467 100644
--- a/sc/source/filter/xml/xmlrowi.hxx
+++ b/sc/source/filter/xml/xmlrowi.hxx
@@ -35,7 +35,7 @@ class ScXMLTableRowContext : public ScXMLImportContext
public:
- ScXMLTableRowContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLTableRowContext( ScXMLImport& rImport,
const
css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList );
virtual ~ScXMLTableRowContext() override;
@@ -57,7 +57,7 @@ class ScXMLTableRowsContext : public ScXMLImportContext
public:
- ScXMLTableRowsContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLTableRowsContext( ScXMLImport& rImport,
const
css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList,
const bool bHeader, const bool bGroup);
diff --git a/sc/source/filter/xml/xmlsubti.cxx
b/sc/source/filter/xml/xmlsubti.cxx
index c145cc2a6cad..e45e94f4e3b4 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -181,7 +181,7 @@ void ScMyTables::AddColumn(bool bIsCovered)
//here only need to set column style if this is the first row and
//the cell is not covered.
if(maCurrentCellPos.Row() == 0 && !bIsCovered)
- rImport.GetStylesImportHelper()->InsertCol(maCurrentCellPos.Col(),
maCurrentCellPos.Tab(), rImport.GetDocument());
+ rImport.GetStylesImportHelper()->InsertCol(maCurrentCellPos.Col(),
maCurrentCellPos.Tab());
}
void ScMyTables::DeleteTable()
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index 668fbeea1aaa..3c1a89cac4da 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -130,7 +130,6 @@ ScXMLExternalTabData::ScXMLExternalTabData() :
}
ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport,
- sal_Int32 /*nElement*/,
const
css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList ) :
ScXMLImportContext( rImport ),
nStartOffset(-1),
@@ -333,22 +332,19 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
switch (nToken)
{
case XML_TOK_TABLE_ROW_GROUP:
- pContext = new ScXMLTableRowsContext( GetScImport(), nElement,
xAttrList,
+ pContext = new ScXMLTableRowsContext( GetScImport(), xAttrList,
false, true );
break;
case XML_TOK_TABLE_HEADER_ROWS:
- pContext = new ScXMLTableRowsContext( GetScImport(), nElement,
xAttrList,
+ pContext = new ScXMLTableRowsContext( GetScImport(), xAttrList,
true, false );
break;
case XML_TOK_TABLE_ROWS:
- pContext = new ScXMLTableRowsContext( GetScImport(), nElement,
xAttrList,
+ pContext = new ScXMLTableRowsContext( GetScImport(), xAttrList,
false, false );
break;
case XML_TOK_TABLE_ROW:
- pContext = new ScXMLTableRowContext( GetScImport(), nElement,
- xAttrList//,
- //this
- );
+ pContext = new ScXMLTableRowContext( GetScImport(),xAttrList );
break;
default:
pContext = new SvXMLImportContext( GetImport() );
diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx
index ada786019320..d36f4d843f77 100644
--- a/sc/source/filter/xml/xmltabi.hxx
+++ b/sc/source/filter/xml/xmltabi.hxx
@@ -48,7 +48,7 @@ class ScXMLTableContext : public ScXMLImportContext
public:
- ScXMLTableContext( ScXMLImport& rImport, sal_Int32 nElement,
+ ScXMLTableContext( ScXMLImport& rImport,
const
css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList );
virtual ~ScXMLTableContext() override;
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 45130ebed1c4..791747d0eae5 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -299,7 +299,7 @@ private:
ScSplitPos meSplitPos;
void FillShapes(std::vector < uno::Reference < drawing::XShape > >&
rShapes) const;
- bool FindSelectedShapesChanges(const
css::uno::Reference<css::drawing::XShapes>& xShapes, bool bCommitChange) const;
+ bool FindSelectedShapesChanges(const
css::uno::Reference<css::drawing::XShapes>& xShapes) const;
ScAddress* GetAnchor(const uno::Reference<drawing::XShape>& xShape) const;
uno::Reference<XAccessibleRelationSet> GetRelationSet(const
ScAccessibleShapeData* pData) const;
@@ -350,7 +350,7 @@ ScChildrenShapes::ScChildrenShapes(ScAccessibleDocument*
pAccessibleDocument, Sc
uno::Reference<drawing::XShapes>
xShapes(xSelectionSupplier->getSelection(), uno::UNO_QUERY);
if (xShapes.is())
- FindSelectedShapesChanges(xShapes, false);
+ FindSelectedShapesChanges(xShapes);
}
if (pViewShell)
{
@@ -678,7 +678,7 @@ bool ScChildrenShapes::SelectionChanged()
uno::Reference<drawing::XShapes>
xShapes(xSelectionSupplier->getSelection(), uno::UNO_QUERY);
- bResult = FindSelectedShapesChanges(xShapes, true);
+ bResult = FindSelectedShapesChanges(xShapes);
return bResult;
}
@@ -930,7 +930,7 @@ utl::AccessibleRelationSetHelper*
ScChildrenShapes::GetRelationSet(const ScAddre
return aSetRelation.mpRelationSet;
}
-bool ScChildrenShapes::FindSelectedShapesChanges(const
uno::Reference<drawing::XShapes>& xShapes, bool /* bCommitChange */) const
+bool ScChildrenShapes::FindSelectedShapesChanges(const
uno::Reference<drawing::XShapes>& xShapes) const
{
bool bResult(false);
SortedShapes aShapesList;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
