Skip to content

C
core
Kaydet (Commit) 487a05e8 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

sw: prefix members of SwRevisionConfig 

Change-Id: I51150783d0e624ae33efdd36857c2e26fb970ae0
Reviewed-on: https://gerrit.libreoffice.org/60558Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins
üst 05db125c
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 40 deletions
sw/inc/modcfg.hxx
Dosyayı görüntüle @ 487a05e8
......@@ -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
......
sw/source/uibase/config/modcfg.cxx
Dosyayı görüntüle @ 487a05e8
......@@ -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;
}
}
}
......
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