sw/source/ui/config/optpage.cxx | 40 +++++++++++++++++------------------
sw/source/uibase/config/cfgitems.cxx | 20 ++++++++---------
sw/source/uibase/inc/cfgitems.hxx | 21 ++++++++----------
3 files changed, 40 insertions(+), 41 deletions(-)
New commits:
commit 2d8efd1afe03a4009600e914910144b70982e98d
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Oct 28 09:13:49 2019 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Oct 28 09:53:04 2019 +0100
sw: prefix members of SwTestItem
See tdf#94879 for motivation.
Change-Id: Iddabca468db597791e11ff3ad4be68e14efc6680
Reviewed-on: https://gerrit.libreoffice.org/81583
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 1126ec8d478c..7e49ff3dc2a9 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -2170,16 +2170,16 @@ bool SwTestTabPage::FillItemSet( SfxItemSet*
rCoreSet )
if ( bAttrModified )
{
SwTestItem aTestItem;
- aTestItem.bTest1=m_xTest1CBox->get_active();
- aTestItem.bTest2=m_xTest2CBox->get_active();
- aTestItem.bTest3=m_xTest3CBox->get_active();
- aTestItem.bTest4=m_xTest4CBox->get_active();
- aTestItem.bTest5=m_xTest5CBox->get_active();
- aTestItem.bTest6=m_xTest6CBox->get_active();
- aTestItem.bTest7=m_xTest7CBox->get_active();
- aTestItem.bTest8=m_xTest8CBox->get_active();
- aTestItem.bTest9=m_xTest9CBox->get_active();
- aTestItem.bTest10=m_xTest10CBox->get_active();
+ aTestItem.m_bTest1=m_xTest1CBox->get_active();
+ aTestItem.m_bTest2=m_xTest2CBox->get_active();
+ aTestItem.m_bTest3=m_xTest3CBox->get_active();
+ aTestItem.m_bTest4=m_xTest4CBox->get_active();
+ aTestItem.m_bTest5=m_xTest5CBox->get_active();
+ aTestItem.m_bTest6=m_xTest6CBox->get_active();
+ aTestItem.m_bTest7=m_xTest7CBox->get_active();
+ aTestItem.m_bTest8=m_xTest8CBox->get_active();
+ aTestItem.m_bTest9=m_xTest9CBox->get_active();
+ aTestItem.m_bTest10=m_xTest10CBox->get_active();
rCoreSet->Put(aTestItem);
}
return bAttrModified;
@@ -2193,16 +2193,16 @@ void SwTestTabPage::Reset( const SfxItemSet* )
if( SfxItemState::SET == rSet.GetItemState( FN_PARAM_SWTEST , false,
reinterpret_cast<const
SfxPoolItem**>(&pTestAttr) ))
{
- m_xTest1CBox->set_active(pTestAttr->bTest1);
- m_xTest2CBox->set_active(pTestAttr->bTest2);
- m_xTest3CBox->set_active(pTestAttr->bTest3);
- m_xTest4CBox->set_active(pTestAttr->bTest4);
- m_xTest5CBox->set_active(pTestAttr->bTest5);
- m_xTest6CBox->set_active(pTestAttr->bTest6);
- m_xTest7CBox->set_active(pTestAttr->bTest7);
- m_xTest8CBox->set_active(pTestAttr->bTest8);
- m_xTest9CBox->set_active(pTestAttr->bTest9);
- m_xTest10CBox->set_active(pTestAttr->bTest10);
+ m_xTest1CBox->set_active(pTestAttr->m_bTest1);
+ m_xTest2CBox->set_active(pTestAttr->m_bTest2);
+ m_xTest3CBox->set_active(pTestAttr->m_bTest3);
+ m_xTest4CBox->set_active(pTestAttr->m_bTest4);
+ m_xTest5CBox->set_active(pTestAttr->m_bTest5);
+ m_xTest6CBox->set_active(pTestAttr->m_bTest6);
+ m_xTest7CBox->set_active(pTestAttr->m_bTest7);
+ m_xTest8CBox->set_active(pTestAttr->m_bTest8);
+ m_xTest9CBox->set_active(pTestAttr->m_bTest9);
+ m_xTest10CBox->set_active(pTestAttr->m_bTest10);
}
}
diff --git a/sw/source/uibase/config/cfgitems.cxx
b/sw/source/uibase/config/cfgitems.cxx
index ddfb56702084..3c6114c9a9a6 100644
--- a/sw/source/uibase/config/cfgitems.cxx
+++ b/sw/source/uibase/config/cfgitems.cxx
@@ -235,16 +235,16 @@ bool SwTestItem::operator==( const SfxPoolItem& rAttr )
const
const SwTestItem& rItem = static_cast<const SwTestItem&>( rAttr);
- return ( bTest1==rItem.bTest1&&
- bTest2==rItem.bTest2&&
- bTest3==rItem.bTest3&&
- bTest4==rItem.bTest4&&
- bTest5==rItem.bTest5&&
- bTest6==rItem.bTest6&&
- bTest7==rItem.bTest7&&
- bTest8==rItem.bTest8&&
- bTest9==rItem.bTest9&&
- bTest10==rItem.bTest10);
+ return ( m_bTest1==rItem.m_bTest1&&
+ m_bTest2==rItem.m_bTest2&&
+ m_bTest3==rItem.m_bTest3&&
+ m_bTest4==rItem.m_bTest4&&
+ m_bTest5==rItem.m_bTest5&&
+ m_bTest6==rItem.m_bTest6&&
+ m_bTest7==rItem.m_bTest7&&
+ m_bTest8==rItem.m_bTest8&&
+ m_bTest9==rItem.m_bTest9&&
+ m_bTest10==rItem.m_bTest10);
}
#endif
diff --git a/sw/source/uibase/inc/cfgitems.hxx
b/sw/source/uibase/inc/cfgitems.hxx
index 7b43b95e0b6e..db525151a079 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -135,23 +135,22 @@ public:
#ifdef DBG_UTIL
-// OS 12.01.95
// Item for settings dialog - test settings
class SW_DLLPUBLIC SwTestItem : public SfxPoolItem
{
friend class SwModule;
friend class SwTestTabPage;
- bool bTest1:1;
- bool bTest2:1;
- bool bTest3:1;
- bool bTest4:1;
- bool bTest5:1;
- bool bTest6:1;
- bool bTest7:1;
- bool bTest8:1;
- bool bTest9:1;
- bool bTest10:1;
+ bool m_bTest1:1;
+ bool m_bTest2:1;
+ bool m_bTest3:1;
+ bool m_bTest4:1;
+ bool m_bTest5:1;
+ bool m_bTest6:1;
+ bool m_bTest7:1;
+ bool m_bTest8:1;
+ bool m_bTest9:1;
+ bool m_bTest10:1;
public:
SwTestItem() : SfxPoolItem(FN_PARAM_SWTEST) {};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
