summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-06-09 10:09:42 +0200
committerNoel Grandin <noel@peralex.com>2014-06-09 10:10:13 +0200
commit184a00b96235f6432294ded63ce4a4a318effdb5 (patch)
treee4ae0e00cb168fa43d280cfb51a50515258b5320 /sw/source/filter/ww8
parent534015ad4fd08823b4393dab1ad5d42dedd7bf62 (diff)
loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
Diffstat (limited to 'sw/source/filter/ww8')
-rw-r--r--sw/source/filter/ww8/WW8FibData.cxx8
-rw-r--r--sw/source/filter/ww8/WW8FibData.hxx4
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.cxx56
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.hxx28
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx4
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx2
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx4
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx2
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx4
-rw-r--r--sw/source/filter/ww8/ww8toolbar.hxx2
10 files changed, 19 insertions, 95 deletions
diff --git a/sw/source/filter/ww8/WW8FibData.cxx b/sw/source/filter/ww8/WW8FibData.cxx
index 4a5a5829d01f..2c94015a1ca6 100644
--- a/sw/source/filter/ww8/WW8FibData.cxx
+++ b/sw/source/filter/ww8/WW8FibData.cxx
@@ -41,15 +41,7 @@ void WW8FibData::setWriteReservation(bool bWriteReservation)
m_bWriteReservation = bWriteReservation;
}
-bool WW8FibData::getReadOnlyRecommended() const
-{
- return m_bReadOnlyRecommended;
-}
-bool WW8FibData::getWriteReservation() const
-{
- return m_bWriteReservation;
-}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/WW8FibData.hxx b/sw/source/filter/ww8/WW8FibData.hxx
index fb1b18de46c1..a196b8560ecb 100644
--- a/sw/source/filter/ww8/WW8FibData.hxx
+++ b/sw/source/filter/ww8/WW8FibData.hxx
@@ -35,8 +35,8 @@ public:
void setReadOnlyRecommended(bool bReadOnlyRecommended);
void setWriteReservation(bool bWriteReservation);
- bool getReadOnlyRecommended() const;
- bool getWriteReservation() const;
+ bool getReadOnlyRecommended() const { return m_bReadOnlyRecommended;}
+ bool getWriteReservation() const { return m_bWriteReservation;}
};
}
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index 075020debce4..d6544742865f 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -113,45 +113,13 @@ void WW8TableNodeInfoInner::setRect(const SwRect & rRect)
maRect = rRect;
}
-sal_uInt32 WW8TableNodeInfoInner::getDepth() const
-{
- return mnDepth;
-}
-sal_uInt32 WW8TableNodeInfoInner::getCell() const
-{
- return mnCell;
-}
-sal_uInt32 WW8TableNodeInfoInner::getRow() const
-{
- return mnRow;
-}
-sal_uInt32 WW8TableNodeInfoInner::getShadowsBefore() const
-{
- return mnShadowsBefore;
-}
-sal_uInt32 WW8TableNodeInfoInner::getShadowsAfter() const
-{
- return mnShadowsAfter;
-}
-bool WW8TableNodeInfoInner::isEndOfCell() const
-{
- return mbEndOfCell;
-}
-bool WW8TableNodeInfoInner::isEndOfLine() const
-{
- return mbEndOfLine;
-}
-bool WW8TableNodeInfoInner::isFirstInTable() const
-{
- return mbFirstInTable;
-}
const SwNode * WW8TableNodeInfoInner::getNode() const
{
@@ -376,15 +344,7 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow()
return pResult;
}
-const SwTableBox * WW8TableNodeInfoInner::getTableBox() const
-{
- return mpTableBox;
-}
-const SwTable * WW8TableNodeInfoInner::getTable() const
-{
- return mpTable;
-}
const SwRect & WW8TableNodeInfoInner::getRect() const
{
@@ -559,10 +519,6 @@ void WW8TableNodeInfo::setShadowsAfter(sal_uInt32 nShadowsAfter)
getInnerForDepth(mnDepth)->setShadowsAfter(nShadowsAfter);
}
-WW8TableInfo * WW8TableNodeInfo::getParent() const
-{
- return mpParent;
-}
sal_uInt32 WW8TableNodeInfo::getDepth() const
{
@@ -572,25 +528,13 @@ sal_uInt32 WW8TableNodeInfo::getDepth() const
return mnDepth;
}
-const SwNode * WW8TableNodeInfo::getNode() const
-{
- return mpNode;
-}
const SwTableBox * WW8TableNodeInfo::getTableBox() const
{
return getInnerForDepth(mnDepth)->getTableBox();
}
-WW8TableNodeInfo * WW8TableNodeInfo::getNext() const
-{
- return mpNext;
-}
-const SwNode * WW8TableNodeInfo::getNextNode() const
-{
- return mpNextNode;
-}
sal_uInt32 WW8TableNodeInfo::getCell() const
{
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index 83c463550507..4c2188a84d8a 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -85,17 +85,17 @@ public:
void setTable(const SwTable * pTable);
void setRect(const SwRect & rRect);
- sal_uInt32 getDepth() const;
- sal_uInt32 getCell() const;
- sal_uInt32 getRow() const;
- sal_uInt32 getShadowsBefore() const;
- sal_uInt32 getShadowsAfter() const;
- bool isEndOfCell() const;
- bool isEndOfLine() const;
- bool isFirstInTable() const;
+ sal_uInt32 getDepth() const { return mnDepth;}
+ sal_uInt32 getCell() const { return mnCell;}
+ sal_uInt32 getRow() const { return mnRow;}
+ sal_uInt32 getShadowsBefore() const { return mnShadowsBefore;}
+ sal_uInt32 getShadowsAfter() const { return mnShadowsAfter;}
+ bool isEndOfCell() const { return mbEndOfCell;}
+ bool isEndOfLine() const { return mbEndOfLine;}
+ bool isFirstInTable() const { return mbFirstInTable;}
bool isVertMerge() const;
- const SwTableBox * getTableBox() const;
- const SwTable * getTable() const;
+ const SwTableBox * getTableBox() const { return mpTableBox;}
+ const SwTable * getTable() const { return mpTable;}
const SwRect & getRect() const;
const SwNode * getNode() const;
@@ -194,15 +194,15 @@ public:
void setNextNode(const SwNode * pNode);
void setRect(const SwRect & rRect);
- WW8TableInfo * getParent() const;
+ WW8TableInfo * getParent() const { return mpParent;}
sal_uInt32 getDepth() const;
bool isEndOfLine() const;
bool isEndOfCell() const;
bool isFirstInTable() const;
- const SwNode * getNode() const;
+ const SwNode * getNode() const { return mpNode;}
const SwTableBox * getTableBox() const;
- WW8TableNodeInfo * getNext() const;
- const SwNode * getNextNode() const;
+ WW8TableNodeInfo * getNext() const { return mpNext;}
+ const SwNode * getNextNode() const { return mpNextNode;}
const SwRect & getRect() const;
const Inners_t & getInners() const;
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 0935461eb2e1..b21da7c4f246 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -258,10 +258,6 @@ namespace sw
}
}
- bool Frame::IsInline() const
- {
- return mbIsInline;
- }
void Frame::ForceTreatAsInline()
{
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 00b63bd80ab2..72d5794dcd18 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -147,7 +147,7 @@ namespace sw
@return
whether this is inline or not
*/
- bool IsInline() const;
+ bool IsInline() const { return mbIsInline; }
/** Even if the frame isn't an inline frame, force it to behave as one
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 1247392035ae..c2d7ff4b3d5d 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -5581,10 +5581,6 @@ WW8Fib::WW8Fib(sal_uInt8 nVer, bool bDot)
nNumDecimalSep = aLocaleWrapper.getNumDecimalSep()[0];
}
-sal_Unicode WW8Fib::getNumDecimalSep() const
-{
- return nNumDecimalSep;
-}
bool WW8Fib::WriteHeader(SvStream& rStrm)
{
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 1daae04b7f04..b3ca7ca29c69 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1436,7 +1436,7 @@ public:
static rtl_TextEncoding GetFIBCharset(sal_uInt16 chs);
ww::WordVersion GetFIBVersion() const;
WW8_CP GetBaseCp(ManTypes nType) const;
- sal_Unicode getNumDecimalSep() const;
+ sal_Unicode getNumDecimalSep() const { return nNumDecimalSep;}
};
class WW8Style
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index b50ddff3a507..ffb210b63492 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -429,10 +429,6 @@ bool TBDelta::ControlDropsToolBar()
return !( CiTBDE & 0x8000 );
}
-sal_Int32 TBDelta::TBCStreamOffset()
-{
- return fc;
-}
sal_Int16 TBDelta::CustomizationIndex()
{
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index 4695f083d6cf..0fe3e530b1f2 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -93,7 +93,7 @@ public:
bool ControlIsInserted();
bool ControlIsChanged();
bool ControlDropsToolBar();
- sal_Int32 TBCStreamOffset();
+ sal_Int32 TBCStreamOffset() { return fc;}
sal_Int16 CustomizationIndex();
};