diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-09 10:09:42 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-06-09 10:10:13 +0200 |
commit | 184a00b96235f6432294ded63ce4a4a318effdb5 (patch) | |
tree | e4ae0e00cb168fa43d280cfb51a50515258b5320 /sw/source | |
parent | 534015ad4fd08823b4393dab1ad5d42dedd7bf62 (diff) |
loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
Diffstat (limited to 'sw/source')
36 files changed, 31 insertions, 237 deletions
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx index 61c6410024c5..51af85f85a21 100644 --- a/sw/source/core/SwNumberTree/SwNodeNum.cxx +++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx @@ -44,15 +44,7 @@ SwNodeNum::~SwNodeNum() { } -SwTxtNode * SwNodeNum::GetTxtNode() const -{ - return mpTxtNode; -} -SwNumRule * SwNodeNum::GetNumRule() const -{ - return mpNumRule; -} void SwNodeNum::ChangeNumRule( SwNumRule& rNumRule ) { diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx index b35a53d8eb90..9b3716b8dd53 100644 --- a/sw/source/core/SwNumberTree/SwNumberTree.cxx +++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx @@ -702,10 +702,6 @@ SwNumberTree::tSwNumTreeNumber SwNumberTreeNode::GetNumber(bool bValidate) return mnNumber; } -bool SwNumberTreeNode::IsContinueingPreviousSubTree() const -{ - return mbContinueingPreviousSubTree; -} vector<SwNumberTree::tSwNumTreeNumber> SwNumberTreeNode::GetNumberVector() const { @@ -731,10 +727,6 @@ bool SwNumberTreeNode::IsValid(const SwNumberTreeNode * pChild) const return bResult; } -bool SwNumberTreeNode::IsPhantom() const -{ - return mbPhantom; -} void SwNumberTreeNode::SetPhantom(bool _bPhantom) { diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx index a247357a6c34..868a7bec26c8 100644 --- a/sw/source/core/access/accfrmobj.cxx +++ b/sw/source/core/access/accfrmobj.cxx @@ -216,21 +216,6 @@ bool SwAccessibleChild::IsValid() const mpWindow != 0; } -const SdrObject* SwAccessibleChild::GetDrawObject() const -{ - return mpDrawObj; -} - -const SwFrm *SwAccessibleChild::GetSwFrm() const -{ - return mpFrm; -} - -Window* SwAccessibleChild::GetWindow() const -{ - return mpWindow; -} - bool SwAccessibleChild::IsVisibleChildrenOnly() const { bool bRet( false ); diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx index 445b8eeb26c8..ba7f983b1007 100644 --- a/sw/source/core/access/accfrmobj.hxx +++ b/sw/source/core/access/accfrmobj.hxx @@ -52,9 +52,9 @@ class SwAccessibleChild bool IsValid() const; - const SwFrm* GetSwFrm() const; - const SdrObject* GetDrawObject() const; - Window* GetWindow() const; + const SwFrm* GetSwFrm() const { return mpFrm; } + const SdrObject* GetDrawObject() const { return mpDrawObj; } + Window* GetWindow() const { return mpWindow; } const SwFrm* GetParent( const bool bInPagePreview ) const; diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 8699fca3f14b..5266765138f0 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -826,11 +826,6 @@ void SwDoc::SetPreviewPrtData( const SwPagePreviewPrtData* pNew ) SetModified(); } -SwModify* SwDoc::GetUnoCallBack() const -{ - return mpUnoCallBack; -} - /** SwDoc: Reading and writing of the layout cache. */ void SwDoc::ReadLayoutCache( SvStream& rStream ) { diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index cb1520a7af71..ab47e58d0965 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -3249,11 +3249,6 @@ bool SwRedlineExtraData_FormattingChanges::operator == ( const SwRedlineExtraDat return false; } -SfxItemSet* SwRedlineExtraData_FormattingChanges::GetItemSet( ) const -{ - return pSet; -} - SwRedlineData::SwRedlineData( RedlineType_t eT, sal_uInt16 nAut ) : pNext( 0 ), pExtraData( 0 ), aStamp( DateTime::SYSTEM ), diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index f7e773c9110a..66c156f8fad7 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -1003,11 +1003,6 @@ void SwNumRule::Validate() SetInvalidRule(false); } -bool SwNumRule::IsCountPhantoms() const -{ - return mbCountPhantoms; -} - void SwNumRule::SetCountPhantoms(bool bCountPhantoms) { mbCountPhantoms = bCountPhantoms; diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index 7eeb80aaadcb..adc9a1b8d19e 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -59,7 +59,7 @@ class WriterHelper public: WriterHelper( xmlTextWriterPtr ); ~WriterHelper(); - operator xmlTextWriterPtr(); + operator xmlTextWriterPtr() { return writer;} void startElement( const char* element ); void endElement(); void writeFormatAttribute( const char* attribute, const char* format, ... ) @@ -93,10 +93,6 @@ WriterHelper::~WriterHelper() } } -WriterHelper::operator xmlTextWriterPtr() -{ - return writer; -} void WriterHelper::startElement( const char* element ) { diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 16b5e87382e0..c9caf9d91db5 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -174,10 +174,6 @@ SwContact::~SwContact() SetInDTOR(); } -bool SwContact::IsInDTOR() const -{ - return mbInDTOR; -} void SwContact::SetInDTOR() { diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 9667bfff21f8..dec2dc70402b 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -1136,15 +1136,7 @@ void SwInputField::SetFmtFld( SwFmtFld& rFmtFld ) mpFmtFld = &rFmtFld; } -SwFmtFld* SwInputField::GetFmtFld() -{ - return mpFmtFld; -} -const OUString& SwInputField::getContent() const -{ - return aContent; -} void SwInputField::LockNotifyContentChange() { diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 329df90a4181..9452ad971d19 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -1232,10 +1232,6 @@ void SwGrfNode::TriggerAsyncRetrieveInputStream() } } -bool SwGrfNode::IsLinkedInputStreamReady() const -{ - return mbLinkedInputStreamReady; -} void SwGrfNode::ApplyInputStream( com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream, diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx index 882a0283c6ad..be6a4f84a11c 100644 --- a/sw/source/core/inc/ascharanchoredobjectposition.hxx +++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx @@ -131,13 +131,13 @@ namespace objectpositioning Point GetAnchorPos() const; // calculated relative position to base line for object position type AS_CHAR - SwTwips GetRelPosY() const; + SwTwips GetRelPosY() const { return mnRelPos;} // determined object rectangle including spacing for object position type AS_CHAR SwRect GetObjBoundRectInclSpacing() const; // determined line alignment relative to line height - sal_uInt8 GetLineAlignment() const; + sal_uInt8 GetLineAlignment() const { return mnLineAlignment;} }; } diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 64bfe0b01cff..136244213d9c 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -549,14 +549,14 @@ public: inline bool IsVertical() const; inline bool IsVertLR() const; - inline bool GetVerticalFlag() const; + inline bool GetVerticalFlag() const { return mbVertical; } inline void SetVertical( bool bNew ){ mbVertical = bNew ? 1 : 0; } inline void SetbVertLR( bool bNew ) { mbVertLR = bNew ? 1 : 0; } inline void SetDerivedVert( bool bNew ){ mbDerivedVert = bNew ? 1 : 0; } inline void SetInvalidVert( bool bNew) { mbInvalidVert = bNew ? 1 : 0; } inline bool IsRightToLeft() const; - inline bool GetRightToLeftFlag() const; + inline bool GetRightToLeftFlag() const { return mbRightToLeft; } inline void SetRightToLeft( bool bNew ){ mbRightToLeft = bNew ? 1 : 0; } inline void SetDerivedR2L( bool bNew ) { mbDerivedR2L = bNew ? 1 : 0; } inline void SetInvalidR2L( bool bNew ) { mbInvalidR2L = bNew ? 1 : 0; } @@ -935,20 +935,12 @@ inline bool SwFrm::IsVertLR() const { return mbVertLR; } -bool SwFrm::GetVerticalFlag() const -{ - return mbVertical; -} inline bool SwFrm::IsRightToLeft() const { if( mbInvalidR2L ) ((SwFrm*)this)->SetDirFlags( false ); return mbRightToLeft; } -bool SwFrm::GetRightToLeftFlag() const -{ - return mbRightToLeft; -} inline void SwFrm::SetCompletePaint() const { diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index a97fa82b86ee..b6cf395e9a65 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -117,20 +117,12 @@ const SdrObject* SwAnchoredObject::GetDrawObj() const return mpDrawObj; } -SdrObject* SwAnchoredObject::DrawObj() -{ - return mpDrawObj; -} const SwFrm* SwAnchoredObject::GetAnchorFrm() const { return mpAnchorFrm; } -SwFrm* SwAnchoredObject::AnchorFrm() -{ - return mpAnchorFrm; -} void SwAnchoredObject::ChgAnchorFrm( SwFrm* _pNewAnchorFrm ) { @@ -161,10 +153,6 @@ SwFrm* SwAnchoredObject::GetAnchorFrmContainingAnchPos() return pAnchorFrmContainingAnchPos; } -SwPageFrm* SwAnchoredObject::GetPageFrm() -{ - return mpPageFrm; -} const SwPageFrm* SwAnchoredObject::GetPageFrm() const { @@ -227,10 +215,6 @@ void SwAnchoredObject::SetVertPosOrientFrm( const SwLayoutFrm& _rVertPosOrientFr RegisterAtCorrectPage(); } -SwTwips SwAnchoredObject::GetLastTopOfLine() const -{ - return mnLastTopOfLine; -} // #i28701# - follow-up of #i22341# void SwAnchoredObject::AddLastTopOfLineY( SwTwips _nDiff ) @@ -799,10 +783,6 @@ void SwAnchoredObject::SetTmpConsiderWrapInfluence( const bool _bTmpConsiderWrap } } -bool SwAnchoredObject::IsTmpConsiderWrapInfluence() const -{ - return mbTmpConsiderWrapInfluence; -} void SwAnchoredObject::SetTmpConsiderWrapInfluenceOfOtherObjs( const bool bTmpConsiderWrapInfluence ) { diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index fa5a4d07ca4a..24ac07e45ed9 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -1480,10 +1480,6 @@ SfxPoolItem* SwFmtAnchor::Clone( SfxItemPool* ) const sal_uInt32 SwFmtAnchor::mnOrderCounter = 0; // OD 2004-05-05 #i28701# -sal_uInt32 SwFmtAnchor::GetOrder() const -{ - return mnOrder; -} bool SwFmtAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx index b6a3d06f8e6f..10919aedb8bb 100644 --- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx @@ -400,10 +400,6 @@ Point SwAsCharAnchoredObjectPosition::GetAnchorPos() const } /** calculated relative position to base line for object position */ -SwTwips SwAsCharAnchoredObjectPosition::GetRelPosY() const -{ - return mnRelPos; -} /** determined object rectangle including spacing for object */ SwRect SwAsCharAnchoredObjectPosition::GetObjBoundRectInclSpacing() const @@ -412,9 +408,5 @@ SwRect SwAsCharAnchoredObjectPosition::GetObjBoundRectInclSpacing() const } /** determined line alignment */ -sal_uInt8 SwAsCharAnchoredObjectPosition::GetLineAlignment() const -{ - return mnLineAlignment; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 446e104488ca..2119610ce978 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -638,10 +638,6 @@ SwTxtMeta * Meta::GetTxtAttr() const return (m_pFmt) ? m_pFmt->GetTxtAttr() : 0; } -SwTxtNode * Meta::GetTxtNode() const -{ - return m_pTxtNode; -} void Meta::NotifyChangeTxtNodeImpl() { diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 04099d94ac1d..235e5161485f 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -3752,10 +3752,6 @@ void SwTxtNode::SetAttrOutlineLevel(int nLevel) } // #i70748# -bool SwTxtNode::IsEmptyListStyleDueToSetOutlineLevelAttr() -{ - return mbEmptyListStyleSetDueToSetOutlineLevelAttr; -} void SwTxtNode::SetEmptyListStyleDueToSetOutlineLevelAttr() { diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index 71cc1db2a1d3..fc19e785b817 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -215,7 +215,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; void SetFrmFmt(SwFrmFmt * _pFrmFmt); const SwFrmFmt* GetFrmFmt() const; - SwFrmFmt* GetFrmFmt(); + SwFrmFmt* GetFrmFmt() { return pFrmFmt;} }; class SwFltAnchorClient : public SwClient diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index eaebcae87a22..454cad669d73 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -873,10 +873,6 @@ const SwFrmFmt * SwFltAnchor::GetFrmFmt() const return pFrmFmt; } -SwFrmFmt * SwFltAnchor::GetFrmFmt() -{ - return pFrmFmt; -} bool SwFltAnchor::operator==(const SfxPoolItem& rItem) const { 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(); }; diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index aa6e06710961..7d3c7af83f3b 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -171,10 +171,6 @@ void SwCustomizeAddressListDialog::UpdateButtons() m_pRenamePB->Enable(nEntries > 0); } -SwCSVData* SwCustomizeAddressListDialog::GetNewData() -{ - return m_pNewData; -} SwAddRenameEntryDialog::SwAddRenameEntryDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index b92f1e9cbc01..b11931d153a3 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -50,7 +50,7 @@ public: SwCustomizeAddressListDialog(Window* pParent, const SwCSVData& rOldData); virtual ~SwCustomizeAddressListDialog(); - SwCSVData* GetNewData(); + SwCSVData* GetNewData() { return m_pNewData;} }; class SwAddRenameEntryDialog : public SfxModalDialog diff --git a/sw/source/uibase/dbui/maildispatcher.cxx b/sw/source/uibase/dbui/maildispatcher.cxx index a384fe855fa0..8b1a8771b3c0 100644 --- a/sw/source/uibase/dbui/maildispatcher.cxx +++ b/sw/source/uibase/dbui/maildispatcher.cxx @@ -184,10 +184,6 @@ void MailDispatcher::shutdown() wakening_call_.set(); } -bool MailDispatcher::isStarted() const -{ - return run_; -} void MailDispatcher::addListener(::rtl::Reference<IMailDispatcherListener> listener) { diff --git a/sw/source/uibase/inc/maildispatcher.hxx b/sw/source/uibase/inc/maildispatcher.hxx index 4cbe6cd9f3cd..8dc22fc3b978 100644 --- a/sw/source/uibase/inc/maildispatcher.hxx +++ b/sw/source/uibase/inc/maildispatcher.hxx @@ -116,7 +116,7 @@ public: @return <TRUE/> if the sending thread is running. */ - bool isStarted() const; + bool isStarted() const { return run_;} /** returns if the thread is still running */ diff --git a/sw/source/uibase/inc/swcont.hxx b/sw/source/uibase/inc/swcont.hxx index 463215eb2fa4..ef9b6871a3ff 100644 --- a/sw/source/uibase/inc/swcont.hxx +++ b/sw/source/uibase/inc/swcont.hxx @@ -60,7 +60,7 @@ class SwTypeNumber SwTypeNumber(sal_uInt8 nId) :nTypeId(nId){} virtual ~SwTypeNumber(); - sal_uInt8 GetTypeId() const; + sal_uInt8 GetTypeId() const { return nTypeId;} }; class SwContent : public SwTypeNumber diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 5791659c4a34..d55b4980a2be 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -154,10 +154,6 @@ SwContent::SwContent(const SwContentType* pCnt, const OUString& rName, long nYPo { } -sal_uInt8 SwTypeNumber::GetTypeId() const -{ - return nTypeId; -} SwTypeNumber::~SwTypeNumber() { |