diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-02 09:05:43 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-02 09:11:26 +0100 |
| commit | e9c862e9f9ba3cc2eb09c146c8dfd2aaa5cf57bc (patch) | |
| tree | 88aa527df89087a179d18d9efea0be54e9a8af76 | |
| parent | bd63b48ab027d63d889f2a0136589a6bfd4158eb (diff) | |
sw: prefix members of SwDrawFrameFormat
Change-Id: I0d00ca7727e0756030830cd732655b2a22b900d6
| -rw-r--r-- | sw/inc/frmfmt.hxx | 8 | ||||
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index edbfc8177297..f1a75de3f127 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -231,8 +231,8 @@ class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat { friend class SwDoc; - mutable const SdrObject * pSdrObjCached; - mutable OUString sSdrObjCachedComment; + mutable const SdrObject * m_pSdrObjectCached; + mutable OUString m_sSdrObjectCachedComment; SwDrawFrameFormat( const SwDrawFrameFormat &rCpy ) = delete; SwDrawFrameFormat &operator=( const SwDrawFrameFormat &rCpy ) = delete; @@ -247,7 +247,7 @@ protected: SwDrawFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, SwFrameFormat *pDrvdFrm ) : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_DRAWFRMFMT ), - pSdrObjCached(NULL), + m_pSdrObjectCached(NULL), meLayoutDir( SwFrameFormat::HORI_L2R ), @@ -259,7 +259,7 @@ protected: SwDrawFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, SwFrameFormat *pDrvdFrm ) : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_DRAWFRMFMT ), - pSdrObjCached(NULL), + m_pSdrObjectCached(NULL), meLayoutDir( SwFrameFormat::HORI_L2R ), mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ), diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index f985b62a7a48..fea1265659ae 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -3358,18 +3358,18 @@ OUString SwDrawFrameFormat::GetDescription() const if (pSdrObj) { - if (pSdrObj != pSdrObjCached) + if (pSdrObj != m_pSdrObjectCached) { SdrObject * pSdrObjCopy = pSdrObj->Clone(); SdrUndoNewObj * pSdrUndo = new SdrUndoNewObj(*pSdrObjCopy); - sSdrObjCachedComment = pSdrUndo->GetComment(); + m_sSdrObjectCachedComment = pSdrUndo->GetComment(); delete pSdrUndo; - pSdrObjCached = pSdrObj; + m_pSdrObjectCached = pSdrObj; } - aResult = sSdrObjCachedComment; + aResult = m_sSdrObjectCachedComment; } else aResult = SW_RESSTR(STR_GRAPHIC); |