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 /include/svx | |
parent | 534015ad4fd08823b4393dab1ad5d42dedd7bf62 (diff) |
loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
Diffstat (limited to 'include/svx')
-rw-r--r-- | include/svx/AccessibleShapeTreeInfo.hxx | 6 | ||||
-rw-r--r-- | include/svx/ctredlin.hxx | 8 | ||||
-rw-r--r-- | include/svx/fmgridcl.hxx | 2 | ||||
-rw-r--r-- | include/svx/framelink.hxx | 2 | ||||
-rw-r--r-- | include/svx/langbox.hxx | 2 | ||||
-rw-r--r-- | include/svx/nbdtmg.hxx | 2 | ||||
-rw-r--r-- | include/svx/numfmtsh.hxx | 2 | ||||
-rw-r--r-- | include/svx/rulritem.hxx | 26 | ||||
-rw-r--r-- | include/svx/sdr/animation/scheduler.hxx | 8 | ||||
-rw-r--r-- | include/svx/sdr/contact/objectcontact.hxx | 2 | ||||
-rw-r--r-- | include/svx/srchdlg.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdhdl.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdmark.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdmodel.hxx | 8 | ||||
-rw-r--r-- | include/svx/svdoashp.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdobj.hxx | 44 | ||||
-rw-r--r-- | include/svx/svdograf.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdopage.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdpage.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdpntv.hxx | 4 | ||||
-rw-r--r-- | include/svx/svdundo.hxx | 2 | ||||
-rw-r--r-- | include/svx/unoshape.hxx | 4 |
22 files changed, 68 insertions, 68 deletions
diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx index a6178f72cbfd..0527caf7022d 100644 --- a/include/svx/AccessibleShapeTreeInfo.hxx +++ b/include/svx/AccessibleShapeTreeInfo.hxx @@ -118,7 +118,7 @@ public: @return The returned value may be NULL. */ - SdrView* GetSdrView (void) const; + SdrView* GetSdrView (void) const { return mpView;} /** Set a new controller. This will usually but not necessarily correspond to the SdrView. @@ -146,7 +146,7 @@ public: @return The returned value may be NULL. */ - Window* GetWindow (void) const; + Window* GetWindow (void) const { return mpWindow;} /** The view forwarder allows the transformation between internal and pixel coordinates and can be asked for the visible area. @@ -159,7 +159,7 @@ public: @return The returned pointer may be NULL. */ - const IAccessibleViewForwarder* GetViewForwarder (void) const; + const IAccessibleViewForwarder* GetViewForwarder (void) const { return mpViewForwarder;} private: /** Deprecated. diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 9d97b3e7cb71..f2f7dbf38ed6 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -252,7 +252,7 @@ public: void CheckAction(bool bFlag=true); void CheckComment(bool bFlag=true); - ListBox* GetLbAction(); + ListBox* GetLbAction() { return m_pLbAction;} void SetReadyHdl( const Link& rLink ) { aReadyLink= rLink; } const Link& GetReadyHdl() const { return aReadyLink; } @@ -319,7 +319,7 @@ public: void InsertWriterHeader(); void InsertCalcHeader(); - SvxRedlinTable* GetTableControl(); + SvxRedlinTable* GetTableControl() { return m_pViewData;} void EnableAccept(bool nFlag=true); void EnableAcceptAll(bool nFlag=true); @@ -380,8 +380,8 @@ public: void ShowFilterPage(); void ShowViewPage(); - SvxTPFilter* GetFilterPage(); - SvxTPView* GetViewPage(); + SvxTPFilter* GetFilterPage() { return pTPFilter;} + SvxTPView* GetViewPage() { return pTPView;} SvxRedlinTable* GetViewTable(); }; diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index 8af1bd4e475a..914758f31475 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -128,7 +128,7 @@ public: void markColumn(sal_uInt16 nId); bool isColumnMarked(sal_uInt16 nId) const; - sal_Int32 GetSelectedColumn() const; + sal_Int32 GetSelectedColumn() const { return m_nCurrentSelectedColumn;} /** return the name of the specified object. @param eObjType diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index cdc221d1d4e1..652a2edb9e12 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -125,7 +125,7 @@ public: inline double Prim() const { return mfPrim; } inline double Dist() const { return mfDist; } inline double Secn() const { return mfSecn; } - double PatternScale() const; + double PatternScale() const { return mfPatternScale;} void SetPatternScale( double fScale ); inline editeng::SvxBorderStyle Type() const { return mnType; } diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 91b788cdf0c2..909c1c8d9984 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -151,7 +151,7 @@ public: EDITED_INVALID }; - EditedAndValid GetEditedAndValid() const; + EditedAndValid GetEditedAndValid() const { return meEditedAndValid;} sal_Int32 SaveEditedAsEntry(); diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index f9e9ae6bf9ea..d32b8efd47cf 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -231,7 +231,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase void SetItems(const SfxItemSet* pArg) { pSet = pArg;StoreBulCharFmtName_impl();StoreMapUnit_impl();} protected: OUString GetBulCharFmtName(); - SfxMapUnit GetMapUnit(); + SfxMapUnit GetMapUnit() { return eCoreUnit;} protected: bool bIsLoading; void ImplLoad(const OUString& filename); diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx index 4610d3039882..d7282d1abe19 100644 --- a/include/svx/numfmtsh.hxx +++ b/include/svx/numfmtsh.hxx @@ -161,7 +161,7 @@ public: void SetComment4Entry(short nEntry, const OUString& aCommentString); void SetCurrencySymbol(sal_uInt32 nPos); - sal_uInt32 GetCurrencySymbol(); + sal_uInt32 GetCurrencySymbol() { return nCurCurrencyEntryPos;} sal_uInt16 FindCurrencyFormat( const OUString& rFmtString ); sal_uInt16 FindCurrencyFormat(const NfCurrencyEntry* pTmpCurrencyEntry,bool bTmpBanking); void SetCurCurrencyEntry(NfCurrencyEntry*); diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 56074eee1e13..e856cf030d20 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -52,8 +52,8 @@ public: SvxLongLRSpaceItem(const SvxLongLRSpaceItem &); SvxLongLRSpaceItem(); - long GetLeft() const; - long GetRight() const; + long GetLeft() const { return mlLeft;} + long GetRight() const { return mlRight;} void SetLeft(long lArgLeft); void SetRight(long lArgRight); }; @@ -86,8 +86,8 @@ public: SvxLongULSpaceItem(const SvxLongULSpaceItem &); SvxLongULSpaceItem(); - long GetUpper() const; - long GetLower() const; + long GetUpper() const { return mlLeft;} + long GetLower() const { return mlRight;} void SetUpper(long lArgLeft); void SetLower(long lArgRight); }; @@ -194,12 +194,12 @@ public: void Append(const SvxColumnDescription& rDesc); void SetLeft(long aLeft); void SetRight(long aRight); - sal_uInt16 GetActColumn() const; + sal_uInt16 GetActColumn() const { return nActColumn;} bool IsFirstAct() const; bool IsLastAct() const; - long GetLeft(); - long GetRight(); - bool IsTable() const; + long GetLeft() { return nLeft;} + long GetRight() { return nRight;} + bool IsTable() const { return bTable;} bool CalcOrtho() const; void SetOrtho(bool bVal); bool IsConsistent() const; @@ -239,12 +239,12 @@ public: bool bLimits = false); SvxObjectItem(const SvxObjectItem& rCopy); - bool HasLimits() const; + bool HasLimits() const { return bLimits;} - long GetStartX() const; - long GetEndX() const; - long GetStartY() const; - long GetEndY() const; + long GetStartX() const { return nStartX;} + long GetEndX() const { return nEndX;} + long GetStartY() const { return nStartY;} + long GetEndY() const { return nEndY;} void SetStartX(long lValue); void SetEndX(long lValue); diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index 4a7b177e1cd0..9e3a33dd2dcb 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -45,11 +45,11 @@ namespace sdr SVX_DLLPUBLIC virtual ~Event(); // access to mpNext - Event* GetNext() const; + Event* GetNext() const { return mpNext; } void SetNext(Event* pNew); // get/set time - sal_uInt32 GetTime() const; + sal_uInt32 GetTime() const { return mnTime; } void SVX_DLLPUBLIC SetTime(sal_uInt32 nNew); // execute event @@ -83,7 +83,7 @@ namespace sdr void Clear(); // get first - Event* GetFirst(); + Event* GetFirst() { return mpHead; } }; } // end of namespace animation } // end of namespace sdr @@ -119,7 +119,7 @@ namespace sdr SVX_DLLPUBLIC virtual void Timeout() SAL_OVERRIDE; // get time - sal_uInt32 GetTime(); + sal_uInt32 GetTime() { return mnTime; } // #i38135# void SetTime(sal_uInt32 nTime); diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx index fd48a475d32e..b94e5a97d3be 100644 --- a/include/svx/sdr/contact/objectcontact.hxx +++ b/include/svx/sdr/contact/objectcontact.hxx @@ -161,7 +161,7 @@ namespace sdr virtual bool IsAsynchronGraphicsLoadingAllowed() const; // access to ViewObjectContactRedirector - ViewObjectContactRedirector* GetViewObjectContactRedirector() const; + ViewObjectContactRedirector* GetViewObjectContactRedirector() const { return mpViewObjectContactRedirector; } void SetViewObjectContactRedirector(ViewObjectContactRedirector* pNew); // check if buffering of MasterPages is allowed. Default is sal_False. diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index da4ec001e9a3..6b28b5ad88bf 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -95,7 +95,7 @@ public: SfxBindings* pBindings, SfxChildWinInfo* pInfo ); virtual ~SvxSearchDialogWrapper (); - SvxSearchDialog *getDialog (); + SvxSearchDialog *getDialog () { return dialog;} static void SetSearchLabel(const SearchLabel& rSL); SFX_DECL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper); }; diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 53e91b95a99c..88a71e219cc8 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -468,7 +468,7 @@ public: void ResetFocusHdl(); // Access to View - SdrMarkView* GetView() const; + SdrMarkView* GetView() const { return pView;} // Sortierung: 1.Level Erst Refpunkt-Handles, dann normale Handles, dann Glue, dann User, dann Plushandles // 2.Level PageView (Pointer) diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index d57b1a09ecd8..97f5b8d4b08b 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -66,7 +66,7 @@ public: } void SetMarkedSdrObj(SdrObject* pNewObj); - SdrObject* GetMarkedSdrObj() const; + SdrObject* GetMarkedSdrObj() const { return mpSelectedSdrObject;} SdrPageView* GetPageView() const { diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index e982cb5e5460..ae322501912b 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -132,9 +132,9 @@ public: void SetObject(const SdrObject* pNewObj); void SetKind(SdrHintKind eNewKind); - const SdrPage* GetPage() const; - const SdrObject* GetObject() const; - SdrHintKind GetKind() const; + const SdrPage* GetPage() const { return mpPage;} + const SdrObject* GetObject() const { return mpObj;} + SdrHintKind GetKind() const { return meHint;} }; @@ -650,7 +650,7 @@ public: void MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSet, SdrModel* pNewModel ); - bool IsInDestruction() const; + bool IsInDestruction() const { return mbInDestruction;} static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId(); diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index c7be3585c679..1b7adf1cf489 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -147,7 +147,7 @@ public: void SetMirroredX( const bool bMirroredX ); void SetMirroredY( const bool bMirroredY ); - double GetObjectRotation() const; + double GetObjectRotation() const { return fObjectRotation;} double GetExtraTextRotation( const bool bPreRotation = false ) const; TYPEINFO_OVERRIDE(); diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index ccdf58abb683..5b57cf2f0b36 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -197,8 +197,8 @@ public: virtual ~SdrObjUserData(); virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; // #i71039# NULL -> 0 - sal_uInt32 GetInventor() const; - sal_uInt16 GetId() const; + sal_uInt32 GetInventor() const { return nInventor;} + sal_uInt16 GetId() const { return nIdentifier;} virtual bool HasMacro (const SdrObject* pObj) const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; @@ -460,13 +460,13 @@ public: virtual void SetBoundRectDirty(); virtual void SetObjList(SdrObjList* pNewObjList); - SdrObjList* GetObjList() const; + SdrObjList* GetObjList() const { return pObjList;} virtual void SetPage(SdrPage* pNewPage); - SdrPage* GetPage() const; + SdrPage* GetPage() const { return pPage;} virtual void SetModel(SdrModel* pNewModel); - SdrModel* GetModel() const; + SdrModel* GetModel() const { return pModel;} SdrItemPool* GetObjectItemPool() const; void AddListener(SfxListener& rListener); @@ -488,7 +488,7 @@ public: // UserCall interface void SetUserCall(SdrObjUserCall* pUser); - SdrObjUserCall* GetUserCall() const; + SdrObjUserCall* GetUserCall() const { return pUserCall;} void SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundRect) const; // Such a reference point is for instance: @@ -523,7 +523,7 @@ public: sal_uInt32 GetOrdNum() const; // Warning: this method should only be used if you really knows what you're doing - sal_uInt32 GetOrdNumDirect() const; + sal_uInt32 GetOrdNumDirect() const { return nOrdNum;} // setting the order number should only happen from the model or from the page void SetOrdNum(sal_uInt32 nNum); @@ -881,38 +881,38 @@ public: SdrObject* ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDash = false) const; // if true, reference onto an object - bool IsVirtualObj() const; + bool IsVirtualObj() const { return bVirtObj;} // is true, if object can probably be filled // is false, if object has probably line ends // is invalid, if this is a group object - bool IsClosedObj() const; + bool IsClosedObj() const { return bClosedObj;} - bool IsEdgeObj() const; - bool Is3DObj() const; - bool IsUnoObj() const; + bool IsEdgeObj() const { return bIsEdge;} + bool Is3DObj() const { return bIs3DObj;} + bool IsUnoObj() const { return bIsUnoObj;} void SetMarkProtect(bool bProt); - bool IsMarkProtect() const; + bool IsMarkProtect() const { return bMarkProt;} void SetInserted(bool bIns); - bool IsInserted() const; + bool IsInserted() const { return bInserted;} void SetMoveProtect(bool bProt); - bool IsMoveProtect() const; + bool IsMoveProtect() const { return bMovProt;} void SetResizeProtect(bool bProt); - bool IsResizeProtect() const; + bool IsResizeProtect() const { return bSizProt;} void SetPrintable(bool bPrn); bool IsPrintable() const; void SetVisible(bool bVisible); - bool IsVisible() const; + bool IsVisible() const { return mbVisible;} void SetEmptyPresObj(bool bEpt); - bool IsEmptyPresObj() const; + bool IsEmptyPresObj() const { return bEmptyPresObj;} void SetNotVisibleAsMaster(bool bFlg); - bool IsNotVisibleAsMaster() const; + bool IsNotVisibleAsMaster() const { return bNotVisibleAsMaster;} // #i25616# - bool LineIsOutsideGeometry() const; + bool LineIsOutsideGeometry() const { return mbLineIsOutsideGeometry;} // #i25616# - bool DoesSupportTextIndentingOnLineWidthChange() const; + bool DoesSupportTextIndentingOnLineWidthChange() const { return mbSupportTextIndentingOnLineWidthChange;} // application specific data sal_uInt16 GetUserDataCount() const; @@ -990,7 +990,7 @@ public: /// @see mbDoNotInsertIntoPageAutomatically void SetDoNotInsertIntoPageAutomatically(bool bSet); /// @see mbDoNotInsertIntoPageAutomatically - bool IsDoNotInsertIntoPageAutomatically() const; + bool IsDoNotInsertIntoPageAutomatically() const { return mbDoNotInsertIntoPageAutomatically;} // #i121917# virtual bool HasText() const; diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 4a3779a0f85f..6a529c26c0e7 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -186,7 +186,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - bool IsMirrored() const; + bool IsMirrored() const { return bMirrored;} void SetMirrored( bool _bMirrored ); // #111096# diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index 74168ebc2274..3f48b3145a3c 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -48,7 +48,7 @@ public: virtual ~SdrPageObj(); // #111111# - SdrPage* GetReferencedPage() const; + SdrPage* GetReferencedPage() const { return mpShownPage;} void SetReferencedPage(SdrPage* pNewPage); // #i96598# diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 077b66964803..9dc74bbb7bdb 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -403,7 +403,7 @@ public: // StyleSheet access void SetStyleSheet(SfxStyleSheet* pStyleSheet); - SfxStyleSheet* GetStyleSheet() const; + SfxStyleSheet* GetStyleSheet() const { return mpStyleSheet;} }; diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 0c5dbcd91a33..645c35383a41 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -103,7 +103,7 @@ public: enum HintType { SVX_HINT_VIEWCHANGED }; TYPEINFO_OVERRIDE(); explicit SvxViewHint (HintType eType); - HintType GetHintType (void) const; + HintType GetHintType (void) const { return meHintType;} private: HintType meHintType; @@ -223,7 +223,7 @@ public: void SetBufferedOverlayAllowed(bool bNew); // allow page painting at all? - bool IsPagePaintingAllowed() const; + bool IsPagePaintingAllowed() const { return mbPagePaintingAllowed;} void SetPagePaintingAllowed(bool bNew); protected: diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 2904d87321ba..739244f16664 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -255,7 +255,7 @@ protected: void SetOwner(bool bNew); private: - sal_uInt32 GetOrdNum() const; + sal_uInt32 GetOrdNum() const { return nOrdNum;} void SetOrdNum(sal_uInt32 nOrdNum_); }; diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 81092d548acc..cdcd74fb3264 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -611,7 +611,7 @@ public: virtual ~SvxShapePolyPolygon() throw(); // Local support functions - ::com::sun::star::drawing::PolygonKind GetPolygonKind() const throw(); + ::com::sun::star::drawing::PolygonKind GetPolygonKind() const throw() { return mePolygonKind;} void SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(css::uno::RuntimeException); basegfx::B2DPolyPolygon GetPolygon() const throw(); @@ -641,7 +641,7 @@ public: virtual ~SvxShapePolyPolygonBezier() throw(); // Local support functions - ::com::sun::star::drawing::PolygonKind GetPolygonKind() const throw(); + ::com::sun::star::drawing::PolygonKind GetPolygonKind() const throw() { return mePolygonKind;} void SetPolygon(const basegfx::B2DPolyPolygon & rNew) throw(css::uno::RuntimeException); basegfx::B2DPolyPolygon GetPolygon() const throw(); |