diff options
Diffstat (limited to 'sw/source/uibase')
-rw-r--r-- | sw/source/uibase/docvw/AnchorOverlayObject.hxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/docvw/OverlayRanges.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/ShadowOverlayObject.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/basesh.hxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/inc/caption.hxx | 40 | ||||
-rw-r--r-- | sw/source/uibase/inc/chldwrap.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/drawbase.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/edtwin.hxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/inc/frmmgr.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/frmpage.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/mailmrge.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/numfmtlb.hxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/inc/optpage.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/pview.hxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/inc/redlndlg.hxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/inc/uivwimp.hxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/inc/wrap.hxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/wrtsh/move.cxx | 4 |
18 files changed, 61 insertions, 61 deletions
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx index 55fecd467c78..cc15504ee8df 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.hxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.hxx @@ -48,7 +48,7 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition const Color& aColorAnchor ); static void DestroyAnchorOverlayObject( AnchorOverlayObject* pAnchor ); - inline const basegfx::B2DPoint& GetSecondPosition() const { return maSecondPosition; } + const basegfx::B2DPoint& GetSecondPosition() const { return maSecondPosition; } const basegfx::B2DPoint& GetThirdPosition() const { return maThirdPosition; } const basegfx::B2DPoint& GetFourthPosition() const { return maFourthPosition; } const basegfx::B2DPoint& GetFifthPosition() const { return maFifthPosition; } @@ -71,12 +71,12 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition void SetSeventhPosition( const basegfx::B2DPoint& rNew ); void setLineSolid( const bool bNew ); - inline bool getLineSolid() const { return mbLineSolid; } + bool getLineSolid() const { return mbLineSolid; } - inline void SetHeight( const unsigned long aHeight ) { mHeight = aHeight; }; + void SetHeight( const unsigned long aHeight ) { mHeight = aHeight; }; void SetAnchorState( const AnchorState aState ); - inline AnchorState GetAnchorState() const { return mAnchorState; } + AnchorState GetAnchorState() const { return mAnchorState; } protected: /* 6------------7 diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx index 1d797c946b50..941980bceb59 100644 --- a/sw/source/uibase/docvw/OverlayRanges.hxx +++ b/sw/source/uibase/docvw/OverlayRanges.hxx @@ -52,7 +52,7 @@ namespace sw virtual ~OverlayRanges() override; // data read access - inline const std::vector< basegfx::B2DRange >& getRanges() const + const std::vector< basegfx::B2DRange >& getRanges() const { return maRanges; } diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx index fb796b9b9e81..d8a55e92304c 100644 --- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx +++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx @@ -50,7 +50,7 @@ private: public: void SetShadowState(ShadowState aState); - inline ShadowState GetShadowState() {return mShadowState;} + ShadowState GetShadowState() {return mShadowState;} void SetPosition( const basegfx::B2DPoint& rPoint1, const basegfx::B2DPoint& rPoint2 ); diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx index 52133ede7095..04bb8407a511 100644 --- a/sw/source/uibase/inc/basesh.hxx +++ b/sw/source/uibase/inc/basesh.hxx @@ -56,9 +56,9 @@ protected: SwWrtShell& GetShell(); SwWrtShell* GetShellPtr(); - inline SwView& GetView() { return rView; } - inline void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; } - inline bool AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.insert( nSlot ).second; } + SwView& GetView() { return rView; } + void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; } + bool AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.insert( nSlot ).second; } DECL_LINK( InsertDBTextHdl, void*, void ); diff --git a/sw/source/uibase/inc/caption.hxx b/sw/source/uibase/inc/caption.hxx index b1fa6fdfc789..8b03143ffbbf 100644 --- a/sw/source/uibase/inc/caption.hxx +++ b/sw/source/uibase/inc/caption.hxx @@ -47,43 +47,43 @@ public: InsCaptionOpt(const InsCaptionOpt&); ~InsCaptionOpt(); - inline bool& UseCaption() { return bUseCaption; } - inline bool UseCaption() const { return bUseCaption; } + bool& UseCaption() { return bUseCaption; } + bool UseCaption() const { return bUseCaption; } - inline SwCapObjType GetObjType() const { return eObjType; } + SwCapObjType GetObjType() const { return eObjType; } - inline const SvGlobalName& GetOleId() const { return aOleId; } + const SvGlobalName& GetOleId() const { return aOleId; } - inline const OUString& GetCategory() const { return sCategory; } - inline void SetCategory(const OUString& rCat) { sCategory = rCat; } + const OUString& GetCategory() const { return sCategory; } + void SetCategory(const OUString& rCat) { sCategory = rCat; } - inline sal_uInt16 GetNumType() const { return nNumType; } - inline void SetNumType(const sal_uInt16 nNT) { nNumType = nNT; } + sal_uInt16 GetNumType() const { return nNumType; } + void SetNumType(const sal_uInt16 nNT) { nNumType = nNT; } const OUString& GetNumSeparator() const { return sNumberSeparator; } void SetNumSeparator(const OUString& rSet) {sNumberSeparator = rSet;} - inline const OUString& GetCaption() const { return sCaption; } - inline void SetCaption(const OUString& rCap) { sCaption = rCap; } + const OUString& GetCaption() const { return sCaption; } + void SetCaption(const OUString& rCap) { sCaption = rCap; } - inline sal_uInt16 GetPos() const { return nPos; } - inline void SetPos(const sal_uInt16 nP) { nPos = nP; } + sal_uInt16 GetPos() const { return nPos; } + void SetPos(const sal_uInt16 nP) { nPos = nP; } - inline sal_uInt16 GetLevel() const { return nLevel; } - inline void SetLevel(const sal_uInt16 nLvl) { nLevel = nLvl; } + sal_uInt16 GetLevel() const { return nLevel; } + void SetLevel(const sal_uInt16 nLvl) { nLevel = nLvl; } - inline const OUString& GetSeparator() const { return sSeparator; } - inline void SetSeparator(const OUString& rSep) { sSeparator = rSep; } + const OUString& GetSeparator() const { return sSeparator; } + void SetSeparator(const OUString& rSep) { sSeparator = rSep; } const OUString& GetCharacterStyle() const { return sCharacterStyle; } void SetCharacterStyle(const OUString& rStyle) { sCharacterStyle = rStyle; } - inline bool& IgnoreSeqOpts() { return bIgnoreSeqOpts; } - inline bool IgnoreSeqOpts() const { return bIgnoreSeqOpts; } + bool& IgnoreSeqOpts() { return bIgnoreSeqOpts; } + bool IgnoreSeqOpts() const { return bIgnoreSeqOpts; } - inline bool& CopyAttributes() { return bCopyAttributes; } - inline bool CopyAttributes() const { return bCopyAttributes; } + bool& CopyAttributes() { return bCopyAttributes; } + bool CopyAttributes() const { return bCopyAttributes; } InsCaptionOpt& operator= ( const InsCaptionOpt& rOpt ); }; diff --git a/sw/source/uibase/inc/chldwrap.hxx b/sw/source/uibase/inc/chldwrap.hxx index 7f0b46e4f13e..0ff0823950b8 100644 --- a/sw/source/uibase/inc/chldwrap.hxx +++ b/sw/source/uibase/inc/chldwrap.hxx @@ -38,8 +38,8 @@ protected: public: virtual bool ReInitDlg(SwDocShell *pDocSh); - inline SwDocShell* GetOldDocShell() { return m_pDocSh; } - inline void SetOldDocShell(SwDocShell *pDcSh) { m_pDocSh = pDcSh; } + SwDocShell* GetOldDocShell() { return m_pDocSh; } + void SetOldDocShell(SwDocShell *pDcSh) { m_pDocSh = pDcSh; } }; #endif diff --git a/sw/source/uibase/inc/drawbase.hxx b/sw/source/uibase/inc/drawbase.hxx index 9ba4450c4a30..b369700115ec 100644 --- a/sw/source/uibase/inc/drawbase.hxx +++ b/sw/source/uibase/inc/drawbase.hxx @@ -46,8 +46,8 @@ public: void SetDrawPointer(); void EnterSelectMode(const MouseEvent& rMEvt); - inline bool IsInsertForm() const { return m_bInsForm; } - inline bool IsCreateObj() const { return m_bCreateObj; } + bool IsInsertForm() const { return m_bInsForm; } + bool IsCreateObj() const { return m_bCreateObj; } // mouse- & key events; return value=true: event was edited virtual bool KeyInput(const KeyEvent& rKEvt); diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 7c666ba77ef6..1a965f07c494 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -225,8 +225,8 @@ public: void SetObjectSelect( bool bVal ) { m_bObjectSelect = bVal; } bool IsObjectSelect() const { return m_bObjectSelect; } - inline SdrObjKind GetSdrDrawMode() const { return m_eDrawMode; } - inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { m_eDrawMode = eSdrObjectKind; SetObjectSelect( false ); } + SdrObjKind GetSdrDrawMode() const { return m_eDrawMode; } + void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { m_eDrawMode = eSdrObjectKind; SetObjectSelect( false ); } void StdDrawMode( SdrObjKind eSdrObjectKind, bool bObjSelect ); bool IsFrameAction() const { return m_bInsFrame; } @@ -262,8 +262,8 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; - static inline long GetDDStartPosX() { return m_nDDStartPosX; } - static inline long GetDDStartPosY() { return m_nDDStartPosY; } + static long GetDDStartPosX() { return m_nDDStartPosX; } + static long GetDDStartPosY() { return m_nDDStartPosY; } static void InitStaticData(); static void FinitStaticData(); diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx index 55c549060542..f1101153f537 100644 --- a/sw/source/uibase/inc/frmmgr.hxx +++ b/sw/source/uibase/inc/frmmgr.hxx @@ -118,8 +118,8 @@ public: void DelAttr(sal_uInt16 nId); // reach out the set - inline const SfxItemSet &GetAttrSet() const { return m_aSet; } - inline SfxItemSet &GetAttrSet() { return m_aSet; } + const SfxItemSet &GetAttrSet() const { return m_aSet; } + SfxItemSet &GetAttrSet() { return m_aSet; } void SetAttrSet(const SfxItemSet& rSet); inline const SwFormatVertOrient &GetVertOrient() const; diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 6563bb362b7d..fe4a3a1d397d 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -197,7 +197,7 @@ public: void SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; } void SetFormatUsed(bool bFormat); void SetFrameType(const OUString &rType) { m_sDlgType = rType; } - inline bool IsInGraficMode() { return m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog"; } + bool IsInGraficMode() { return m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog"; } void EnableVerticalPositioning( bool bEnable ); }; diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index 8dfe82451a7e..349fba6c2697 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -126,7 +126,7 @@ public: virtual ~SwMailMergeDlg() override; virtual void dispose() override; - inline DBManagerOptions GetMergeType() { return nMergeType; } + DBManagerOptions GetMergeType() { return nMergeType; } bool IsSaveSingleDoc() const { return m_pSaveSingleDocRB->IsChecked(); } bool IsGenerateFromDataBase() const { return m_pGenerateFromDataBaseCB->IsChecked(); } diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 68e242338413..27cdbc190f66 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -52,14 +52,14 @@ public: void Clear(); - inline void SetOneArea(bool bOnlyOne) { bOneArea = bOnlyOne; } + void SetOneArea(bool bOnlyOne) { bOneArea = bOnlyOne; } void SetFormatType(const short nFormatType); - inline short GetFormatType() const { return nCurrFormatType; } + short GetFormatType() const { return nCurrFormatType; } void SetDefFormat(const sal_uLong nDefFormat); sal_uLong GetFormat() const; - inline LanguageType GetCurLanguage() const { return eCurLanguage;} + LanguageType GetCurLanguage() const { return eCurLanguage;} void SetLanguage(LanguageType eSet) { eCurLanguage = eSet;} void SetAutomaticLanguage(bool bSet){bUseAutomaticLanguage = bSet;} diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index a4022db8df4b..aaf35150498e 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -303,8 +303,8 @@ public: SwMarkPreview(vcl::Window* pParent, WinBits nWinBits); virtual ~SwMarkPreview() override; - inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; } - inline void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; } + void SetColor(const Color& rCol) { m_aMarkCol = rCol; } + void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; } virtual Size GetOptimalSize() const override; }; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 80edefd8dec0..0c3445ff4631 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -232,9 +232,9 @@ private: static void InitInterface_Impl(); public: - inline SwViewShell* GetViewShell() const + SwViewShell* GetViewShell() const { return m_pViewWin->GetViewShell(); } - inline void RepaintCoreRect( const SwRect& rRect ) + void RepaintCoreRect( const SwRect& rRect ) { m_pViewWin->RepaintCoreRect( rRect ); } void DocSzChgd(const Size& rNewSize); @@ -271,12 +271,12 @@ public: // Inline method to request values of new members // <mbResetFormDesignMode> and <mbFormDesignModeToReset> - inline bool ResetFormDesignMode() const + bool ResetFormDesignMode() const { return mbResetFormDesignMode; } - inline bool FormDesignModeToReset() const + bool FormDesignModeToReset() const { return mbFormDesignModeToReset; } diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 3328920b8b58..08104b33f0dd 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -51,7 +51,7 @@ struct SwRedlineDataParent SvTreeListEntry* pTLBParent; // corresponding TreeListBox entry OUString sComment; // redline comment - inline bool operator< ( const SwRedlineDataParent& rObj ) const + bool operator< ( const SwRedlineDataParent& rObj ) const { return (pData && pData->GetSeqNo() < rObj.pData->GetSeqNo()); } }; @@ -123,8 +123,8 @@ public: DECL_LINK( FilterChangedHdl, SvxTPFilter*, void ); - inline SvxAcceptChgCtr& GetChgCtrl() { return *m_aTabPagesCTRL.get(); } - inline bool HasRedlineAutoFormat() const { return m_bRedlnAutoFormat; } + SvxAcceptChgCtr& GetChgCtrl() { return *m_aTabPagesCTRL.get(); } + bool HasRedlineAutoFormat() const { return m_bRedlnAutoFormat; } void Init(SwRedlineTable::size_type nStart = 0); void CallAcceptReject( bool bSelect, bool bAccept ); diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx index e26e5764667b..c47056c6eb9a 100644 --- a/sw/source/uibase/inc/uivwimp.hxx +++ b/sw/source/uibase/inc/uivwimp.hxx @@ -164,9 +164,9 @@ public: SfxMedium* CreateMedium(); void InitRequest( const SfxRequest& rRequest ); - inline SfxRequest* GetRequest() const { return m_pRequest; } - inline sal_Int16 GetParam() const { return m_nParam; } - inline void SetParam( sal_Int16 nParam ) { m_nParam = nParam; } + SfxRequest* GetRequest() const { return m_pRequest; } + sal_Int16 GetParam() const { return m_nParam; } + void SetParam( sal_Int16 nParam ) { m_nParam = nParam; } }; #endif diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 254a9a6dc58d..00e26825b38a 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -103,9 +103,9 @@ public: virtual void Reset(const SfxItemSet *rSet) override; static const sal_uInt16* GetRanges() { return m_aWrapPageRg; } - inline void SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; } - inline void SetFormatUsed(bool bFormat, bool bDrawMode) { m_bFormat = bFormat; m_bDrawMode = bDrawMode; } - inline void SetShell(SwWrtShell* pSh) { m_pWrtSh = pSh; } + void SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; } + void SetFormatUsed(bool bFormat, bool bDrawMode) { m_bFormat = bFormat; m_bDrawMode = bDrawMode; } + void SetShell(SwWrtShell* pSh) { m_pWrtSh = pSh; } }; #endif diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx index a58fa570de36..7399043f27b6 100644 --- a/sw/source/uibase/wrtsh/move.cxx +++ b/sw/source/uibase/wrtsh/move.cxx @@ -42,13 +42,13 @@ class ShellMoveCursor SwWrtShell* pSh; bool bAct; public: - inline ShellMoveCursor( SwWrtShell* pWrtSh, bool bSel ) + ShellMoveCursor( SwWrtShell* pWrtSh, bool bSel ) { bAct = !pWrtSh->ActionPend() && (pWrtSh->GetFrameType(nullptr,false) & FrameTypeFlags::FLY_ANY); ( pSh = pWrtSh )->MoveCursor( bSel ); pWrtSh->GetView().GetViewFrame()->GetBindings().Invalidate(SID_HYPERLINK_GETLINK); } - inline ~ShellMoveCursor() + ~ShellMoveCursor() { if( bAct ) { |