include/svx/optgrid.hxx | 3 -- officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 8 ------ officecfg/registry/schema/org/openoffice/Office/Draw.xcs | 13 ----------- officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 13 ----------- sc/source/core/tool/viewopti.cxx | 14 +----------- sd/source/ui/app/optsitem.cxx | 5 ---- sd/source/ui/inc/optsitem.hxx | 2 - svx/source/dialog/optgrid.cxx | 4 --- 8 files changed, 3 insertions(+), 59 deletions(-)
New commits: commit 861614d7530add1a9ff4d0ea5b2c67eda2b31073 Author: Gabor Kelemen <[email protected]> AuthorDate: Sat Oct 4 11:14:32 2025 +0200 Commit: Gabor Kelemen <[email protected]> CommitDate: Sat Nov 8 22:00:30 2025 +0100 [API CHANGE] Remove SnapGrid groups and SizeToGrid option in Impress/Draw and Calc respectively. org.openoffice.Office.Calc/Grid/Option/SizeToGrid org.openoffice.Office.Draw/Grid/SnapGrid/Size org.openoffice.Office.Impress/Grid/SnapGrid/Size Seems like ever since "initial import" these were doing nothing useful. Change-Id: I5cf6bb7e4c4f91e57b6dba3c9ad7e7774f05e87b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191852 Reviewed-by: Gabor Kelemen <[email protected]> Tested-by: Jenkins diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 73eeeaa55c7d..d6dc7310def2 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -38,7 +38,6 @@ protected: bool bUseGridsnap:1; bool bSynchronize:1; bool bGridVisible:1; - bool bEqualGrid: 1; public: SvxOptionsGrid(); @@ -50,7 +49,6 @@ public: void SetUseGridSnap( bool bSet ) {bUseGridsnap = bSet;} void SetSynchronize( bool bSet ) {bSynchronize = bSet;} void SetGridVisible( bool bSet ) {bGridVisible = bSet;} - void SetEqualGrid( bool bSet ) {bEqualGrid = bSet;} sal_uInt32 GetFieldDrawX( ) const { return nFldDrawX; } sal_uInt32 GetFieldDivisionX() const { return nFldDivisionX;} @@ -59,7 +57,6 @@ public: bool GetUseGridSnap( ) const { return bUseGridsnap; } bool GetSynchronize( ) const { return bSynchronize; } bool GetGridVisible( ) const { return bGridVisible; } - bool GetEqualGrid() const { return bEqualGrid; } }; class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 25b272f35c64..80e79448d344 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -809,14 +809,6 @@ </info> <value>false</value> </prop> - <prop oor:name="SizeToGrid" oor:type="xs:boolean" oor:nillable="false"> - <!-- UIHints: Tools Options Spreadsheet Grid - [Section] Snap grid --> - <info> - <desc>Specifies whether the snap grid is matched with the main grid.</desc> - <label>Size to grid</label> - </info> - <value>true</value> - </prop> <prop oor:name="VisibleGrid" oor:type="xs:boolean" oor:nillable="false"> <!-- UIHints: Tools - Options Spreadsheet Grid - [Section] Options --> <info> diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs index fb9da1bdf4a7..04bb62c04548 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs @@ -697,19 +697,6 @@ <value>3</value> </prop> </group> - <group oor:name="SnapGrid"> - <info> - <desc>Specifies the snap grid.</desc> - </info> - <prop oor:name="Size" oor:type="xs:boolean" oor:nillable="false"> - <!-- UIHints: Tools - Options - Draw - Grid - [Section] Snap grid --> - <info> - <desc>Indicates whether to synchronize grid and snap-grid.</desc> - <label>Size to grid</label> - </info> - <value>true</value> - </prop> - </group> </group> <group oor:name="Print"> <info> diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs index c4de6da82393..ead87b0fe4a1 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs @@ -933,19 +933,6 @@ <value>3</value> </prop> </group> - <group oor:name="SnapGrid"> - <info> - <desc>Contains the specifications of the snap grid.</desc> - </info> - <prop oor:name="Size" oor:type="xs:boolean" oor:nillable="false"> - <!-- UIHints: Tools - Options - Impress - Grid - [Section] Snap grid --> - <info> - <desc>Indicates whether to synchronize grid and snap-grid.</desc> - <label>Size to grid</label> - </info> - <value>true</value> - </prop> - </group> </group> <group oor:name="Print"> <info> diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index a8841642f926..fe30f64e5096 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -64,8 +64,7 @@ bool ScGridOptions::operator==( const ScGridOptions& rCpy ) const && nFldDivisionY == rCpy.nFldDivisionY && bUseGridsnap == rCpy.bUseGridsnap && bSynchronize == rCpy.bSynchronize - && bGridVisible == rCpy.bGridVisible - && bEqualGrid == rCpy.bEqualGrid ); + && bGridVisible == rCpy.bGridVisible ); } ScViewRenderingOptions::ScViewRenderingOptions() @@ -161,7 +160,6 @@ std::unique_ptr<SvxGridItem> ScViewOptions::CreateGridItem() const pItem->SetUseGridSnap ( aGridOpt.GetUseGridSnap() ); pItem->SetSynchronize ( aGridOpt.GetSynchronize() ); pItem->SetGridVisible ( aGridOpt.GetGridVisible() ); - pItem->SetEqualGrid ( aGridOpt.GetEqualGrid() ); return pItem; } @@ -231,7 +229,6 @@ constexpr OUStringLiteral CFGPATH_GRID = u"Office.Calc/Grid"; #define SCGRIDOPT_SNAPTOGRID 4 #define SCGRIDOPT_SYNCHRON 5 #define SCGRIDOPT_VISIBLE 6 -#define SCGRIDOPT_SIZETOGRID 7 Sequence<OUString> ScViewCfg::GetLayoutPropertyNames() { @@ -275,8 +272,7 @@ Sequence<OUString> ScViewCfg::GetGridPropertyNames() u"Subdivision/YAxis"_ustr, // SCGRIDOPT_SUBDIV_Y u"Option/SnapToGrid"_ustr, // SCGRIDOPT_SNAPTOGRID u"Option/Synchronize"_ustr, // SCGRIDOPT_SYNCHRON - u"Option/VisibleGrid"_ustr, // SCGRIDOPT_VISIBLE - u"Option/SizeToGrid"_ustr}; // SCGRIDOPT_SIZETOGRID; + u"Option/VisibleGrid"_ustr}; // SCGRIDOPT_VISIBLE } ScViewCfg::ScViewCfg() : @@ -568,9 +564,6 @@ void ScViewCfg::ReadGridCfg() case SCGRIDOPT_VISIBLE: aGrid.SetGridVisible( ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; - case SCGRIDOPT_SIZETOGRID: - aGrid.SetEqualGrid( ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); - break; } } } @@ -616,9 +609,6 @@ IMPL_LINK_NOARG(ScViewCfg, GridCommitHdl, ScLinkConfigItem&, void) case SCGRIDOPT_VISIBLE: pValues[nProp] <<= rGrid.GetGridVisible(); break; - case SCGRIDOPT_SIZETOGRID: - pValues[nProp] <<= rGrid.GetEqualGrid(); - break; } } aGridItem.PutProperties(aNames, aValues); diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 429227253bac..8bbee5825330 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -527,7 +527,6 @@ void SdOptionsGrid::SetDefaults() SetUseGridSnap( false ); SetSynchronize( true ); SetGridVisible( false ); - SetEqualGrid( true ); } void SdOptionsGrid::GetPropNameArray( const char* const*& ppNames, sal_uLong& rCount ) const @@ -590,7 +589,6 @@ bool SdOptionsGrid::ReadData( const Any* pValues ) if( pValues[4].hasValue() ) SetUseGridSnap( *o3tl::doAccess<bool>(pValues[ 4 ]) ); if( pValues[5].hasValue() ) SetSynchronize( *o3tl::doAccess<bool>(pValues[ 5 ]) ); if( pValues[6].hasValue() ) SetGridVisible( *o3tl::doAccess<bool>(pValues[ 6 ]) ); - if( pValues[7].hasValue() ) SetEqualGrid( *o3tl::doAccess<bool>(pValues[ 7 ]) ); return true; } @@ -604,7 +602,6 @@ bool SdOptionsGrid::WriteData( Any* pValues ) const pValues[ 4 ] <<= IsUseGridSnap(); pValues[ 5 ] <<= IsSynchronize(); pValues[ 6 ] <<= IsGridVisible(); - pValues[ 7 ] <<= IsEqualGrid(); return true; } @@ -619,7 +616,6 @@ SdOptionsGridItem::SdOptionsGridItem( SdOptions const * pOpts ) : SvxGridItem( SID_ATTR_GRID_OPTIONS ) { SetSynchronize( pOpts->IsSynchronize() ); - SetEqualGrid( pOpts->IsEqualGrid() ); SetFieldDrawX( pOpts->GetFieldDrawX() ); SetFieldDrawY( pOpts->GetFieldDrawY() ); @@ -638,7 +634,6 @@ void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const pOpts->SetUseGridSnap( GetUseGridSnap() ); pOpts->SetSynchronize( GetSynchronize() ); pOpts->SetGridVisible( GetGridVisible() ); - pOpts->SetEqualGrid( GetEqualGrid() ); } /************************************************************************* diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index e865979f96b4..f19721c0988d 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -277,7 +277,6 @@ public: bool IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); } bool IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); } bool IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); } - bool IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); } void SetFieldDrawX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDrawX( nSet ); } } void SetFieldDivisionX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDivisionX( nSet ); } } @@ -286,7 +285,6 @@ public: void SetUseGridSnap( bool bSet ) { if( bSet != SvxOptionsGrid::GetUseGridSnap() ) { OptionsChanged(); SvxOptionsGrid::SetUseGridSnap( bSet ); } } void SetSynchronize( bool bSet ) { if( bSet != SvxOptionsGrid::GetSynchronize() ) { OptionsChanged(); SvxOptionsGrid::SetSynchronize( bSet ); } } void SetGridVisible( bool bSet ) { if( bSet != SvxOptionsGrid::GetGridVisible() ) { OptionsChanged(); SvxOptionsGrid::SetGridVisible( bSet ); } } - void SetEqualGrid( bool bSet ) { if( bSet != SvxOptionsGrid::GetEqualGrid() ) { OptionsChanged(); SvxOptionsGrid::SetEqualGrid( bSet ); } } }; class SdOptionsGridItem final : public SvxGridItem diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index afdeef1a59a0..3d3c07453824 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -61,8 +61,7 @@ SvxOptionsGrid::SvxOptionsGrid() : nFldDivisionY ( 0 ), bUseGridsnap ( false ), bSynchronize ( true ), - bGridVisible ( false ), - bEqualGrid ( true ) + bGridVisible ( false ) { } @@ -80,7 +79,6 @@ bool SvxGridItem::operator==( const SfxPoolItem& rAttr ) const return ( bUseGridsnap == rItem.bUseGridsnap && bSynchronize == rItem.bSynchronize && bGridVisible == rItem.bGridVisible && - bEqualGrid == rItem.bEqualGrid && nFldDrawX == rItem.nFldDrawX && nFldDivisionX== rItem.nFldDivisionX&& nFldDrawY == rItem.nFldDrawY &&
