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 | |
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')
-rw-r--r-- | lotuswordpro/inc/xfilter/xfdrawobj.hxx | 4 | ||||
-rw-r--r-- | lotuswordpro/inc/xfilter/xfframe.hxx | 12 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfdrawline.cxx | 8 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfdrawobj.cxx | 12 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfframe.cxx | 6 |
5 files changed, 21 insertions, 21 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) diff --git a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx index b59ba6174ad0..6b9c7b67656a 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawline.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawline.cxx @@ -103,13 +103,13 @@ void XFDrawLine::ToXml(IXFStream *pStrm) //transform OUString strTransform; - if( m_nFlag&XFDRAWOBJECT_FLAG_ROTATE ) + if( m_nDrawFlag&XFDRAWOBJECT_FLAG_ROTATE ) strTransform = "rotate (" + OUString::number(m_fRotate) + ") "; - if( m_nFlag&XFDRAWOBJECT_FLAG_TRANSLATE ) + if( m_nDrawFlag&XFDRAWOBJECT_FLAG_TRANSLATE ) strTransform += "translate (" + OUString::number(m_aRotatePoint.GetX()) + "cm " + OUString::number(m_aRotatePoint.GetY()) + "cm) "; - if( m_nFlag&XFDRAWOBJECT_FLAG_SKEWX ) + if( m_nDrawFlag&XFDRAWOBJECT_FLAG_SKEWX ) strTransform += "skewX (" + OUString::number(0) + " "; - if( m_nFlag&XFDRAWOBJECT_FLAG_SKEWY ) + if( m_nDrawFlag&XFDRAWOBJECT_FLAG_SKEWY ) strTransform += "skewY (" + OUString::number(0) + " "; strTransform = strTransform.trim(); diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx index b756617ba5a3..43ac5406b4e6 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.cxx @@ -62,7 +62,7 @@ XFDrawObject::XFDrawObject() { m_fRotate = 0; - m_nFlag = 0; + m_nDrawFlag = 0; m_eType = enumXFFrameDrawing; } @@ -111,15 +111,15 @@ void XFDrawObject::ToXml(IXFStream *pStrm) //transform OUString strTransform; - if( m_nFlag&XFDRAWOBJECT_FLAG_ROTATE ) + if( m_nDrawFlag&XFDRAWOBJECT_FLAG_ROTATE ) strTransform = "rotate (" + OUString::number(m_fRotate) + ") "; - if( m_nFlag&XFDRAWOBJECT_FLAG_TRANSLATE ) + if( m_nDrawFlag&XFDRAWOBJECT_FLAG_TRANSLATE ) strTransform += "translate (" + OUString::number(m_aRotatePoint.GetX()) + "cm " + OUString::number(m_aRotatePoint.GetY()) + "cm) "; - if( m_nFlag&XFDRAWOBJECT_FLAG_SCALE ) + if( m_nDrawFlag&XFDRAWOBJECT_FLAG_SCALE ) strTransform += "scale (" + OUString::number(0) + "cm " + OUString::number(0) + "cm) "; - if( m_nFlag&XFDRAWOBJECT_FLAG_SKEWX ) + if( m_nDrawFlag&XFDRAWOBJECT_FLAG_SKEWX ) strTransform += "skewX (" + OUString::number(0) + " "; - if( m_nFlag&XFDRAWOBJECT_FLAG_SKEWY ) + if( m_nDrawFlag&XFDRAWOBJECT_FLAG_SKEWY ) strTransform += "skewY (" + OUString::number(0) + " "; strTransform = strTransform.trim(); diff --git a/lotuswordpro/source/filter/xfilter/xfframe.cxx b/lotuswordpro/source/filter/xfilter/xfframe.cxx index 7ae09473cb52..cfda8563de96 100644 --- a/lotuswordpro/source/filter/xfilter/xfframe.cxx +++ b/lotuswordpro/source/filter/xfilter/xfframe.cxx @@ -72,7 +72,7 @@ XFFrame::XFFrame(bool isTextBox) , m_nZIndex(ZINDEX_MIN) , m_fMinHeight(0) , m_eType(enumXFFrameTextbox) - , m_nFlag(0) + , m_nFrameFlag(0) , m_isTextBox(isTextBox) {} @@ -158,10 +158,10 @@ void XFFrame::StartFrame(IXFStream *pStrm) pAttrList->AddAttribute( "svg:x", OUString::number(m_aRect.GetX()) + "cm" ); pAttrList->AddAttribute( "svg:y", OUString::number(m_aRect.GetY()) + "cm" ); pAttrList->AddAttribute( "svg:width", OUString::number(m_aRect.GetWidth()) + "cm" ); - if( m_nFlag& XFFRAME_FLAG_MINHEIGHT ) + if( m_nFrameFlag& XFFRAME_FLAG_MINHEIGHT ) { pAttrList->AddAttribute( "fo:min-height", OUString::number(m_fMinHeight) + "cm" ); - if( m_nFlag&XFFRAME_FLAG_MAXHEIGHT ) + if( m_nFrameFlag&XFFRAME_FLAG_MAXHEIGHT ) pAttrList->AddAttribute( "fo:max-height", OUString::number(0) + "cm" ); } else |