sd/inc/sdattr.hrc | 2
sd/source/ui/app/optsitem.cxx | 167 ------------------------------------------
sd/source/ui/app/sdmod2.cxx | 10 --
sd/source/ui/inc/optsitem.hxx | 69 -----------------
4 files changed, 2 insertions(+), 246 deletions(-)
New commits:
commit 563573068fe0835b1fa132d18b53f991be0e15a0
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Sun May 12 09:30:02 2024 +0200
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Sat May 18 11:52:37 2024 +0200
Drop now unused SdOptionsSnap, SdOptionsSnapItem classes
Change-Id: Ifa2a7b7447e3659ea331ca4c3ec5c05dcc9a5841
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167542
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
Tested-by: Jenkins
diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc
index 35f53e47ca9d..20958e1b39d6 100644
--- a/sd/inc/sdattr.hrc
+++ b/sd/inc/sdattr.hrc
@@ -102,7 +102,7 @@ class XColorItem;
#define ATTR_OPTIONS_START ATTR_SNAPLINE_END + 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_SNAP ATTR_OPTIONS_START + 3
#define ATTR_OPTIONS_PRINT
TypedWhichId<SdOptionsPrintItem>(ATTR_OPTIONS_START + 4)
#define ATTR_OPTIONS_END ATTR_OPTIONS_PRINT
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index ac67a935e16d..9b1ec49f85a5 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -515,171 +515,6 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts )
const
pOpts->SetDragThreshold( maOptionsMisc.GetDragThresholdPixels() );
}
-/*************************************************************************
-|*
-|* SdOptionsSnap
-|*
-\************************************************************************/
-
-SdOptionsSnap::SdOptionsSnap( bool bImpress, bool bUseConfig ) :
- SdOptionsGeneric( bImpress, bUseConfig ?
- ( bImpress ?
- OUString( "Office.Impress/Snap" ) :
- OUString( "Office.Draw/Snap" ) ) :
- OUString() ),
- bSnapHelplines( true ),
- bSnapBorder( true ),
- bSnapFrame( false ),
- bSnapPoints( false ),
- bOrtho( false ),
- bBigOrtho( true ),
- bRotate( false ),
- nSnapArea( 5 ),
- nAngle( 1500 ),
- nBezAngle( 1500 )
-
-{
- EnableModify( true );
-}
-
-bool SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const
-{
- return( IsSnapHelplines() == rOpt.IsSnapHelplines() &&
- IsSnapBorder() == rOpt.IsSnapBorder() &&
- IsSnapFrame() == rOpt.IsSnapFrame() &&
- IsSnapPoints() == rOpt.IsSnapPoints() &&
- IsOrtho() == rOpt.IsOrtho() &&
- IsBigOrtho() == rOpt.IsBigOrtho() &&
- IsRotate() == rOpt.IsRotate() &&
- GetSnapArea() == rOpt.GetSnapArea() &&
- GetAngle() == rOpt.GetAngle() &&
- GetEliminatePolyPointLimitAngle() ==
rOpt.GetEliminatePolyPointLimitAngle() );
-}
-
-void SdOptionsSnap::GetPropNameArray( const char**& ppNames, sal_uLong& rCount
) const
-{
- static const char* aPropNames[] =
- {
- "Object/SnapLine",
- "Object/PageMargin",
- "Object/ObjectFrame",
- "Object/ObjectPoint",
- "Position/CreatingMoving",
- "Position/ExtendEdges",
- "Position/Rotating",
- "Object/Range",
- "Position/RotatingValue",
- "Position/PointReduction"
- };
-
- rCount = SAL_N_ELEMENTS(aPropNames);
- ppNames = aPropNames;
-}
-
-bool SdOptionsSnap::ReadData( const Any* pValues )
-{
- if( pValues[0].hasValue() ) SetSnapHelplines(
*o3tl::doAccess<bool>(pValues[ 0 ]) );
- if( pValues[1].hasValue() ) SetSnapBorder( *o3tl::doAccess<bool>(pValues[
1 ]) );
- if( pValues[2].hasValue() ) SetSnapFrame( *o3tl::doAccess<bool>(pValues[ 2
]) );
- if( pValues[3].hasValue() ) SetSnapPoints( *o3tl::doAccess<bool>(pValues[
3 ]) );
- if( pValues[4].hasValue() ) SetOrtho( *o3tl::doAccess<bool>(pValues[ 4 ])
);
- if( pValues[5].hasValue() ) SetBigOrtho( *o3tl::doAccess<bool>(pValues[ 5
]) );
- if( pValues[6].hasValue() ) SetRotate( *o3tl::doAccess<bool>(pValues[ 6 ])
);
- if( pValues[7].hasValue() ) SetSnapArea(
static_cast<sal_Int16>(*o3tl::doAccess<sal_Int32>(pValues[ 7 ])) );
- if( pValues[8].hasValue() ) SetAngle(
Degree100(*o3tl::doAccess<sal_Int32>(pValues[ 8 ])) );
- if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle(
Degree100(*o3tl::doAccess<sal_Int32>(pValues[ 9 ])) );
-
- return true;
-}
-
-bool SdOptionsSnap::WriteData( Any* pValues ) const
-{
- pValues[ 0 ] <<= IsSnapHelplines();
- pValues[ 1 ] <<= IsSnapBorder();
- pValues[ 2 ] <<= IsSnapFrame();
- pValues[ 3 ] <<= IsSnapPoints();
- pValues[ 4 ] <<= IsOrtho();
- pValues[ 5 ] <<= IsBigOrtho();
- pValues[ 6 ] <<= IsRotate();
- pValues[ 7 ] <<= static_cast<sal_Int32>(GetSnapArea());
- pValues[ 8 ] <<= static_cast<sal_Int32>(GetAngle().get());
- pValues[ 9 ] <<=
static_cast<sal_Int32>(GetEliminatePolyPointLimitAngle().get());
-
- return true;
-}
-
-/*************************************************************************
-|*
-|* SdOptionsSnapItem
-|*
-\************************************************************************/
-
-SdOptionsSnapItem::SdOptionsSnapItem()
-: SfxPoolItem ( ATTR_OPTIONS_SNAP )
-, maOptionsSnap ( false, false )
-{
-}
-
-SdOptionsSnapItem::SdOptionsSnapItem( SdOptions const * pOpts, ::sd::FrameView
const * pView )
-: SfxPoolItem ( ATTR_OPTIONS_SNAP )
-, maOptionsSnap ( false, false )
-{
- if( pView )
- {
- maOptionsSnap.SetSnapHelplines( pView->IsHlplSnap() );
- maOptionsSnap.SetSnapBorder( pView->IsBordSnap() );
- maOptionsSnap.SetSnapFrame( pView->IsOFrmSnap() );
- maOptionsSnap.SetSnapPoints( pView->IsOPntSnap() );
- maOptionsSnap.SetOrtho( pView->IsOrtho() );
- maOptionsSnap.SetBigOrtho( pView->IsBigOrtho() );
- maOptionsSnap.SetRotate( pView->IsAngleSnapEnabled() );
- maOptionsSnap.SetSnapArea( pView->GetSnapMagneticPixel() );
- maOptionsSnap.SetAngle( pView->GetSnapAngle() );
- maOptionsSnap.SetEliminatePolyPointLimitAngle(
pView->GetEliminatePolyPointLimitAngle() );
- }
- else if( pOpts )
- {
- maOptionsSnap.SetSnapHelplines( pOpts->IsSnapHelplines() );
- maOptionsSnap.SetSnapBorder( pOpts->IsSnapBorder() );
- maOptionsSnap.SetSnapFrame( pOpts->IsSnapFrame() );
- maOptionsSnap.SetSnapPoints( pOpts->IsSnapPoints() );
- maOptionsSnap.SetOrtho( pOpts->IsOrtho() );
- maOptionsSnap.SetBigOrtho( pOpts->IsBigOrtho() );
- maOptionsSnap.SetRotate( pOpts->IsRotate() );
- maOptionsSnap.SetSnapArea( pOpts->GetSnapArea() );
- maOptionsSnap.SetAngle( pOpts->GetAngle() );
- maOptionsSnap.SetEliminatePolyPointLimitAngle(
pOpts->GetEliminatePolyPointLimitAngle() );
- }
-}
-
-SdOptionsSnapItem* SdOptionsSnapItem::Clone( SfxItemPool* ) const
-{
- return new SdOptionsSnapItem( *this );
-}
-
-bool SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const
-{
- assert(SfxPoolItem::operator==(rAttr));
- return maOptionsSnap == static_cast<const
SdOptionsSnapItem&>(rAttr).maOptionsSnap;
-}
-
-void SdOptionsSnapItem::SetOptions( SdOptions* pOpts ) const
-{
- if( !pOpts )
- return;
-
- pOpts->SetSnapHelplines( maOptionsSnap.IsSnapHelplines() );
- pOpts->SetSnapBorder( maOptionsSnap.IsSnapBorder() );
- pOpts->SetSnapFrame( maOptionsSnap.IsSnapFrame() );
- pOpts->SetSnapPoints( maOptionsSnap.IsSnapPoints() );
- pOpts->SetOrtho( maOptionsSnap.IsOrtho() );
- pOpts->SetBigOrtho( maOptionsSnap.IsBigOrtho() );
- pOpts->SetRotate( maOptionsSnap.IsRotate() );
- pOpts->SetSnapArea( maOptionsSnap.GetSnapArea() );
- pOpts->SetAngle( maOptionsSnap.GetAngle() );
- pOpts->SetEliminatePolyPointLimitAngle(
maOptionsSnap.GetEliminatePolyPointLimitAngle() );
-}
-
/*************************************************************************
|*
|* SdOptionsGrid
@@ -1082,7 +917,6 @@ void SdOptionsPrintItem::SetOptions( SdOptions* pOpts )
const
SdOptions::SdOptions(bool bImpress) :
SdOptionsMisc( bImpress, true ),
- SdOptionsSnap( bImpress, true ),
SdOptionsGrid( bImpress ),
SdOptionsPrint( bImpress, true )
{
@@ -1095,7 +929,6 @@ SdOptions::~SdOptions()
void SdOptions::StoreConfig()
{
SdOptionsMisc::Store();
- SdOptionsSnap::Store();
SdOptionsGrid::Store();
SdOptionsPrint::Store();
}
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index bb45efa9401f..374a30c241eb 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -514,9 +514,6 @@ std::optional<SfxItemSet> SdModule::CreateItemSet(
sal_uInt16 nSlot )
}
aRet.Put( aSdOptionsMiscItem );
- // TP_OPTIONS_SNAP:
- aRet.Put( SdOptionsSnapItem( pOptions, pFrameView ) );
-
// TP_SCALE:
sal_uInt32 nW = 10;
sal_uInt32 nH = 10;
@@ -677,13 +674,6 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const
SfxItemSet& rSet )
bMiscOptions = true;
}
- // Snap
- const SdOptionsSnapItem* pSnapItem = rSet.GetItemIfSet( ATTR_OPTIONS_SNAP,
false );
- if( pSnapItem )
- {
- pSnapItem->SetOptions( pOptions );
- }
-
SfxItemSetFixed<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT>
aPrintSet( GetPool() );
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 403c7b88e312..65bca1991090 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -254,73 +254,6 @@ private:
SdOptionsMisc maOptionsMisc;
};
-class SD_DLLPUBLIC SdOptionsSnap : public SdOptionsGeneric
-{
-private:
-
- bool bSnapHelplines : 1; // Snap/Object/SnapLine
- bool bSnapBorder : 1; // Snap/Object/PageMargin
- bool bSnapFrame : 1; // Snap/Object/ObjectFrame
- bool bSnapPoints : 1; // Snap/Object/ObjectPoint
- bool bOrtho : 1; // Snap/Position/CreatingMoving
- bool bBigOrtho : 1; // Snap/Position/ExtendEdges
- bool bRotate : 1; // Snap/Position/Rotating
- sal_Int16 nSnapArea; // Snap/Object/Range
- Degree100 nAngle; // Snap/Position/RotatingValue
- Degree100 nBezAngle; // Snap/Position/PointReduction
-
-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:
-
- SdOptionsSnap(bool bImpress, bool bUseConfig);
-
- bool operator==( const SdOptionsSnap& rOpt ) const;
-
- bool IsSnapHelplines() const { Init(); return bSnapHelplines; }
- bool IsSnapBorder() const { Init(); return bSnapBorder; }
- bool IsSnapFrame() const { Init(); return bSnapFrame; }
- bool IsSnapPoints() const { Init(); return bSnapPoints; }
- bool IsOrtho() const { Init(); return bOrtho; }
- bool IsBigOrtho() const { Init(); return bBigOrtho; }
- bool IsRotate() const { Init(); return bRotate; }
- sal_Int16 GetSnapArea() const { Init(); return nSnapArea; }
- Degree100 GetAngle() const { Init(); return nAngle; }
- Degree100 GetEliminatePolyPointLimitAngle() const { Init(); return
nBezAngle; }
-
- void SetSnapHelplines( bool bOn ) { if( bSnapHelplines != bOn ) {
OptionsChanged(); bSnapHelplines = bOn; } }
- void SetSnapBorder( bool bOn ) { if( bSnapBorder != bOn ) {
OptionsChanged(); bSnapBorder = bOn; } }
- void SetSnapFrame( bool bOn ) { if( bSnapFrame != bOn ) {
OptionsChanged(); bSnapFrame = bOn; } }
- void SetSnapPoints( bool bOn ) { if( bSnapPoints != bOn ) {
OptionsChanged(); bSnapPoints = bOn; } }
- void SetOrtho( bool bOn ) { if( bOrtho != bOn ) { OptionsChanged();
bOrtho = bOn; } }
- void SetBigOrtho( bool bOn ) { if( bBigOrtho != bOn ) {
OptionsChanged(); bBigOrtho = bOn; } }
- void SetRotate( bool bOn ) { if( bRotate != bOn ) { OptionsChanged();
bRotate = bOn; } }
- void SetSnapArea( sal_Int16 nIn ) { if( nSnapArea != nIn ) {
OptionsChanged(); nSnapArea = nIn; } }
- void SetAngle( Degree100 nIn ) { if( nAngle != nIn ) {
OptionsChanged(); nAngle = nIn; } }
- void SetEliminatePolyPointLimitAngle( Degree100 nIn ) { if( nBezAngle
!= nIn ) { OptionsChanged(); nBezAngle = nIn; } }
-};
-
-class SD_DLLPUBLIC SdOptionsSnapItem final : public SfxPoolItem
-{
-public:
-
- explicit SdOptionsSnapItem();
- SdOptionsSnapItem( SdOptions const * pOpts,
::sd::FrameView const * pView );
-
- virtual SdOptionsSnapItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
- virtual bool operator==( const SfxPoolItem& ) const override;
-
- void SetOptions( SdOptions* pOpts ) const;
-
- SdOptionsSnap& GetOptionsSnap() { return maOptionsSnap; }
-private:
- SdOptionsSnap maOptionsSnap;
-};
-
class SdOptionsGrid : public SdOptionsGeneric, public SvxOptionsGrid
{
protected:
@@ -466,7 +399,7 @@ private:
};
class SdOptions final :
- public SdOptionsMisc, public SdOptionsSnap,
+ public SdOptionsMisc,
public SdOptionsGrid,
public SdOptionsPrint
{
