summaryrefslogtreecommitdiff
path: root/editeng/source/rtf
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-21 14:14:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-21 13:00:01 +0000
commit861a322c662eb48b8da21c9d3ad1fa1f2f961391 (patch)
tree218c27389b31068393ccb2117d22cdeaaeedfbee /editeng/source/rtf
parent965a008d66035069249b1f218f1663f5f9fcf5dd (diff)
loplugin:expandablemethodds in include/editeng
Change-Id: Iaf56cb9c16a4cbfb9ab1636228c77d1033a334f5 Reviewed-on: https://gerrit.libreoffice.org/30132 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng/source/rtf')
-rw-r--r--editeng/source/rtf/svxrtf.cxx18
1 files changed, 4 insertions, 14 deletions
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 8c40e4b7b0c1..c88070c22f26 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -112,9 +112,9 @@ SvParserState SvxRTFParser::CallParser()
if( !aColorTbl.empty() )
ClearColorTbl();
if (!m_FontTable.empty())
- ClearFontTbl();
+ m_FontTable.clear();
if (!m_StyleTable.empty())
- ClearStyleTbl();
+ m_StyleTable.clear();
if( !aAttrStack.empty() )
ClearAttrStack();
@@ -747,16 +747,6 @@ void SvxRTFParser::ClearColorTbl()
}
}
-void SvxRTFParser::ClearFontTbl()
-{
- m_FontTable.clear();
-}
-
-void SvxRTFParser::ClearStyleTbl()
-{
- m_StyleTable.clear();
-}
-
void SvxRTFParser::ClearAttrStack()
{
for( size_t nCnt = aAttrStack.size(); nCnt; --nCnt )
@@ -1178,7 +1168,7 @@ void SvxRTFItemStackType::MoveFullNode(const EditNodeIdx &rOldNode,
{
bool bSameEndAsStart = (pSttNd == pEndNd);
- if (GetSttNodeIdx() == rOldNode.GetIdx())
+ if (pSttNd->GetIdx() == rOldNode.GetIdx())
{
delete pSttNd;
pSttNd = rNewNode.Clone();
@@ -1186,7 +1176,7 @@ void SvxRTFItemStackType::MoveFullNode(const EditNodeIdx &rOldNode,
pEndNd = pSttNd;
}
- if (!bSameEndAsStart && GetEndNodeIdx() == rOldNode.GetIdx())
+ if (!bSameEndAsStart && pEndNd->GetIdx() == rOldNode.GetIdx())
{
delete pEndNd;
pEndNd = rNewNode.Clone();