[Libreoffice-commits] core.git: starmath/inc starmath/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu May 4 06:40:34 UTC 2017
starmath/inc/edit.hxx | 2 +-
starmath/source/accessibility.cxx | 4 ++--
starmath/source/accessibility.hxx | 2 +-
starmath/source/edit.cxx | 2 +-
starmath/source/mathmlexport.cxx | 16 ++++++++--------
starmath/source/mathmlexport.hxx | 6 +++---
starmath/source/mathtype.cxx | 16 ++++++++--------
starmath/source/mathtype.hxx | 6 +++---
starmath/source/view.cxx | 2 +-
9 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 9fbd05e0c73970d5a4b5dbaebcff104e34776752
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed May 3 12:02:35 2017 +0200
loplugin:checkunusedparams in starmath
Change-Id: I1a2299f66e077879863ac0e694e42196c9432458
Reviewed-on: https://gerrit.libreoffice.org/37192
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 2dea051045ed..173ccba43a1d 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -116,7 +116,7 @@ public:
static bool HasMark(const OUString &rText);
void Flush();
- void DeleteEditView(SmViewShell& rView);
+ void DeleteEditView();
void ApplyColorConfigValues(const svtools::ColorConfig& rColorCfg);
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 3c91461ccbc6..10278840f4c0 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -747,7 +747,7 @@ Sequence< OUString > SAL_CALL SmGraphicAccessible::getSupportedServiceNames()
}
-SmEditSource::SmEditSource( SmEditWindow * /*pWin*/, SmEditAccessible &rAcc ) :
+SmEditSource::SmEditSource( SmEditAccessible &rAcc ) :
aViewFwd (rAcc),
aTextFwd (rAcc, *this),
aEditViewFwd(rAcc),
@@ -1568,7 +1568,7 @@ void SmEditAccessible::Init()
if (pEditEngine && pEditView)
{
assert(!pTextHelper);
- pTextHelper.reset(new ::accessibility::AccessibleTextHelper( o3tl::make_unique<SmEditSource>( pWin, *this ) ));
+ pTextHelper.reset(new ::accessibility::AccessibleTextHelper( o3tl::make_unique<SmEditSource>( *this ) ));
pTextHelper->SetEventSource( this );
}
}
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index bc9186ba41db..72734cdd5a40 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -279,7 +279,7 @@ class SmEditSource :
SmEditSource & operator = ( const SmEditSource & ) = delete;
public:
- SmEditSource( SmEditWindow *pWin, SmEditAccessible &rAcc );
+ SmEditSource( SmEditAccessible &rAcc );
virtual ~SmEditSource() override;
virtual SvxEditSource* Clone() const override;
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index f66b9599a752..df8816aff0f8 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -1014,7 +1014,7 @@ void SmEditWindow::Flush()
}
}
-void SmEditWindow::DeleteEditView( SmViewShell & /*rView*/ )
+void SmEditWindow::DeleteEditView()
{
if (pEditView)
{
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 596ad9824129..6058e6450f94 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -789,7 +789,7 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int nLevel)
delete pTable;
}
-void SmXMLExport::ExportMath(const SmNode *pNode, int /*nLevel*/)
+void SmXMLExport::ExportMath(const SmNode *pNode)
{
const SmTextNode *pTemp = static_cast<const SmTextNode *>(pNode);
SvXMLElementExport *pMath = nullptr;
@@ -831,7 +831,7 @@ void SmXMLExport::ExportMath(const SmNode *pNode, int /*nLevel*/)
delete pMath;
}
-void SmXMLExport::ExportText(const SmNode *pNode, int /*nLevel*/)
+void SmXMLExport::ExportText(const SmNode *pNode)
{
SvXMLElementExport *pText;
const SmTextNode *pTemp = static_cast<const SmTextNode *>(pNode);
@@ -861,7 +861,7 @@ void SmXMLExport::ExportText(const SmNode *pNode, int /*nLevel*/)
delete pText;
}
-void SmXMLExport::ExportBlank(const SmNode *pNode, int /*nLevel*/)
+void SmXMLExport::ExportBlank(const SmNode *pNode)
{
const SmBlankNode *pTemp = static_cast<const SmBlankNode *>(pNode);
//!! exports an <mspace> element. Note that for example "~_~" is allowed in
@@ -1469,7 +1469,7 @@ void SmXMLExport::ExportNodes(const SmNode *pNode, int nLevel)
ExportLine(pNode, nLevel);
break;
case SmNodeType::Text:
- ExportText(pNode, nLevel);
+ ExportText(pNode);
break;
case SmNodeType::GlyphSpecial:
case SmNodeType::Math:
@@ -1482,7 +1482,7 @@ void SmXMLExport::ExportNodes(const SmNode *pNode, int nLevel)
{
// no conversion to MathML implemented -> export it as text
// thus at least it will not vanish into nothing
- ExportText(pNode, nLevel);
+ ExportText(pNode);
}
else
{
@@ -1516,14 +1516,14 @@ void SmXMLExport::ExportNodes(const SmNode *pNode, int nLevel)
{
AddAttribute(XML_NAMESPACE_MATH, XML_STRETCHY, XML_FALSE);
}
- ExportMath(pNode, nLevel);
+ ExportMath(pNode);
}
}
break;
case SmNodeType::Special: //SmNodeType::Special requires some sort of Entity preservation in the XML engine.
case SmNodeType::MathIdent:
case SmNodeType::Place:
- ExportMath(pNode, nLevel);
+ ExportMath(pNode);
break;
case SmNodeType::BinHor:
ExportBinaryHorizontal(pNode, nLevel);
@@ -1562,7 +1562,7 @@ void SmXMLExport::ExportNodes(const SmNode *pNode, int nLevel)
ExportMatrix(pNode, nLevel);
break;
case SmNodeType::Blank:
- ExportBlank(pNode, nLevel);
+ ExportBlank(pNode);
break;
default:
SAL_WARN("starmath", "Warning: failed to export a node?");
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index a706457a83a1..b0ebbe6d1aab 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -77,8 +77,8 @@ protected:
void ExportLine(const SmNode *pNode, int nLevel);
void ExportExpression(const SmNode *pNode, int nLevel,
bool bNoMrowContainer = false);
- void ExportText(const SmNode *pNode, int nLevel);
- void ExportMath(const SmNode *pNode, int nLevel);
+ void ExportText(const SmNode *pNode);
+ void ExportMath(const SmNode *pNode);
void ExportBinaryHorizontal(const SmNode *pNode, int nLevel);
void ExportUnaryHorizontal(const SmNode *pNode, int nLevel);
void ExportBrace(const SmNode *pNode, int nLevel);
@@ -91,7 +91,7 @@ protected:
void ExportFont(const SmNode *pNode, int nLevel);
void ExportVerticalBrace(const SmVerticalBraceNode *pNode, int nLevel);
void ExportMatrix(const SmNode *pNode, int nLevel);
- void ExportBlank(const SmNode *pNode, int nLevel);
+ void ExportBlank(const SmNode *pNode);
public:
SmXMLExport(
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 058b836c4f59..7411912b7fa4 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -1798,7 +1798,7 @@ void MathType::HandleMatrixSeparator(int nMatrixRows,int nMatrixCols,
/* set the alignment of the following term, but starmath currently
* cannot handle vertical alignment */
-void MathType::HandleAlign(sal_uInt8 nHorAlign, sal_uInt8 /*nVAlign*/, int &rSetAlign)
+void MathType::HandleAlign(sal_uInt8 nHorAlign, int &rSetAlign)
{
switch(nHorAlign)
{
@@ -1956,7 +1956,7 @@ void MathType::HandleNodes(SmNode *pNode,int nLevel)
HandleAttributes(pNode,nLevel);
break;
case SmNodeType::Text:
- HandleText(pNode,nLevel);
+ HandleText(pNode);
break;
case SmNodeType::VerticalBrace:
HandleVerticalBrace(pNode,nLevel);
@@ -1979,14 +1979,14 @@ void MathType::HandleNodes(SmNode *pNode,int nLevel)
//if the token str and the result text are the same then this
//is to be seen as text, else assume it's a mathchar
if (pText->GetText() == pText->GetToken().aText)
- HandleText(pText,nLevel);
+ HandleText(pText);
else
- HandleMath(pText,nLevel);
+ HandleMath(pText);
}
break;
case SmNodeType::Math:
case SmNodeType::MathIdent:
- HandleMath(pNode,nLevel);
+ HandleMath(pNode);
break;
case SmNodeType::SubSup:
HandleSubSupScript(pNode,nLevel);
@@ -2643,7 +2643,7 @@ bool MathType::HandlePile(int &rSetAlign, int nLevel, sal_uInt8 nSelector, sal_u
pS->ReadUChar( nHAlign );
pS->ReadUChar( nVAlign );
- HandleAlign(nHAlign,nVAlign,rSetAlign);
+ HandleAlign(nHAlign, rSetAlign);
rRet += " stack {\n";
bool bRet = HandleRecords( nLevel+1, nSelector, nVariation, -1, -1 );
@@ -3045,7 +3045,7 @@ void MathType::HandleMAlign(SmNode *pNode,int nLevel)
nHAlign=nPushedHAlign;
}
-void MathType::HandleMath(SmNode *pNode, int /*nLevel*/)
+void MathType::HandleMath(SmNode *pNode)
{
if (pNode->GetToken().eType == TMLINE)
{
@@ -3276,7 +3276,7 @@ void MathType::HandleAttributes(SmNode *pNode,int nLevel)
}
}
-void MathType::HandleText(SmNode *pNode, int /*nLevel*/)
+void MathType::HandleText(SmNode *pNode)
{
SmTextNode *pTemp = static_cast<SmTextNode *>(pNode);
for(sal_Int32 i=0;i<pTemp->GetText().getLength();i++)
diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx
index 6bf40f828724..2e617a155339 100644
--- a/starmath/source/mathtype.hxx
+++ b/starmath/source/mathtype.hxx
@@ -123,7 +123,7 @@ private:
bool HandleRecords(int nLevel, sal_uInt8 nSelector =0xFF,
sal_uInt8 nVariation =0xFF, int nRows =0, int nCols =0);
bool HandleSize(sal_Int16 nLSize, sal_Int16 nDSize, int &rSetSize);
- void HandleAlign(sal_uInt8 nHAlign, sal_uInt8 nVAlign, int &rSetAlign);
+ void HandleAlign(sal_uInt8 nHAlign, int &rSetAlign);
bool HandlePile(int &rSetAlign, int nLevel, sal_uInt8 nSelector, sal_uInt8 nVariation);
bool HandleMatrix(int nLevel, sal_uInt8 nSelector, sal_uInt8 nVariarion);
void HandleMatrixSeparator(int nMatrixRows, int nMatrixCols, int &rCurCol, int &rCurRow);
@@ -155,8 +155,8 @@ private:
void HandleOperator(SmNode *pNode,int nLevel);
bool HandleLim(SmNode *pNode,int nLevel);
void HandleMAlign(SmNode *pNode,int nLevel);
- void HandleMath(SmNode *pNode,int nLevel);
- void HandleText(SmNode *pNode,int nLevel);
+ void HandleMath(SmNode *pNode);
+ void HandleText(SmNode *pNode);
void HandleAttributes(SmNode *pNode,int nLevel);
void TypeFaceToString(OUString &rRet,sal_uInt8 nFace);
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 65e0cbbee5bb..b6994a1a9063 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1928,7 +1928,7 @@ SmViewShell::~SmViewShell()
// Thus we need to supply this view as argument
SmEditWindow *pEditWin = GetEditWindow();
if (pEditWin)
- pEditWin->DeleteEditView( *this );
+ pEditWin->DeleteEditView();
mpGraphic.disposeAndClear();
}
More information about the Libreoffice-commits
mailing list