Skip to content

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

sw: prefix members of SwTOXBaseSection and SwTableConfig 

Change-Id: I2fc2a7d456c92851e7bbb250f4467f3e0fd4f88a
Reviewed-on: https://gerrit.libreoffice.org/63546Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
üst ec11c1ae
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 50 deletions
sw/inc/modcfg.hxx
Dosyayı görüntüle @ 5b3592a4
...@@ -146,15 +146,15 @@ class SwTableConfig : public utl::ConfigItem ...@@ -146,15 +146,15 @@ class SwTableConfig : public utl::ConfigItem
{ {
friend class SwModuleOptions; friend class SwModuleOptions;
sal_uInt16 nTableHMove; //int Table/Shift/Row sal_uInt16 m_nTableHMove; //int Table/Shift/Row
sal_uInt16 nTableVMove; //int Table/Shift/Column sal_uInt16 m_nTableVMove; //int Table/Shift/Column
sal_uInt16 nTableHInsert; //int Table/Insert/Row sal_uInt16 m_nTableHInsert; //int Table/Insert/Row
sal_uInt16 nTableVInsert; //int Table/Insert/Column sal_uInt16 m_nTableVInsert; //int Table/Insert/Column
TableChgMode eTableChgMode; //int Table/Change/Effect TableChgMode m_eTableChgMode; //int Table/Change/Effect
bool bInsTableFormatNum; // Table/Input/NumberRecognition // Automatic recognition of numbers. bool m_bInsTableFormatNum; // Table/Input/NumberRecognition // Automatic recognition of numbers.
bool bInsTableChangeNumFormat; // Table/Input/NumberFormatRecognition // Automatic recognition of number formats. bool m_bInsTableChangeNumFormat; // Table/Input/NumberFormatRecognition // Automatic recognition of number formats.
bool bInsTableAlignNum; // Table/Input/Alignment // Align numbers. bool m_bInsTableAlignNum; // Table/Input/Alignment // Align numbers.
static const css::uno::Sequence<OUString>& GetPropertyNames(); static const css::uno::Sequence<OUString>& GetPropertyNames();
...@@ -218,24 +218,24 @@ class SW_DLLPUBLIC SwModuleOptions ...@@ -218,24 +218,24 @@ class SW_DLLPUBLIC SwModuleOptions
public: public:
SwModuleOptions(); SwModuleOptions();
TableChgMode GetTableMode() const { return m_aTableConfig.eTableChgMode;} TableChgMode GetTableMode() const { return m_aTableConfig.m_eTableChgMode;}
void SetTableMode( TableChgMode eSet ) { m_aTableConfig.eTableChgMode = eSet; void SetTableMode( TableChgMode eSet ) { m_aTableConfig.m_eTableChgMode = eSet;
m_aTableConfig.SetModified();} m_aTableConfig.SetModified();}
sal_uInt16 GetTableHMove() const { return m_aTableConfig.nTableHMove;} sal_uInt16 GetTableHMove() const { return m_aTableConfig.m_nTableHMove;}
void SetTableHMove( sal_uInt16 nSet ) { m_aTableConfig.nTableHMove = nSet; void SetTableHMove( sal_uInt16 nSet ) { m_aTableConfig.m_nTableHMove = nSet;
m_aTableConfig.SetModified();} m_aTableConfig.SetModified();}
sal_uInt16 GetTableVMove() const { return m_aTableConfig.nTableVMove;} sal_uInt16 GetTableVMove() const { return m_aTableConfig.m_nTableVMove;}
void SetTableVMove( sal_uInt16 nSet ) { m_aTableConfig.nTableVMove = nSet; void SetTableVMove( sal_uInt16 nSet ) { m_aTableConfig.m_nTableVMove = nSet;
m_aTableConfig.SetModified();} m_aTableConfig.SetModified();}
sal_uInt16 GetTableHInsert() const {return m_aTableConfig.nTableHInsert;} sal_uInt16 GetTableHInsert() const {return m_aTableConfig.m_nTableHInsert;}
void SetTableHInsert( sal_uInt16 nSet ) { m_aTableConfig.nTableHInsert = nSet; void SetTableHInsert( sal_uInt16 nSet ) { m_aTableConfig.m_nTableHInsert = nSet;
m_aTableConfig.SetModified();} m_aTableConfig.SetModified();}
sal_uInt16 GetTableVInsert() const {return m_aTableConfig.nTableVInsert;} sal_uInt16 GetTableVInsert() const {return m_aTableConfig.m_nTableVInsert;}
void SetTableVInsert( sal_uInt16 nSet ) { m_aTableConfig.nTableVInsert = nSet; void SetTableVInsert( sal_uInt16 nSet ) { m_aTableConfig.m_nTableVInsert = nSet;
m_aTableConfig.SetModified();} m_aTableConfig.SetModified();}
const AuthorCharAttr &GetInsertAuthorAttr() const { return m_aRevisionConfig.m_aInsertAttr; } const AuthorCharAttr &GetInsertAuthorAttr() const { return m_aRevisionConfig.m_aInsertAttr; }
...@@ -276,24 +276,24 @@ public: ...@@ -276,24 +276,24 @@ public:
} }
bool IsInsTableFormatNum(bool bHTML) const bool IsInsTableFormatNum(bool bHTML) const
{ return bHTML ? m_aWebTableConfig.bInsTableFormatNum : m_aTableConfig.bInsTableFormatNum; } { return bHTML ? m_aWebTableConfig.m_bInsTableFormatNum : m_aTableConfig.m_bInsTableFormatNum; }
void SetInsTableFormatNum( bool bHTML, bool b ) void SetInsTableFormatNum( bool bHTML, bool b )
{ auto & config = bHTML ? m_aWebTableConfig : m_aTableConfig; { auto & config = bHTML ? m_aWebTableConfig : m_aTableConfig;
config.bInsTableFormatNum = b; config.m_bInsTableFormatNum = b;
config.SetModified();} config.SetModified();}
bool IsInsTableChangeNumFormat(bool bHTML) const bool IsInsTableChangeNumFormat(bool bHTML) const
{ return bHTML ? m_aWebTableConfig.bInsTableChangeNumFormat : m_aTableConfig.bInsTableChangeNumFormat; } { return bHTML ? m_aWebTableConfig.m_bInsTableChangeNumFormat : m_aTableConfig.m_bInsTableChangeNumFormat; }
void SetInsTableChangeNumFormat( bool bHTML, bool b ) void SetInsTableChangeNumFormat( bool bHTML, bool b )
{ auto & config = bHTML ? m_aWebTableConfig : m_aTableConfig; { auto & config = bHTML ? m_aWebTableConfig : m_aTableConfig;
config.bInsTableChangeNumFormat = b; config.m_bInsTableChangeNumFormat = b;
config.SetModified();} config.SetModified();}
bool IsInsTableAlignNum(bool bHTML) const bool IsInsTableAlignNum(bool bHTML) const
{ return bHTML ? m_aWebTableConfig.bInsTableAlignNum : m_aTableConfig.bInsTableAlignNum; } { return bHTML ? m_aWebTableConfig.m_bInsTableAlignNum : m_aTableConfig.m_bInsTableAlignNum; }
void SetInsTableAlignNum( bool bHTML, bool b ) void SetInsTableAlignNum( bool bHTML, bool b )
{ auto & config = bHTML ? m_aWebTableConfig : m_aTableConfig; { auto & config = bHTML ? m_aWebTableConfig : m_aTableConfig;
config.bInsTableAlignNum = b; config.m_bInsTableAlignNum = b;
config.SetModified();} config.SetModified();}
const SwInsertTableOptions& GetInsTableFlags(bool bHTML) const const SwInsertTableOptions& GetInsTableFlags(bool bHTML) const
......
sw/source/core/doc/doctxm.cxx
Dosyayı görüntüle @ 5b3592a4
This diff is collapsed.
sw/source/core/inc/doctxm.hxx
Dosyayı görüntüle @ 5b3592a4
...@@ -33,7 +33,7 @@ struct SwTOXSortTabBase; ...@@ -33,7 +33,7 @@ struct SwTOXSortTabBase;
class SwTOXBaseSection : public SwTOXBase, public SwSection class SwTOXBaseSection : public SwTOXBase, public SwSection
{ {
std::vector<std::unique_ptr<SwTOXSortTabBase>> aSortArr; std::vector<std::unique_ptr<SwTOXSortTabBase>> m_aSortArr;
void UpdateMarks( const SwTOXInternational& rIntl, void UpdateMarks( const SwTOXInternational& rIntl,
const SwTextNode* pOwnChapterNode ); const SwTextNode* pOwnChapterNode );
...@@ -76,7 +76,7 @@ public: ...@@ -76,7 +76,7 @@ public:
const bool _bNewTOX = false ); const bool _bNewTOX = false );
void UpdatePageNum(); // insert page numbering void UpdatePageNum(); // insert page numbering
const std::vector<std::unique_ptr<SwTOXSortTabBase>>& GetTOXSortTabBases() const { return aSortArr; } const std::vector<std::unique_ptr<SwTOXSortTabBase>>& GetTOXSortTabBases() const { return m_aSortArr; }
bool SetPosAtStartEnd( SwPosition& rPos ) const; bool SetPosAtStartEnd( SwPosition& rPos ) const;
}; };
......
sw/source/uibase/config/modcfg.cxx
Dosyayı görüntüle @ 5b3592a4
...@@ -1111,14 +1111,14 @@ const Sequence<OUString>& SwTableConfig::GetPropertyNames() ...@@ -1111,14 +1111,14 @@ const Sequence<OUString>& SwTableConfig::GetPropertyNames()
SwTableConfig::SwTableConfig(bool bWeb) SwTableConfig::SwTableConfig(bool bWeb)
: ConfigItem(bWeb ? OUString("Office.WriterWeb/Table") : OUString("Office.Writer/Table"), : ConfigItem(bWeb ? OUString("Office.WriterWeb/Table") : OUString("Office.Writer/Table"),
ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree) ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree)
, nTableHMove(0) , m_nTableHMove(0)
, nTableVMove(0) , m_nTableVMove(0)
, nTableHInsert(0) , m_nTableHInsert(0)
, nTableVInsert(0) , m_nTableVInsert(0)
, eTableChgMode(TableChgMode::FixedWidthChangeAbs) , m_eTableChgMode(TableChgMode::FixedWidthChangeAbs)
, bInsTableFormatNum(false) , m_bInsTableFormatNum(false)
, bInsTableChangeNumFormat(false) , m_bInsTableChangeNumFormat(false)
, bInsTableAlignNum(false) , m_bInsTableAlignNum(false)
{ {
Load(); Load();
} }
...@@ -1139,14 +1139,14 @@ void SwTableConfig::ImplCommit() ...@@ -1139,14 +1139,14 @@ void SwTableConfig::ImplCommit()
{ {
switch(nProp) switch(nProp)
{ {
case 0 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(nTableHMove)); break; //"Shift/Row", case 0 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(m_nTableHMove)); break; //"Shift/Row",
case 1 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(nTableVMove)); break; //"Shift/Column", case 1 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(m_nTableVMove)); break; //"Shift/Column",
case 2 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(nTableHInsert)); break; //"Insert/Row", case 2 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(m_nTableHInsert)); break; //"Insert/Row",
case 3 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(nTableVInsert)); break; //"Insert/Column", case 3 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(m_nTableVInsert)); break; //"Insert/Column",
case 4 : pValues[nProp] <<= static_cast<sal_Int32>(eTableChgMode); break; //"Change/Effect", case 4 : pValues[nProp] <<= static_cast<sal_Int32>(m_eTableChgMode); break; //"Change/Effect",
case 5 : pValues[nProp] <<= bInsTableFormatNum; break; //"Input/NumberRecognition", case 5 : pValues[nProp] <<= m_bInsTableFormatNum; break; //"Input/NumberRecognition",
case 6 : pValues[nProp] <<= bInsTableChangeNumFormat; break; //"Input/NumberFormatRecognition", case 6 : pValues[nProp] <<= m_bInsTableChangeNumFormat; break; //"Input/NumberFormatRecognition",
case 7 : pValues[nProp] <<= bInsTableAlignNum; break; //"Input/Alignment" case 7 : pValues[nProp] <<= m_bInsTableAlignNum; break; //"Input/Alignment"
} }
} }
PutProperties(aNames, aValues); PutProperties(aNames, aValues);
...@@ -1165,14 +1165,14 @@ void SwTableConfig::Load() ...@@ -1165,14 +1165,14 @@ void SwTableConfig::Load()
sal_Int32 nTemp = 0; sal_Int32 nTemp = 0;
switch (nProp) switch (nProp)
{ {
case 0 : pValues[nProp] >>= nTemp; nTableHMove = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break; //"Shift/Row", case 0 : pValues[nProp] >>= nTemp; m_nTableHMove = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break; //"Shift/Row",
case 1 : pValues[nProp] >>= nTemp; nTableVMove = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break; //"Shift/Column", case 1 : pValues[nProp] >>= nTemp; m_nTableVMove = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break; //"Shift/Column",
case 2 : pValues[nProp] >>= nTemp; nTableHInsert = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break; //"Insert/Row", case 2 : pValues[nProp] >>= nTemp; m_nTableHInsert = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break; //"Insert/Row",
case 3 : pValues[nProp] >>= nTemp; nTableVInsert = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break; //"Insert/Column", case 3 : pValues[nProp] >>= nTemp; m_nTableVInsert = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break; //"Insert/Column",
case 4 : pValues[nProp] >>= nTemp; eTableChgMode = static_cast<TableChgMode>(nTemp); break; //"Change/Effect", case 4 : pValues[nProp] >>= nTemp; m_eTableChgMode = static_cast<TableChgMode>(nTemp); break; //"Change/Effect",
case 5 : bInsTableFormatNum = *o3tl::doAccess<bool>(pValues[nProp]); break; //"Input/NumberRecognition", case 5 : m_bInsTableFormatNum = *o3tl::doAccess<bool>(pValues[nProp]); break; //"Input/NumberRecognition",
case 6 : bInsTableChangeNumFormat = *o3tl::doAccess<bool>(pValues[nProp]); break; //"Input/NumberFormatRecognition", case 6 : m_bInsTableChangeNumFormat = *o3tl::doAccess<bool>(pValues[nProp]); break; //"Input/NumberFormatRecognition",
case 7 : bInsTableAlignNum = *o3tl::doAccess<bool>(pValues[nProp]); break; //"Input/Alignment" case 7 : m_bInsTableAlignNum = *o3tl::doAccess<bool>(pValues[nProp]); break; //"Input/Alignment"
} }
} }
} }
......
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