[Libreoffice-commits] core.git: sw/source
Miklos Vajna (via logerrit)
logerrit at kemper.freedesktop.org
Mon Oct 7 07:25:15 UTC 2019
sw/source/ui/config/optpage.cxx | 48 ++++++++---------
sw/source/uibase/config/cfgitems.cxx | 98 +++++++++++++++++------------------
sw/source/uibase/inc/cfgitems.hxx | 24 ++++----
3 files changed, 85 insertions(+), 85 deletions(-)
New commits:
commit a4b255ecdaba4c13933dfd3558f3cf7dab5ec0e5
Author: Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon Oct 7 08:40:05 2019 +0200
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Oct 7 09:24:40 2019 +0200
sw: prefix members of SwElemItem
See tdf#94879 for motivation.
Change-Id: I54473674ff0e8928249059efdfb06f90ab7d2ad1
Reviewed-on: https://gerrit.libreoffice.org/80331
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 8e891fc49281..a980c99c737e 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -202,18 +202,18 @@ void SwContentOptPage::Reset(const SfxItemSet* rSet)
reinterpret_cast<const SfxPoolItem**>(&pElemAttr) );
if(pElemAttr)
{
- m_xTableCB->set_active(pElemAttr->bTable);
- m_xGrfCB->set_active(pElemAttr->bGraphic);
- m_xDrwCB->set_active(pElemAttr->bDrawing);
- m_xFieldNameCB->set_active(pElemAttr->bFieldName);
- m_xPostItCB->set_active(pElemAttr->bNotes);
- m_xCrossCB->set_active(pElemAttr->bCrosshair);
- m_xVRulerCBox->set_active(pElemAttr->bVertRuler);
- m_xVRulerRightCBox->set_active(pElemAttr->bVertRulerRight);
- m_xSmoothCBox->set_active(pElemAttr->bSmoothScroll);
- m_xShowInlineTooltips->set_active(pElemAttr->bShowInlineTooltips);
- m_xFieldHiddenCB->set_active( pElemAttr->bFieldHiddenText );
- m_xFieldHiddenParaCB->set_active( pElemAttr->bShowHiddenPara );
+ m_xTableCB->set_active(pElemAttr->m_bTable);
+ m_xGrfCB->set_active(pElemAttr->m_bGraphic);
+ m_xDrwCB->set_active(pElemAttr->m_bDrawing);
+ m_xFieldNameCB->set_active(pElemAttr->m_bFieldName);
+ m_xPostItCB->set_active(pElemAttr->m_bNotes);
+ m_xCrossCB->set_active(pElemAttr->m_bCrosshair);
+ m_xVRulerCBox->set_active(pElemAttr->m_bVertRuler);
+ m_xVRulerRightCBox->set_active(pElemAttr->m_bVertRulerRight);
+ m_xSmoothCBox->set_active(pElemAttr->m_bSmoothScroll);
+ m_xShowInlineTooltips->set_active(pElemAttr->m_bShowInlineTooltips);
+ m_xFieldHiddenCB->set_active( pElemAttr->m_bFieldHiddenText );
+ m_xFieldHiddenParaCB->set_active( pElemAttr->m_bShowHiddenPara );
}
m_xMetricLB->set_active(-1);
lcl_SelectMetricLB(*m_xMetricLB, SID_ATTR_METRIC, *rSet);
@@ -227,18 +227,18 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet)
GetOldItem(GetItemSet(), FN_PARAM_ELEM));
SwElemItem aElem;
- aElem.bTable = m_xTableCB->get_active();
- aElem.bGraphic = m_xGrfCB->get_active();
- aElem.bDrawing = m_xDrwCB->get_active();
- aElem.bFieldName = m_xFieldNameCB->get_active();
- aElem.bNotes = m_xPostItCB->get_active();
- aElem.bCrosshair = m_xCrossCB->get_active();
- aElem.bVertRuler = m_xVRulerCBox->get_active();
- aElem.bVertRulerRight = m_xVRulerRightCBox->get_active();
- aElem.bSmoothScroll = m_xSmoothCBox->get_active();
- aElem.bShowInlineTooltips = m_xShowInlineTooltips->get_active();
- aElem.bFieldHiddenText = m_xFieldHiddenCB->get_active();
- aElem.bShowHiddenPara = m_xFieldHiddenParaCB->get_active();
+ aElem.m_bTable = m_xTableCB->get_active();
+ aElem.m_bGraphic = m_xGrfCB->get_active();
+ aElem.m_bDrawing = m_xDrwCB->get_active();
+ aElem.m_bFieldName = m_xFieldNameCB->get_active();
+ aElem.m_bNotes = m_xPostItCB->get_active();
+ aElem.m_bCrosshair = m_xCrossCB->get_active();
+ aElem.m_bVertRuler = m_xVRulerCBox->get_active();
+ aElem.m_bVertRulerRight = m_xVRulerRightCBox->get_active();
+ aElem.m_bSmoothScroll = m_xSmoothCBox->get_active();
+ aElem.m_bShowInlineTooltips = m_xShowInlineTooltips->get_active();
+ aElem.m_bFieldHiddenText = m_xFieldHiddenCB->get_active();
+ aElem.m_bShowHiddenPara = m_xFieldHiddenParaCB->get_active();
bool bRet = !pOldAttr || aElem != *pOldAttr;
if(bRet)
diff --git a/sw/source/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx
index 8846665ba6f9..ddfb56702084 100644
--- a/sw/source/uibase/config/cfgitems.cxx
+++ b/sw/source/uibase/config/cfgitems.cxx
@@ -89,35 +89,35 @@ void SwDocDisplayItem::FillViewOptions( SwViewOption& rVOpt) const
SwElemItem::SwElemItem() :
SfxPoolItem(FN_PARAM_ELEM)
{
- bVertRuler =
- bVertRulerRight=
- bCrosshair =
- bSmoothScroll =
- bTable =
- bGraphic =
- bDrawing =
- bFieldName =
- bNotes = false;
- bShowInlineTooltips = true;
- bFieldHiddenText =
- bShowHiddenPara = false;
+ m_bVertRuler =
+ m_bVertRulerRight=
+ m_bCrosshair =
+ m_bSmoothScroll =
+ m_bTable =
+ m_bGraphic =
+ m_bDrawing =
+ m_bFieldName =
+ m_bNotes = false;
+ m_bShowInlineTooltips = true;
+ m_bFieldHiddenText =
+ m_bShowHiddenPara = false;
}
SwElemItem::SwElemItem(const SwViewOption& rVOpt) :
SfxPoolItem( FN_PARAM_ELEM )
{
- bVertRuler = rVOpt.IsViewVRuler(true);
- bVertRulerRight = rVOpt.IsVRulerRight();
- bCrosshair = rVOpt.IsCrossHair();
- bSmoothScroll = rVOpt.IsSmoothScroll();
- bTable = rVOpt.IsTable();
- bGraphic = rVOpt.IsGraphic();
- bDrawing = rVOpt.IsDraw() && rVOpt.IsControl();
- bFieldName = rVOpt.IsFieldName();
- bNotes = rVOpt.IsPostIts();
- bShowInlineTooltips = rVOpt.IsShowInlineTooltips();
- bFieldHiddenText = rVOpt.IsShowHiddenField();
- bShowHiddenPara = rVOpt.IsShowHiddenPara();
+ m_bVertRuler = rVOpt.IsViewVRuler(true);
+ m_bVertRulerRight = rVOpt.IsVRulerRight();
+ m_bCrosshair = rVOpt.IsCrossHair();
+ m_bSmoothScroll = rVOpt.IsSmoothScroll();
+ m_bTable = rVOpt.IsTable();
+ m_bGraphic = rVOpt.IsGraphic();
+ m_bDrawing = rVOpt.IsDraw() && rVOpt.IsControl();
+ m_bFieldName = rVOpt.IsFieldName();
+ m_bNotes = rVOpt.IsPostIts();
+ m_bShowInlineTooltips = rVOpt.IsShowInlineTooltips();
+ m_bFieldHiddenText = rVOpt.IsShowHiddenField();
+ m_bShowHiddenPara = rVOpt.IsShowHiddenPara();
}
SfxPoolItem* SwElemItem::Clone( SfxItemPool* ) const
@@ -131,35 +131,35 @@ bool SwElemItem::operator==( const SfxPoolItem& rAttr ) const
const SwElemItem& rItem = static_cast<const SwElemItem&>(rAttr);
- return ( bVertRuler == rItem.bVertRuler &&
- bVertRulerRight == rItem.bVertRulerRight&&
- bCrosshair == rItem.bCrosshair &&
- bSmoothScroll == rItem.bSmoothScroll &&
- bTable == rItem.bTable &&
- bGraphic == rItem.bGraphic &&
- bDrawing == rItem.bDrawing &&
- bFieldName == rItem.bFieldName &&
- bNotes == rItem.bNotes &&
- bShowInlineTooltips == rItem.bShowInlineTooltips &&
- bFieldHiddenText == rItem.bFieldHiddenText &&
- bShowHiddenPara == rItem.bShowHiddenPara);
+ return ( m_bVertRuler == rItem.m_bVertRuler &&
+ m_bVertRulerRight == rItem.m_bVertRulerRight&&
+ m_bCrosshair == rItem.m_bCrosshair &&
+ m_bSmoothScroll == rItem.m_bSmoothScroll &&
+ m_bTable == rItem.m_bTable &&
+ m_bGraphic == rItem.m_bGraphic &&
+ m_bDrawing == rItem.m_bDrawing &&
+ m_bFieldName == rItem.m_bFieldName &&
+ m_bNotes == rItem.m_bNotes &&
+ m_bShowInlineTooltips == rItem.m_bShowInlineTooltips &&
+ m_bFieldHiddenText == rItem.m_bFieldHiddenText &&
+ m_bShowHiddenPara == rItem.m_bShowHiddenPara);
}
void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const
{
- rVOpt.SetViewVRuler(bVertRuler );
- rVOpt.SetVRulerRight(bVertRulerRight );
- rVOpt.SetCrossHair(bCrosshair );
- rVOpt.SetSmoothScroll(bSmoothScroll);
- rVOpt.SetTable (bTable );
- rVOpt.SetGraphic (bGraphic );
- rVOpt.SetDraw (bDrawing );
- rVOpt.SetControl (bDrawing );
- rVOpt.SetFieldName (bFieldName );
- rVOpt.SetPostIts (bNotes );
- rVOpt.SetShowInlineTooltips( bShowInlineTooltips );
- rVOpt.SetShowHiddenField(bFieldHiddenText );
- rVOpt.SetShowHiddenPara(bShowHiddenPara );
+ rVOpt.SetViewVRuler(m_bVertRuler );
+ rVOpt.SetVRulerRight(m_bVertRulerRight );
+ rVOpt.SetCrossHair(m_bCrosshair );
+ rVOpt.SetSmoothScroll(m_bSmoothScroll);
+ rVOpt.SetTable (m_bTable );
+ rVOpt.SetGraphic (m_bGraphic );
+ rVOpt.SetDraw (m_bDrawing );
+ rVOpt.SetControl (m_bDrawing );
+ rVOpt.SetFieldName (m_bFieldName );
+ rVOpt.SetPostIts (m_bNotes );
+ rVOpt.SetShowInlineTooltips( m_bShowInlineTooltips );
+ rVOpt.SetShowHiddenField(m_bFieldHiddenText );
+ rVOpt.SetShowHiddenPara(m_bShowHiddenPara );
}
// CTOR for empty Item
diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx
index a31dd2b8066d..7b43b95e0b6e 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -65,20 +65,20 @@ public:
class SW_DLLPUBLIC SwElemItem : public SfxPoolItem
{
//view
- bool bVertRuler :1;
- bool bVertRulerRight:1;
- bool bSmoothScroll :1;
+ bool m_bVertRuler :1;
+ bool m_bVertRulerRight:1;
+ bool m_bSmoothScroll :1;
//visual aids
- bool bCrosshair :1;
+ bool m_bCrosshair :1;
//display
- bool bTable :1;
- bool bGraphic :1;
- bool bDrawing :1;
- bool bFieldName :1;
- bool bNotes :1;
- bool bShowInlineTooltips :1;
- bool bFieldHiddenText :1;
- bool bShowHiddenPara :1;
+ bool m_bTable :1;
+ bool m_bGraphic :1;
+ bool m_bDrawing :1;
+ bool m_bFieldName :1;
+ bool m_bNotes :1;
+ bool m_bShowInlineTooltips :1;
+ bool m_bFieldHiddenText :1;
+ bool m_bShowHiddenPara :1;
friend class SwContentOptPage;
More information about the Libreoffice-commits
mailing list