summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-19 10:24:57 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-20 06:12:24 +0000
commit40fc2c1a0d2ebdf47131651045107c9d5abb850d (patch)
tree66a2d4c7220dfd47b09984892a8a08a7e5ab5fea /starmath
parente7324c5705eaa38a2c9aa0636f01a73f033ba4d6 (diff)
loplugin:expandablemethodds in sfx2..starmath
Change-Id: Ia4c411f5a9a68c2f344188ce6b6bc1815c89f993 Reviewed-on: https://gerrit.libreoffice.org/30055 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'starmath')
-rw-r--r--starmath/inc/parse.hxx3
-rw-r--r--starmath/inc/rect.hxx1
-rw-r--r--starmath/inc/view.hxx5
-rw-r--r--starmath/source/parse.cxx4
-rw-r--r--starmath/source/rect.cxx2
-rw-r--r--starmath/source/view.cxx2
6 files changed, 4 insertions, 13 deletions
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 7d679310cc6c..d22a426519fe 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -92,9 +92,6 @@ class SmParser
void Error(SmParseError Error);
- void ClearUsedSymbols() { m_aUsedSymbols.clear(); }
- void AddToUsedSymbols( const OUString &rSymbolName ) { m_aUsedSymbols.insert( rSymbolName ); }
-
public:
SmParser();
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index 1c8f3e3b5ead..c28e1d257539 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -114,7 +114,6 @@ protected:
void Init(const OutputDevice &rDev, const SmFormat *pFormat,
const OUString &rText, sal_uInt16 nBorderWidth);
- void ClearBaseline() { bHasBaseline = false; };
inline void CopyMBL(const SmRect& rRect);
void CopyAlignInfo(const SmRect& rRect);
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index d17919eddc38..e6bf3238bec5 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -80,11 +80,6 @@ private:
sal_uInt16 nZoom;
protected:
- void SetFormulaDrawPos(const Point &rPos)
- {
- aFormulaDrawPos = rPos;
- }
-
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
virtual void KeyInput(const KeyEvent& rKEvt) override;
virtual void Command(const CommandEvent& rCEvt) override;
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 56023adb10cf..f33a942f0ee5 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2255,7 +2255,7 @@ void SmParser::DoSpecial()
// add symbol name to list of used symbols
const OUString aSymbolName(m_aCurToken.aText.copy(1));
if (!aSymbolName.isEmpty())
- AddToUsedSymbols( aSymbolName );
+ m_aUsedSymbols.insert( aSymbolName );
m_aNodeStack.push_front(o3tl::make_unique<SmSpecialNode>(m_aCurToken));
NextToken();
@@ -2301,7 +2301,7 @@ SmParser::SmParser()
SmTableNode *SmParser::Parse(const OUString &rBuffer)
{
- ClearUsedSymbols();
+ m_aUsedSymbols.clear();
m_aBufferString = convertLineEnd(rBuffer, LINEEND_LF);
m_nBufferIndex = 0;
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index 550cd242b2cd..63798c6b917f 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -462,7 +462,7 @@ SmRect & SmRect::ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode)
CopyMBL(rRect);
break;
case RectCopyMBL::None:
- ClearBaseline();
+ bHasBaseline = false;
nAlignM = (nAlignT + nAlignB) / 2;
break;
case RectCopyMBL::Xor:
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 3bd645a314bf..47f15e602c94 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -379,7 +379,7 @@ void SmGraphicWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&
rDoc.DrawFormula(rRenderContext, aPoint, true); //! modifies aPoint to be the topleft
//! corner of the formula
- SetFormulaDrawPos(aPoint);
+ aFormulaDrawPos = aPoint;
if (IsInlineEditEnabled())
{
//Draw cursor if any...