diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-31 16:03:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-31 20:25:25 +0100 |
| commit | 453cb4dfa5c563fcfe723a9193246873ebc83b1e (patch) | |
| tree | e47e0001a88101fff0df8c4377185ee866058d55 /lotuswordpro/inc | |
| parent | fd0e8beee9ce68d833694d7c234252372c17decc (diff) | |
loplugin:datamembershadow in lotuswordpro
Change-Id: I50f37e09df6c4c7cbe697e3419731e637c980807
Reviewed-on: https://gerrit.libreoffice.org/49000
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'lotuswordpro/inc')
| -rw-r--r-- | lotuswordpro/inc/xfilter/xfdrawobj.hxx | 4 | ||||
| -rw-r--r-- | lotuswordpro/inc/xfilter/xfframe.hxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lotuswordpro/inc/xfilter/xfdrawobj.hxx b/lotuswordpro/inc/xfilter/xfdrawobj.hxx index cecd196e6aeb..210212495457 100644 --- a/lotuswordpro/inc/xfilter/xfdrawobj.hxx +++ b/lotuswordpro/inc/xfilter/xfdrawobj.hxx @@ -88,7 +88,7 @@ public: */ void SetRotate(double degree) { - m_nFlag |= XFDRAWOBJECT_FLAG_ROTATE; + m_nDrawFlag |= XFDRAWOBJECT_FLAG_ROTATE; m_fRotate = degree*2*PI/360; m_aRotatePoint = XFPoint(0,0); } @@ -100,7 +100,7 @@ public: protected: double m_fRotate; XFPoint m_aRotatePoint; - unsigned int m_nFlag; + unsigned int m_nDrawFlag; }; #endif diff --git a/lotuswordpro/inc/xfilter/xfframe.hxx b/lotuswordpro/inc/xfilter/xfframe.hxx index 1f25082d8eb1..1394cde73ae0 100644 --- a/lotuswordpro/inc/xfilter/xfframe.hxx +++ b/lotuswordpro/inc/xfilter/xfframe.hxx @@ -182,7 +182,7 @@ protected: double m_fMinHeight; OUString m_strNextLink; enumXFFrameType m_eType; - sal_uInt32 m_nFlag; + sal_uInt32 m_nFrameFlag; bool m_isTextBox; }; @@ -214,22 +214,22 @@ inline void XFFrame::SetWidth(double width) inline void XFFrame::SetHeight(double height) { m_aRect.SetHeight(height); - m_nFlag |= XFFRAME_FLAG_HEIGHT; - m_nFlag &= XFFRAME_FLAG_HEIGHT; + m_nFrameFlag |= XFFRAME_FLAG_HEIGHT; + m_nFrameFlag &= XFFRAME_FLAG_HEIGHT; } inline void XFFrame::SetMinHeight(double minHeight) { m_fMinHeight = minHeight; - m_nFlag |= XFFRAME_FLAG_MINHEIGHT; - m_nFlag &= XFFRAME_FLAG_MINHEIGHT; + m_nFrameFlag |= XFFRAME_FLAG_MINHEIGHT; + m_nFrameFlag &= XFFRAME_FLAG_MINHEIGHT; } inline void XFFrame::SetPosition(double x, double y, double width, double height) { m_aRect.SetStartPoint(XFPoint(x,y)); m_aRect.SetSize(width,height); - m_nFlag |= XFFRAME_FLAG_HEIGHT; + m_nFrameFlag |= XFFRAME_FLAG_HEIGHT; } inline void XFFrame::SetPosition(const XFRect& rect) |