bin/find-can-be-private-symbols.functions.results | 5 compilerplugins/clang/unusedmethods.results | 2 sd/inc/sdattr.hrc | 2 sd/source/ui/app/optsitem.cxx | 161 ---------------------- sd/source/ui/app/sdmod2.cxx | 9 - sd/source/ui/inc/optsitem.hxx | 59 -------- 6 files changed, 2 insertions(+), 236 deletions(-)
New commits: commit 9921b0b99aae17e15eb5daf56f0c3125f725a547 Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de> AuthorDate: Wed Apr 24 17:49:35 2024 +0200 Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de> CommitDate: Sat May 11 09:01:58 2024 +0200 Drop now unused SdOptionsLayout, SdOptionsLayoutItem classes Change-Id: I5d4e77f8377eead4581f590a4cc160a3fa97e2a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166601 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de> diff --git a/bin/find-can-be-private-symbols.functions.results b/bin/find-can-be-private-symbols.functions.results index dd3bb5ba4b4c..332b99ad4cd3 100644 --- a/bin/find-can-be-private-symbols.functions.results +++ b/bin/find-can-be-private-symbols.functions.results @@ -2724,11 +2724,6 @@ SdOptionsLayout::ReadData(com::sun::star::uno::Any const*) SdOptionsLayout::SdOptionsLayout(bool, bool) SdOptionsLayout::WriteData(com::sun::star::uno::Any*) const SdOptionsLayout::operator==(SdOptionsLayout const&) const -SdOptionsLayoutItem::Clone(SfxItemPool*) const -SdOptionsLayoutItem::SdOptionsLayoutItem() -SdOptionsLayoutItem::SdOptionsLayoutItem(SdOptions const*, sd::FrameView const*) -SdOptionsLayoutItem::SetOptions(SdOptions*) const -SdOptionsLayoutItem::operator==(SfxPoolItem const&) const SdOptionsMisc::GetDisplay() const SdOptionsMisc::GetDragThresholdPixels() const SdOptionsMisc::GetPropNameArray(char const**&, unsigned long&) const diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index be4adf18f3be..8fe388967ee5 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -1234,8 +1234,6 @@ include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScVerticalStackCell, derived_type>, int>::type) include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<ScViewObjectModeItem, derived_type>, int>::type) -include/svl/typedwhich.hxx:31 - TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdOptionsLayoutItem, derived_type>, int>::type) include/svl/typedwhich.hxx:31 TypedWhichId::TypedWhichId(TypedWhichId<type-parameter-?-?>,typename enable_if<std::is_base_of_v<SdOptionsMiscItem, derived_type>, int>::type) include/svl/typedwhich.hxx:31 diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc index 409838dea996..35f53e47ca9d 100644 --- a/sd/inc/sdattr.hrc +++ b/sd/inc/sdattr.hrc @@ -100,7 +100,7 @@ class XColorItem; #define ATTR_SNAPLINE_END ATTR_SNAPLINE_Y #define ATTR_OPTIONS_START ATTR_SNAPLINE_END + 1 -#define ATTR_OPTIONS_LAYOUT TypedWhichId<SdOptionsLayoutItem>(ATTR_OPTIONS_START + 1) +#define ATTR_OPTIONS_LAYOUT ATTR_OPTIONS_START + 1 #define ATTR_OPTIONS_MISC TypedWhichId<SdOptionsMiscItem>(ATTR_OPTIONS_START + 2) #define ATTR_OPTIONS_SNAP TypedWhichId<SdOptionsSnapItem>(ATTR_OPTIONS_START + 3) #define ATTR_OPTIONS_PRINT TypedWhichId<SdOptionsPrintItem>(ATTR_OPTIONS_START + 4) diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 5f93655f1fb1..2ad6448099fc 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -177,165 +177,6 @@ bool SdOptionsGeneric::isMetricSystem() return ( eSys == MeasurementSystem::Metric ); } -/************************************************************************* -|* -|* SdOptionsLayout -|* -\************************************************************************/ - -SdOptionsLayout::SdOptionsLayout(bool bImpress, bool bUseConfig) : - SdOptionsGeneric( bImpress, bUseConfig ? - ( bImpress ? - OUString( "Office.Impress/Layout" ) : - OUString( "Office.Draw/Layout" ) ) : - OUString() ), - bRuler( true ), - bMoveOutline( true ), - bDragStripes( false ), - bHandlesBezier( false ), - bHelplines( true ), - nMetric(static_cast<sal_uInt16>(isMetricSystem() ? FieldUnit::CM : FieldUnit::INCH)), - nDefTab( 1250 ) -{ - EnableModify( true ); -} - -bool SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const -{ - return( IsRulerVisible() == rOpt.IsRulerVisible() && - IsMoveOutline() == rOpt.IsMoveOutline() && - IsDragStripes() == rOpt.IsDragStripes() && - IsHandlesBezier() == rOpt.IsHandlesBezier() && - IsHelplines() == rOpt.IsHelplines() && - GetMetric() == rOpt.GetMetric() && - GetDefTab() == rOpt.GetDefTab() ); -} - -void SdOptionsLayout::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const -{ - if( isMetricSystem() ) - { - static const char* aPropNamesMetric[] = - { - "Display/Ruler", - "Display/Bezier", - "Display/Contour", - "Display/Guide", - "Display/Helpline", - "Other/MeasureUnit/Metric", - "Other/TabStop/Metric" - }; - ppNames = aPropNamesMetric; - rCount = SAL_N_ELEMENTS(aPropNamesMetric); - } - else - { - static const char* aPropNamesNonMetric[] = - { - "Display/Ruler", - "Display/Bezier", - "Display/Contour", - "Display/Guide", - "Display/Helpline", - "Other/MeasureUnit/NonMetric", - "Other/TabStop/NonMetric" - }; - ppNames = aPropNamesNonMetric; - rCount = SAL_N_ELEMENTS(aPropNamesNonMetric); - } -} - -bool SdOptionsLayout::ReadData( const Any* pValues ) -{ - if( pValues[0].hasValue() ) SetRulerVisible( *o3tl::doAccess<bool>(pValues[ 0 ]) ); - if( pValues[1].hasValue() ) SetHandlesBezier( *o3tl::doAccess<bool>(pValues[ 1 ]) ); - if( pValues[2].hasValue() ) SetMoveOutline( *o3tl::doAccess<bool>(pValues[ 2 ]) ); - if( pValues[3].hasValue() ) SetDragStripes( *o3tl::doAccess<bool>(pValues[ 3 ]) ); - if( pValues[4].hasValue() ) SetHelplines( *o3tl::doAccess<bool>(pValues[ 4 ]) ); - if( pValues[5].hasValue() ) SetMetric( static_cast<sal_uInt16>(*o3tl::doAccess<sal_Int32>(pValues[ 5 ])) ); - if( pValues[6].hasValue() ) SetDefTab( static_cast<sal_uInt16>(*o3tl::doAccess<sal_Int32>(pValues[ 6 ])) ); - - return true; -} - -bool SdOptionsLayout::WriteData( Any* pValues ) const -{ - pValues[ 0 ] <<= IsRulerVisible(); - pValues[ 1 ] <<= IsHandlesBezier(); - pValues[ 2 ] <<= IsMoveOutline(); - pValues[ 3 ] <<= IsDragStripes(); - pValues[ 4 ] <<= IsHelplines(); - pValues[ 5 ] <<= static_cast<sal_Int32>(GetMetric()); - pValues[ 6 ] <<= static_cast<sal_Int32>(GetDefTab()); - - return true; -} - -/************************************************************************* -|* -|* SdOptionsLayoutItem -|* -\************************************************************************/ - -SdOptionsLayoutItem::SdOptionsLayoutItem() -: SfxPoolItem ( ATTR_OPTIONS_LAYOUT ) -, maOptionsLayout ( false, false ) -{ -} - -SdOptionsLayoutItem::SdOptionsLayoutItem( SdOptions const * pOpts, ::sd::FrameView const * pView ) -: SfxPoolItem ( ATTR_OPTIONS_LAYOUT ) -, maOptionsLayout ( false, false ) -{ - if( pOpts ) - { - maOptionsLayout.SetMetric( pOpts->GetMetric() ); - maOptionsLayout.SetDefTab( pOpts->GetDefTab() ); - } - - if( pView ) - { - maOptionsLayout.SetRulerVisible( pView->HasRuler() ); - maOptionsLayout.SetMoveOutline( !pView->IsNoDragXorPolys() ); - maOptionsLayout.SetDragStripes( pView->IsDragStripes() ); - maOptionsLayout.SetHandlesBezier( pView->IsPlusHandlesAlwaysVisible() ); - maOptionsLayout.SetHelplines( pView->IsHlplVisible() ); - } - else if( pOpts ) - { - maOptionsLayout.SetRulerVisible( pOpts->IsRulerVisible() ); - maOptionsLayout.SetMoveOutline( pOpts->IsMoveOutline() ); - maOptionsLayout.SetDragStripes( pOpts->IsDragStripes() ); - maOptionsLayout.SetHandlesBezier( pOpts->IsHandlesBezier() ); - maOptionsLayout.SetHelplines( pOpts->IsHelplines() ); - } -} - -SdOptionsLayoutItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) const -{ - return new SdOptionsLayoutItem( *this ); -} - -bool SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const -{ - assert(SfxPoolItem::operator==(rAttr)); - return maOptionsLayout == static_cast<const SdOptionsLayoutItem&>(rAttr).maOptionsLayout; -} - -void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts ) const -{ - if( pOpts ) - { - pOpts->SetRulerVisible( maOptionsLayout.IsRulerVisible() ); - pOpts->SetMoveOutline( maOptionsLayout.IsMoveOutline() ); - pOpts->SetDragStripes( maOptionsLayout.IsDragStripes() ); - pOpts->SetHandlesBezier( maOptionsLayout.IsHandlesBezier() ); - pOpts->SetHelplines( maOptionsLayout.IsHelplines() ); - pOpts->SetMetric( maOptionsLayout.GetMetric() ); - pOpts->SetDefTab( maOptionsLayout.GetDefTab() ); - } -} - /************************************************************************* |* |* SdOptionsMisc @@ -1293,7 +1134,6 @@ void SdOptionsPrintItem::SetOptions( SdOptions* pOpts ) const \************************************************************************/ SdOptions::SdOptions(bool bImpress) : - SdOptionsLayout( bImpress, true ), SdOptionsMisc( bImpress, true ), SdOptionsSnap( bImpress, true ), SdOptionsZoom( bImpress ), @@ -1308,7 +1148,6 @@ SdOptions::~SdOptions() void SdOptions::StoreConfig() { - SdOptionsLayout::Store(); SdOptionsMisc::Store(); SdOptionsSnap::Store(); SdOptionsZoom::Store(); diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index a30c4f303016..bb45efa9401f 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -462,9 +462,6 @@ std::optional<SfxItemSet> SdModule::CreateItemSet( sal_uInt16 nSlot ) SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP, ATTR_OPTIONS_LAYOUT, ATTR_OPTIONS_SCALE_END> aRet(rPool); - // TP_OPTIONS_LAYOUT: - aRet.Put( SdOptionsLayoutItem( pOptions, pFrameView ) ); - sal_uInt16 nDefTab = 0; SvtSysLocale aSysLocale; @@ -592,12 +589,6 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) pGridItem->SetOptions( pOptions ); } - // Layout - if( const SdOptionsLayoutItem* pLayoutItem = rSet.GetItemIfSet( ATTR_OPTIONS_LAYOUT, false )) - { - pLayoutItem->SetOptions( pOptions ); - } - // Metric if( const SfxUInt16Item* pItem = rSet.GetItemIfSet( SID_ATTR_METRIC, false ) ) { diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index ad4d631c5bbf..7e02cb2ceb4b 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -105,63 +105,6 @@ public: static bool isMetricSystem(); }; -class SD_DLLPUBLIC SdOptionsLayout : public SdOptionsGeneric -{ -private: - - bool bRuler; // Layout/Display/Ruler - bool bMoveOutline; // Layout/Display/Contour - bool bDragStripes; // Layout/Display/Guide - bool bHandlesBezier; // Layout/Display/Bezier - bool bHelplines; // Layout/Display/Helpline - sal_uInt16 nMetric; // Layout/Other/MeasureUnit - sal_uInt16 nDefTab; // Layout/Other/TabStop - -protected: - - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const override; - virtual bool ReadData( const css::uno::Any* pValues ) override; - virtual bool WriteData( css::uno::Any* pValues ) const override; - -public: - SdOptionsLayout(bool bImpress, bool bUseConfig); - - bool operator==( const SdOptionsLayout& rOpt ) const; - - bool IsRulerVisible() const { Init(); return bRuler; } - bool IsMoveOutline() const { Init(); return bMoveOutline; } - bool IsDragStripes() const { Init(); return bDragStripes; } - bool IsHandlesBezier() const { Init(); return bHandlesBezier; } - bool IsHelplines() const { Init(); return bHelplines; } - sal_uInt16 GetMetric() const { Init(); return( ( 0xffff == nMetric ) ? static_cast<sal_uInt16>(SfxModule::GetCurrentFieldUnit()) : nMetric ); } - sal_uInt16 GetDefTab() const { Init(); return nDefTab; } - - void SetRulerVisible( bool bOn ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } } - void SetMoveOutline( bool bOn ) { if( bMoveOutline != bOn ) { OptionsChanged(); bMoveOutline = bOn; } } - void SetDragStripes( bool bOn ) { if( bDragStripes != bOn ) { OptionsChanged(); bDragStripes = bOn; } } - void SetHandlesBezier( bool bOn ) { if( bHandlesBezier != bOn ) { OptionsChanged(); bHandlesBezier = bOn; } } - void SetHelplines( bool bOn ) { if( bHelplines != bOn ) { OptionsChanged(); bHelplines = bOn; } } - void SetMetric( sal_uInt16 nInMetric ) { if( nMetric != nInMetric ) { OptionsChanged(); nMetric = nInMetric; } } - void SetDefTab( sal_uInt16 nTab ) { if( nDefTab != nTab ) { OptionsChanged(); nDefTab = nTab; } } -}; - -class SD_DLLPUBLIC SdOptionsLayoutItem final : public SfxPoolItem -{ -public: - - explicit SdOptionsLayoutItem(); - SdOptionsLayoutItem( SdOptions const * pOpts, ::sd::FrameView const * pView ); - - virtual SdOptionsLayoutItem* Clone( SfxItemPool *pPool = nullptr ) const override; - virtual bool operator==( const SfxPoolItem& ) const override; - - void SetOptions( SdOptions* pOpts ) const; - - SdOptionsLayout& GetOptionsLayout() { return maOptionsLayout; } -private: - SdOptionsLayout maOptionsLayout; -}; - class SD_DLLPUBLIC SdOptionsMisc : public SdOptionsGeneric { private: @@ -543,7 +486,7 @@ private: SdOptionsPrint maOptionsPrint; }; -class SdOptions final : public SdOptionsLayout, +class SdOptions final : public SdOptionsMisc, public SdOptionsSnap, public SdOptionsZoom, public SdOptionsGrid, public SdOptionsPrint