include/svx/optgrid.hxx | 44 ++++++++++++++--------------- sc/source/core/tool/viewopti.cxx | 26 ++++++++--------- svx/source/dialog/optgrid.cxx | 58 +++++++++++++++++++-------------------- 3 files changed, 64 insertions(+), 64 deletions(-)
New commits: commit 6ff6f7f4fc3c5b2a4a269ce9503113cbb1fdcf53 Author: Miklos Vajna <[email protected]> AuthorDate: Tue Feb 24 08:23:35 2026 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Tue Feb 24 09:41:02 2026 +0100 svx: prefix members of SvxOptionsGrid See tdf#94879 for motivation. Change-Id: I52abd8b257db4c9ef6fb39e780147ce2a6a0f1f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200139 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 6bac125d9496..c891b38e974c 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -31,32 +31,32 @@ namespace weld { class Widget; } class SVX_DLLPUBLIC SvxOptionsGrid { protected: - sal_uInt32 nFldDrawX; - sal_uInt32 nFldDivisionX; - sal_uInt32 nFldDrawY; - sal_uInt32 nFldDivisionY; - bool bUseGridsnap:1; - bool bSynchronize:1; - bool bGridVisible:1; + sal_uInt32 m_nFldDrawX; + sal_uInt32 m_nFldDivisionX; + sal_uInt32 m_nFldDrawY; + sal_uInt32 m_nFldDivisionY; + bool m_bUseGridsnap:1; + bool m_bSynchronize:1; + bool m_bGridVisible:1; public: SvxOptionsGrid(); - void SetFieldDrawX( sal_uInt32 nSet){nFldDrawX = nSet;} - void SetFieldDivisionX(sal_uInt32 nSet){nFldDivisionX = nSet;} - void SetFieldDrawY ( sal_uInt32 nSet){nFldDrawY = nSet;} - void SetFieldDivisionY(sal_uInt32 nSet){nFldDivisionY = nSet;} - void SetUseGridSnap( bool bSet ) {bUseGridsnap = bSet;} - void SetSynchronize( bool bSet ) {bSynchronize = bSet;} - void SetGridVisible( bool bSet ) {bGridVisible = bSet;} - - sal_uInt32 GetFieldDrawX( ) const { return nFldDrawX; } - sal_uInt32 GetFieldDivisionX() const { return nFldDivisionX;} - sal_uInt32 GetFieldDrawY ( ) const { return nFldDrawY; } - sal_uInt32 GetFieldDivisionY() const { return nFldDivisionY;} - bool GetUseGridSnap( ) const { return bUseGridsnap; } - bool GetSynchronize( ) const { return bSynchronize; } - bool GetGridVisible( ) const { return bGridVisible; } + void SetFieldDrawX( sal_uInt32 nSet){m_nFldDrawX = nSet;} + void SetFieldDivisionX(sal_uInt32 nSet){m_nFldDivisionX = nSet;} + void SetFieldDrawY ( sal_uInt32 nSet){m_nFldDrawY = nSet;} + void SetFieldDivisionY(sal_uInt32 nSet){m_nFldDivisionY = nSet;} + void SetUseGridSnap( bool bSet ) {m_bUseGridsnap = bSet;} + void SetSynchronize( bool bSet ) {m_bSynchronize = bSet;} + void SetGridVisible( bool bSet ) {m_bGridVisible = bSet;} + + sal_uInt32 GetFieldDrawX( ) const { return m_nFldDrawX; } + sal_uInt32 GetFieldDivisionX() const { return m_nFldDivisionX;} + sal_uInt32 GetFieldDrawY ( ) const { return m_nFldDrawY; } + sal_uInt32 GetFieldDivisionY() const { return m_nFldDivisionY;} + bool GetUseGridSnap( ) const { return m_bUseGridsnap; } + bool GetSynchronize( ) const { return m_bSynchronize; } + bool GetGridVisible( ) const { return m_bGridVisible; } }; class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index fe30f64e5096..fe048cdd5331 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -44,27 +44,27 @@ void ScGridOptions::SetDefaults() if ( ScOptionsUtil::IsMetricSystem() ) { - nFldDrawX = 1000; // 1cm - nFldDrawY = 1000; + m_nFldDrawX = 1000; // 1cm + m_nFldDrawY = 1000; } else { - nFldDrawX = 1270; // 0,5" - nFldDrawY = 1270; + m_nFldDrawX = 1270; // 0,5" + m_nFldDrawY = 1270; } - nFldDivisionX = 1; - nFldDivisionY = 1; + m_nFldDivisionX = 1; + m_nFldDivisionY = 1; } bool ScGridOptions::operator==( const ScGridOptions& rCpy ) const { - return ( nFldDrawX == rCpy.nFldDrawX - && nFldDivisionX == rCpy.nFldDivisionX - && nFldDrawY == rCpy.nFldDrawY - && nFldDivisionY == rCpy.nFldDivisionY - && bUseGridsnap == rCpy.bUseGridsnap - && bSynchronize == rCpy.bSynchronize - && bGridVisible == rCpy.bGridVisible ); + return ( m_nFldDrawX == rCpy.m_nFldDrawX + && m_nFldDivisionX == rCpy.m_nFldDivisionX + && m_nFldDrawY == rCpy.m_nFldDrawY + && m_nFldDivisionY == rCpy.m_nFldDivisionY + && m_bUseGridsnap == rCpy.m_bUseGridsnap + && m_bSynchronize == rCpy.m_bSynchronize + && m_bGridVisible == rCpy.m_bGridVisible ); } ScViewRenderingOptions::ScViewRenderingOptions() diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 72de459b22ba..2663b3e4fd15 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -58,13 +58,13 @@ static bool lcl_IsMetricSystem() } SvxOptionsGrid::SvxOptionsGrid() : - nFldDrawX ( 100 ), - nFldDivisionX ( 0 ), - nFldDrawY ( 100 ), - nFldDivisionY ( 0 ), - bUseGridsnap ( false ), - bSynchronize ( true ), - bGridVisible ( false ) + m_nFldDrawX ( 100 ), + m_nFldDivisionX ( 0 ), + m_nFldDrawY ( 100 ), + m_nFldDivisionY ( 0 ), + m_bUseGridsnap ( false ), + m_bSynchronize ( true ), + m_bGridVisible ( false ) { } @@ -79,13 +79,13 @@ bool SvxGridItem::operator==( const SfxPoolItem& rAttr ) const const SvxGridItem& rItem = static_cast<const SvxGridItem&>(rAttr); - return ( bUseGridsnap == rItem.bUseGridsnap && - bSynchronize == rItem.bSynchronize && - bGridVisible == rItem.bGridVisible && - nFldDrawX == rItem.nFldDrawX && - nFldDivisionX== rItem.nFldDivisionX&& - nFldDrawY == rItem.nFldDrawY && - nFldDivisionY== rItem.nFldDivisionY ); + return ( m_bUseGridsnap == rItem.m_bUseGridsnap && + m_bSynchronize == rItem.m_bSynchronize && + m_bGridVisible == rItem.m_bGridVisible && + m_nFldDrawX == rItem.m_nFldDrawX && + m_nFldDivisionX== rItem.m_nFldDivisionX&& + m_nFldDrawY == rItem.m_nFldDrawY && + m_nFldDivisionY== rItem.m_nFldDivisionY ); } bool SvxGridItem::GetPresentation @@ -238,18 +238,18 @@ bool SvxGridTabPage::FillItemSet( SfxItemSet* rCoreSet ) { SvxGridItem aGridItem( SID_ATTR_GRID_OPTIONS ); - aGridItem.bUseGridsnap = m_xCbxUseGridsnap->get_active(); - aGridItem.bSynchronize = m_xCbxSynchronize->get_active(); - aGridItem.bGridVisible = m_xCbxGridVisible->get_active(); + aGridItem.m_bUseGridsnap = m_xCbxUseGridsnap->get_active(); + aGridItem.m_bSynchronize = m_xCbxSynchronize->get_active(); + aGridItem.m_bGridVisible = m_xCbxGridVisible->get_active(); MapUnit eUnit = rCoreSet->GetPool()->GetMetric( SID_ATTR_GRID_OPTIONS ); tools::Long nX = GetCoreValue( *m_xMtrFldDrawX, eUnit ); tools::Long nY = GetCoreValue( *m_xMtrFldDrawY, eUnit ); - aGridItem.nFldDrawX = static_cast<sal_uInt32>(nX); - aGridItem.nFldDrawY = static_cast<sal_uInt32>(nY); - aGridItem.nFldDivisionX = static_cast<tools::Long>(m_xNumFldDivisionX->get_value() - 1); - aGridItem.nFldDivisionY = static_cast<tools::Long>(m_xNumFldDivisionY->get_value() - 1); + aGridItem.m_nFldDrawX = static_cast<sal_uInt32>(nX); + aGridItem.m_nFldDrawY = static_cast<sal_uInt32>(nY); + aGridItem.m_nFldDivisionX = static_cast<tools::Long>(m_xNumFldDivisionX->get_value() - 1); + aGridItem.m_nFldDivisionY = static_cast<tools::Long>(m_xNumFldDivisionY->get_value() - 1); rCoreSet->Put( aGridItem ); } @@ -273,7 +273,7 @@ void SvxGridTabPage::Reset( const SfxItemSet* rSet ) default: break; } - m_xCbxUseGridsnap->set_active(pGridAttr->bUseGridsnap); + m_xCbxUseGridsnap->set_active(pGridAttr->m_bUseGridsnap); m_xCbxUseGridsnap->set_sensitive(!bReadOnly); m_xCbxUseGridsnapImg->set_visible(bReadOnly); @@ -287,7 +287,7 @@ void SvxGridTabPage::Reset( const SfxItemSet* rSet ) default: break; } - m_xCbxSynchronize->set_active(pGridAttr->bSynchronize); + m_xCbxSynchronize->set_active(pGridAttr->m_bSynchronize); m_xCbxSynchronize->set_sensitive(!bReadOnly); m_xCbxSynchronizeImg->set_visible(bReadOnly); @@ -301,13 +301,13 @@ void SvxGridTabPage::Reset( const SfxItemSet* rSet ) default: break; } - m_xCbxGridVisible->set_active(pGridAttr->bGridVisible); + m_xCbxGridVisible->set_active(pGridAttr->m_bGridVisible); m_xCbxGridVisible->set_sensitive(!bReadOnly); m_xCbxGridVisibleImg->set_visible(bReadOnly); MapUnit eUnit = rSet->GetPool()->GetMetric( SID_ATTR_GRID_OPTIONS ); - SetMetricValue( *m_xMtrFldDrawX , pGridAttr->nFldDrawX, eUnit ); - SetMetricValue( *m_xMtrFldDrawY , pGridAttr->nFldDrawY, eUnit ); + SetMetricValue( *m_xMtrFldDrawX , pGridAttr->m_nFldDrawX, eUnit ); + SetMetricValue( *m_xMtrFldDrawY , pGridAttr->m_nFldDrawY, eUnit ); switch (m_Emode) { @@ -377,8 +377,8 @@ void SvxGridTabPage::Reset( const SfxItemSet* rSet ) m_xMtrFldDrawY->set_sensitive(!bReadOnly); m_xMtrFldDrawYImg->set_visible(bReadOnly); - m_xNumFldDivisionX->set_value(pGridAttr->nFldDivisionX + 1); - m_xNumFldDivisionY->set_value(pGridAttr->nFldDivisionY + 1); + m_xNumFldDivisionX->set_value(pGridAttr->m_nFldDivisionX + 1); + m_xNumFldDivisionY->set_value(pGridAttr->m_nFldDivisionY + 1); switch (m_Emode) { @@ -417,7 +417,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) const SvxGridItem* pGridAttr = nullptr; if( (pGridAttr = rSet.GetItemIfSet( SID_ATTR_GRID_OPTIONS , false )) ) { - m_xCbxUseGridsnap->set_active(pGridAttr->bUseGridsnap); + m_xCbxUseGridsnap->set_active(pGridAttr->m_bUseGridsnap); ChangeGridsnapHdl_Impl(*m_xCbxUseGridsnap); }
