diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-09-17 09:16:24 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-09-17 11:22:45 +0200 |
commit | 487a05e898a135e477278afca2abbd57acb5c8fc (patch) | |
tree | 41eff700ab5b8efe4e281fee866e88f14b94bfd5 | |
parent | 05db125c57ea3c8f04a304561209c32cc5c45a67 (diff) |
sw: prefix members of SwRevisionConfig
Change-Id: I51150783d0e624ae33efdd36857c2e26fb970ae0
Reviewed-on: https://gerrit.libreoffice.org/60558
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins
-rw-r--r-- | sw/inc/modcfg.hxx | 30 | ||||
-rw-r--r-- | sw/source/uibase/config/modcfg.cxx | 50 |
2 files changed, 40 insertions, 40 deletions
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 47e49c2f8784..dab488078d15 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -61,14 +61,14 @@ class SwRevisionConfig : public utl::ConfigItem { friend class SwModuleOptions; - AuthorCharAttr aInsertAttr; //Revision/TextDisplay/Insert/Attribute // Redlining: author character attributes + AuthorCharAttr m_aInsertAttr; //Revision/TextDisplay/Insert/Attribute // Redlining: author character attributes //Revision/TextDisplay/Insert/Color - AuthorCharAttr aDeletedAttr; //Revision/TextDisplay/Delete/Attribute + AuthorCharAttr m_aDeletedAttr; //Revision/TextDisplay/Delete/Attribute //Revision/TextDisplay/Delete/Color - AuthorCharAttr aFormatAttr; //Revision/TextDisplay/ChangeAttribute/Attribute + AuthorCharAttr m_aFormatAttr; //Revision/TextDisplay/ChangeAttribute/Attribute //Revision/TextDisplay/ChangeAttribute/Color - sal_uInt16 nMarkAlign; //Revision/LinesChanged/Mark - Color aMarkColor; //Revision/LinesChanged/Color + sal_uInt16 m_nMarkAlign; //Revision/LinesChanged/Mark + Color m_aMarkColor; //Revision/LinesChanged/Color static const css::uno::Sequence<OUString>& GetPropertyNames(); @@ -238,24 +238,24 @@ public: void SetTableVInsert( sal_uInt16 nSet ) { m_aTableConfig.nTableVInsert = nSet; m_aTableConfig.SetModified();} - const AuthorCharAttr &GetInsertAuthorAttr() const { return m_aRevisionConfig.aInsertAttr; } - void SetInsertAuthorAttr( AuthorCharAttr const &rAttr ) { m_aRevisionConfig.aInsertAttr = rAttr; + const AuthorCharAttr &GetInsertAuthorAttr() const { return m_aRevisionConfig.m_aInsertAttr; } + void SetInsertAuthorAttr( AuthorCharAttr const &rAttr ) { m_aRevisionConfig.m_aInsertAttr = rAttr; m_aRevisionConfig.SetModified();} - const AuthorCharAttr &GetDeletedAuthorAttr() const { return m_aRevisionConfig.aDeletedAttr; } - void SetDeletedAuthorAttr( AuthorCharAttr const &rAttr ) { m_aRevisionConfig.aDeletedAttr = rAttr; + const AuthorCharAttr &GetDeletedAuthorAttr() const { return m_aRevisionConfig.m_aDeletedAttr; } + void SetDeletedAuthorAttr( AuthorCharAttr const &rAttr ) { m_aRevisionConfig.m_aDeletedAttr = rAttr; m_aRevisionConfig.SetModified();} - const AuthorCharAttr &GetFormatAuthorAttr() const { return m_aRevisionConfig.aFormatAttr; } - void SetFormatAuthorAttr( AuthorCharAttr const &rAttr ) { m_aRevisionConfig.aFormatAttr = rAttr; + const AuthorCharAttr &GetFormatAuthorAttr() const { return m_aRevisionConfig.m_aFormatAttr; } + void SetFormatAuthorAttr( AuthorCharAttr const &rAttr ) { m_aRevisionConfig.m_aFormatAttr = rAttr; m_aRevisionConfig.SetModified();} - sal_uInt16 GetMarkAlignMode() const { return m_aRevisionConfig.nMarkAlign; } - void SetMarkAlignMode(sal_uInt16 nMode) { m_aRevisionConfig.nMarkAlign = nMode; + sal_uInt16 GetMarkAlignMode() const { return m_aRevisionConfig.m_nMarkAlign; } + void SetMarkAlignMode(sal_uInt16 nMode) { m_aRevisionConfig.m_nMarkAlign = nMode; m_aRevisionConfig.SetModified();} - const Color& GetMarkAlignColor() const { return m_aRevisionConfig.aMarkColor; } - void SetMarkAlignColor(const Color &rColor) { m_aRevisionConfig.aMarkColor = rColor; + const Color& GetMarkAlignColor() const { return m_aRevisionConfig.m_aMarkColor; } + void SetMarkAlignColor(const Color &rColor) { m_aRevisionConfig.m_aMarkColor = rColor; m_aRevisionConfig.SetModified();} bool IsInsWithCaption(bool bHTML) const diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index 7157f3fb5f47..fcae5c9a67f3 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -245,15 +245,15 @@ SwRevisionConfig::SwRevisionConfig() : ConfigItem("Office.Writer/Revision", ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree) { - aInsertAttr.m_nItemId = SID_ATTR_CHAR_UNDERLINE; - aInsertAttr.m_nAttr = LINESTYLE_SINGLE; - aInsertAttr.m_nColor = COL_TRANSPARENT; - aDeletedAttr.m_nItemId = SID_ATTR_CHAR_STRIKEOUT; - aDeletedAttr.m_nAttr = STRIKEOUT_SINGLE; - aDeletedAttr.m_nColor = COL_TRANSPARENT; - aFormatAttr.m_nItemId = SID_ATTR_CHAR_WEIGHT; - aFormatAttr.m_nAttr = WEIGHT_BOLD; - aFormatAttr.m_nColor = COL_BLACK; + m_aInsertAttr.m_nItemId = SID_ATTR_CHAR_UNDERLINE; + m_aInsertAttr.m_nAttr = LINESTYLE_SINGLE; + m_aInsertAttr.m_nColor = COL_TRANSPARENT; + m_aDeletedAttr.m_nItemId = SID_ATTR_CHAR_STRIKEOUT; + m_aDeletedAttr.m_nAttr = STRIKEOUT_SINGLE; + m_aDeletedAttr.m_nColor = COL_TRANSPARENT; + m_aFormatAttr.m_nItemId = SID_ATTR_CHAR_WEIGHT; + m_aFormatAttr.m_nAttr = WEIGHT_BOLD; + m_aFormatAttr.m_nColor = COL_BLACK; Load(); } @@ -299,14 +299,14 @@ void SwRevisionConfig::ImplCommit() { switch(nProp) { - case 0 : pValues[nProp] <<= lcl_ConvertAttrToCfg(aInsertAttr); break; - case 1 : pValues[nProp] <<= aInsertAttr.m_nColor; break; - case 2 : pValues[nProp] <<= lcl_ConvertAttrToCfg(aDeletedAttr); break; - case 3 : pValues[nProp] <<= aDeletedAttr.m_nColor; break; - case 4 : pValues[nProp] <<= lcl_ConvertAttrToCfg(aFormatAttr); break; - case 5 : pValues[nProp] <<= aFormatAttr.m_nColor; break; - case 6 : pValues[nProp] <<= nMarkAlign; break; - case 7 : pValues[nProp] <<= aMarkColor; break; + case 0 : pValues[nProp] <<= lcl_ConvertAttrToCfg(m_aInsertAttr); break; + case 1 : pValues[nProp] <<= m_aInsertAttr.m_nColor; break; + case 2 : pValues[nProp] <<= lcl_ConvertAttrToCfg(m_aDeletedAttr); break; + case 3 : pValues[nProp] <<= m_aDeletedAttr.m_nColor; break; + case 4 : pValues[nProp] <<= lcl_ConvertAttrToCfg(m_aFormatAttr); break; + case 5 : pValues[nProp] <<= m_aFormatAttr.m_nColor; break; + case 6 : pValues[nProp] <<= m_nMarkAlign; break; + case 7 : pValues[nProp] <<= m_aMarkColor; break; } } PutProperties(aNames, aValues); @@ -352,14 +352,14 @@ void SwRevisionConfig::Load() pValues[nProp] >>= nVal; switch (nProp) { - case 0 : lcl_ConvertCfgToAttr(nVal, aInsertAttr); break; - case 1 : aInsertAttr.m_nColor = Color(nVal); break; - case 2 : lcl_ConvertCfgToAttr(nVal, aDeletedAttr, true); break; - case 3 : aDeletedAttr.m_nColor = Color(nVal); break; - case 4 : lcl_ConvertCfgToAttr(nVal, aFormatAttr); break; - case 5 : aFormatAttr.m_nColor = Color(nVal); break; - case 6 : nMarkAlign = sal::static_int_cast< sal_uInt16, sal_Int32>(nVal); break; - case 7 : aMarkColor = Color(nVal); break; + case 0 : lcl_ConvertCfgToAttr(nVal, m_aInsertAttr); break; + case 1 : m_aInsertAttr.m_nColor = Color(nVal); break; + case 2 : lcl_ConvertCfgToAttr(nVal, m_aDeletedAttr, true); break; + case 3 : m_aDeletedAttr.m_nColor = Color(nVal); break; + case 4 : lcl_ConvertCfgToAttr(nVal, m_aFormatAttr); break; + case 5 : m_aFormatAttr.m_nColor = Color(nVal); break; + case 6 : m_nMarkAlign = sal::static_int_cast< sal_uInt16, sal_Int32>(nVal); break; + case 7 : m_aMarkColor = Color(nVal); break; } } } |