Kaydet (Commit) e9c862e9 authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: prefix members of SwDrawFrameFormat

Change-Id: I0d00ca7727e0756030830cd732655b2a22b900d6
üst bd63b48a
...@@ -231,8 +231,8 @@ class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat ...@@ -231,8 +231,8 @@ class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat
{ {
friend class SwDoc; friend class SwDoc;
mutable const SdrObject * pSdrObjCached; mutable const SdrObject * m_pSdrObjectCached;
mutable OUString sSdrObjCachedComment; mutable OUString m_sSdrObjectCachedComment;
SwDrawFrameFormat( const SwDrawFrameFormat &rCpy ) = delete; SwDrawFrameFormat( const SwDrawFrameFormat &rCpy ) = delete;
SwDrawFrameFormat &operator=( const SwDrawFrameFormat &rCpy ) = delete; SwDrawFrameFormat &operator=( const SwDrawFrameFormat &rCpy ) = delete;
...@@ -247,7 +247,7 @@ protected: ...@@ -247,7 +247,7 @@ protected:
SwDrawFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm, SwDrawFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
SwFrameFormat *pDrvdFrm ) SwFrameFormat *pDrvdFrm )
: SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_DRAWFRMFMT ), : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_DRAWFRMFMT ),
pSdrObjCached(NULL), m_pSdrObjectCached(NULL),
meLayoutDir( SwFrameFormat::HORI_L2R ), meLayoutDir( SwFrameFormat::HORI_L2R ),
...@@ -259,7 +259,7 @@ protected: ...@@ -259,7 +259,7 @@ protected:
SwDrawFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, SwDrawFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm,
SwFrameFormat *pDrvdFrm ) SwFrameFormat *pDrvdFrm )
: SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_DRAWFRMFMT ), : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_DRAWFRMFMT ),
pSdrObjCached(NULL), m_pSdrObjectCached(NULL),
meLayoutDir( SwFrameFormat::HORI_L2R ), meLayoutDir( SwFrameFormat::HORI_L2R ),
mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ), mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
......
...@@ -3358,18 +3358,18 @@ OUString SwDrawFrameFormat::GetDescription() const ...@@ -3358,18 +3358,18 @@ OUString SwDrawFrameFormat::GetDescription() const
if (pSdrObj) if (pSdrObj)
{ {
if (pSdrObj != pSdrObjCached) if (pSdrObj != m_pSdrObjectCached)
{ {
SdrObject * pSdrObjCopy = pSdrObj->Clone(); SdrObject * pSdrObjCopy = pSdrObj->Clone();
SdrUndoNewObj * pSdrUndo = new SdrUndoNewObj(*pSdrObjCopy); SdrUndoNewObj * pSdrUndo = new SdrUndoNewObj(*pSdrObjCopy);
sSdrObjCachedComment = pSdrUndo->GetComment(); m_sSdrObjectCachedComment = pSdrUndo->GetComment();
delete pSdrUndo; delete pSdrUndo;
pSdrObjCached = pSdrObj; m_pSdrObjectCached = pSdrObj;
} }
aResult = sSdrObjCachedComment; aResult = m_sSdrObjectCachedComment;
} }
else else
aResult = SW_RESSTR(STR_GRAPHIC); aResult = SW_RESSTR(STR_GRAPHIC);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment