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

sw: prefix members of SwXStyle

Change-Id: I0f80f52c31c68521b89faf123e45ce458883d76b
üst 6aa90a44
...@@ -168,23 +168,23 @@ class SwXStyle : public cppu::WeakImplHelper ...@@ -168,23 +168,23 @@ class SwXStyle : public cppu::WeakImplHelper
friend class SwXStyleFamily; friend class SwXStyleFamily;
SwDoc* m_pDoc; SwDoc* m_pDoc;
OUString m_sStyleName; OUString m_sStyleName;
SfxStyleSheetBasePool* pBasePool; SfxStyleSheetBasePool* m_pBasePool;
SfxStyleFamily eFamily; // for Notify SfxStyleFamily m_eFamily; // for Notify
bool bIsDescriptor : 1; bool m_bIsDescriptor : 1;
bool bIsConditional : 1; bool m_bIsConditional : 1;
OUString m_sParentStyleName; OUString m_sParentStyleName;
SwStyleProperties_Impl* pPropImpl; SwStyleProperties_Impl* m_pPropertiesImpl;
void ApplyDescriptorProperties(); void ApplyDescriptorProperties();
protected: protected:
void Invalidate(); void Invalidate();
const SfxStyleSheetBasePool* GetBasePool() const {return pBasePool;} const SfxStyleSheetBasePool* GetBasePool() const {return m_pBasePool;}
SfxStyleSheetBasePool* GetBasePool() {return pBasePool;} SfxStyleSheetBasePool* GetBasePool() {return m_pBasePool;}
void SetStyleName(const OUString& rSet){ m_sStyleName = rSet;} void SetStyleName(const OUString& rSet){ m_sStyleName = rSet;}
SwStyleProperties_Impl* GetPropImpl(){return pPropImpl;} SwStyleProperties_Impl* GetPropImpl(){return m_pPropertiesImpl;}
com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxStyleData; com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxStyleData;
com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxStyleFamily; com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxStyleFamily;
...@@ -259,16 +259,16 @@ public: ...@@ -259,16 +259,16 @@ public:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
OUString GetStyleName() const { return m_sStyleName;} OUString GetStyleName() const { return m_sStyleName;}
SfxStyleFamily GetFamily() const {return eFamily;} SfxStyleFamily GetFamily() const {return m_eFamily;}
bool IsDescriptor() const {return bIsDescriptor;} bool IsDescriptor() const {return m_bIsDescriptor;}
bool IsConditional() const { return bIsConditional;} bool IsConditional() const { return m_bIsConditional;}
OUString GetParentStyleName() const { return m_sParentStyleName;} OUString GetParentStyleName() const { return m_sParentStyleName;}
void SetDoc(SwDoc* pDc, SfxStyleSheetBasePool* pPool) void SetDoc(SwDoc* pDc, SfxStyleSheetBasePool* pPool)
{ {
bIsDescriptor = false; m_pDoc = pDc; m_bIsDescriptor = false; m_pDoc = pDc;
pBasePool = pPool; m_pBasePool = pPool;
StartListening(*pBasePool); StartListening(*m_pBasePool);
} }
SwDoc* GetDoc() const { return m_pDoc; } SwDoc* GetDoc() const { return m_pDoc; }
}; };
......
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