summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-06-12 14:06:28 +0200
committerNoel Grandin <noel@peralex.com>2014-06-17 10:55:17 +0200
commit3e82897353e576dc6e3fbf55371fda5a0c3415df (patch)
tree71c2f03128885000efae1852dccb504f8355c79e /sw/inc
parentec95abf2d8afeec38c9225ea49caa0e08d82b504 (diff)
improve the inlinesimplememberfunctions clang plugin
Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/ToxWhitespaceStripper.hxx2
-rw-r--r--sw/inc/anchoreddrawobject.hxx2
-rw-r--r--sw/inc/anchoredobject.hxx10
-rw-r--r--sw/inc/dcontact.hxx4
-rw-r--r--sw/inc/doc.hxx2
-rw-r--r--sw/inc/docufld.hxx8
-rw-r--r--sw/inc/flddropdown.hxx8
-rw-r--r--sw/inc/ndarr.hxx2
-rw-r--r--sw/inc/ndgrf.hxx2
-rw-r--r--sw/inc/printdata.hxx2
10 files changed, 21 insertions, 21 deletions
diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx
index 4e1061986166..bc8e8699c032 100644
--- a/sw/inc/ToxWhitespaceStripper.hxx
+++ b/sw/inc/ToxWhitespaceStripper.hxx
@@ -39,7 +39,7 @@ public:
GetPositionInStrippedString(sal_Int32 pos) const;
OUString
- GetStrippedString() const;
+ GetStrippedString() const { return mStripped;}
private:
OUString mStripped;
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 28da2cabb061..425952bd824b 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -141,7 +141,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
// accessors to the object area and its position
virtual const SwRect GetObjRect() const SAL_OVERRIDE;
// Return value can be NULL.
- const Rectangle* GetLastObjRect() const;
+ const Rectangle* GetLastObjRect() const { return mpLastObjRect;}
void SetLastObjRect( const Rectangle& _rNewObjRect );
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index fcc5c1b0868e..14750c879437 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -214,11 +214,11 @@ class SW_DLLPUBLIC SwAnchoredObject
// accessors to member <mpDrawObj>
void SetDrawObj( SdrObject& _rDrawObj );
- const SdrObject* GetDrawObj() const;
+ const SdrObject* GetDrawObj() const { return mpDrawObj;}
SdrObject* DrawObj() { return mpDrawObj;}
// accessors to member <mpAnchorFrm>
- const SwFrm* GetAnchorFrm() const;
+ const SwFrm* GetAnchorFrm() const { return mpAnchorFrm;}
SwFrm* AnchorFrm() { return mpAnchorFrm;}
void ChgAnchorFrm( SwFrm* _pNewAnchorFrm );
/** determine anchor frame containing the anchor position
@@ -233,7 +233,7 @@ class SW_DLLPUBLIC SwAnchoredObject
SwFrm* GetAnchorFrmContainingAnchPos();
SwPageFrm* GetPageFrm() { return mpPageFrm;}
- const SwPageFrm* GetPageFrm() const;
+ const SwPageFrm* GetPageFrm() const { return mpPageFrm;}
void SetPageFrm( SwPageFrm* _pNewPageFrm );
/** method to determine the page frame, on which the 'anchor' of
@@ -291,7 +291,7 @@ class SW_DLLPUBLIC SwAnchoredObject
void CheckCharRectAndTopOfLine( const bool _bCheckForParaPorInf = true );
// accessors to member <maLastCharRect>
- const SwRect& GetLastCharRect() const;
+ const SwRect& GetLastCharRect() const { return maLastCharRect;}
SwTwips GetRelCharX( const SwFrm* pFrm ) const;
SwTwips GetRelCharY( const SwFrm* pFrm ) const;
void AddLastCharY( long nDiff );
@@ -353,7 +353,7 @@ class SW_DLLPUBLIC SwAnchoredObject
// accessors to the current relative position (relative to anchor
// position of anchor frame)
- const Point GetCurrRelPos() const;
+ const Point GetCurrRelPos() const { return maRelPos;}
void SetCurrRelPos( Point _aRelPos );
// accessors to the format
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 578615599cdf..63c92528b476 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -260,8 +260,8 @@ class SwDrawVirtObj : public SdrVirtObj
SwDrawVirtObj& operator= (const SwDrawVirtObj& rObj);
/// connection to writer layout
- const SwAnchoredObject* GetAnchoredObj() const;
- SwAnchoredObject* AnchoredObj();
+ const SwAnchoredObject* GetAnchoredObj() const { return &maAnchoredDrawObj;}
+ SwAnchoredObject* AnchoredObj() { return &maAnchoredDrawObj;}
const SwFrm* GetAnchorFrm() const;
SwFrm* AnchorFrm();
void RemoveFromWriterLayout();
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 7554ebf70277..217eddcceccc 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1862,7 +1862,7 @@ public:
// access container for XForms model; will be NULL if !isXForms()
com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>
- getXForms() const;
+ getXForms() const { return mxXForms;}
com::sun::star::uno::Reference< com::sun::star::linguistic2::XProofreadingIterator > GetGCIterator() const;
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 246971fc22fc..250be7f7fe46 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -474,12 +474,12 @@ public:
/// Text
virtual OUString GetPar2() const SAL_OVERRIDE;
virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
- OUString GetTxt() const { return sTxt; }
- OUString GetInitials() const;
+ const OUString& GetTxt() const { return sTxt; }
+ const OUString& GetInitials() const { return sInitials;}
void SetName(const OUString& rStr);
- OUString GetName() const;
+ const OUString& GetName() const { return sName;}
- const OutlinerParaObject* GetTextObject() const;
+ const OutlinerParaObject* GetTextObject() const { return mpText;}
void SetTextObject( OutlinerParaObject* pText );
sal_Int32 GetNumberOfParagraphs() const;
diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx
index f44c03af08a5..129fac481920 100644
--- a/sw/inc/flddropdown.hxx
+++ b/sw/inc/flddropdown.hxx
@@ -181,28 +181,28 @@ public:
@return the selected item
*/
- OUString GetSelectedItem() const;
+ const OUString& GetSelectedItem() const { return aSelectedItem;}
/**
Returns the name of the field.
@return the name of the field
*/
- OUString GetName() const;
+ const OUString& GetName() const { return aName;}
/**
Returns the help text of the field.
@return the help text of the field
*/
- OUString GetHelp() const;
+ const OUString& GetHelp() const { return aHelp;}
/**
Returns the tool tip of the field.
@return the tool tip of the field
*/
- OUString GetToolTip() const;
+ const OUString& GetToolTip() const { return aToolTip;}
/**
Sets the selected item.
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index b8e72f283042..d8c71d6c4479 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -243,7 +243,7 @@ public:
SwAttrSet* pAutoAttr ); ///< in ndole.cxx
/// Array of all OutlineNodes.
- const SwOutlineNodes& GetOutLineNds() const;
+ const SwOutlineNodes& GetOutLineNds() const { return *pOutlineNds;}
/// Update all Nodes - Rule/Format-Change.
void UpdateOutlineNode(SwNode & rNd);
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 100c176ef588..212a612b9bdc 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -201,7 +201,7 @@ public:
/// Returns the with our graphic attributes filled Graphic-Attr-Structure.
GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrm* pFrm ) const;
- boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer();
+ boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;}
bool IsLinkedInputStreamReady() const { return mbLinkedInputStreamReady;}
void TriggerAsyncRetrieveInputStream();
void ApplyInputStream(
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 3142000f35b2..95a5c2a63190 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -248,7 +248,7 @@ public:
void CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, OutputDevice *pOutDev );
void DeletePostItData();
- SfxObjectShellLock const& GetTempDocShell() const;
+ SfxObjectShellLock const& GetTempDocShell() const { return m_xTempDocShell;}
void SetTempDocShell(SfxObjectShellLock const&);
bool IsViewOptionAdjust() const { return m_pViewOptionAdjust != 0; }