summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/ui/app/optsitem.cxx55
-rw-r--r--sd/source/ui/inc/optsitem.hxx23
2 files changed, 1 insertions, 77 deletions
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 2ad6448099fc..ac67a935e16d 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -682,59 +682,6 @@ void SdOptionsSnapItem::SetOptions( SdOptions* pOpts ) const
/*************************************************************************
|*
-|* SdOptionsZoom
-|*
-\************************************************************************/
-
-SdOptionsZoom::SdOptionsZoom( bool bImpress ) :
- SdOptionsGeneric( bImpress, bImpress ?
- OUString() :
- OUString("Office.Draw/Zoom") ),
- nX( 1 ),
- nY( 1 )
-
-{
- EnableModify( true );
-}
-
-void SdOptionsZoom::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const
-{
- static const char* aPropNames[] =
- {
- "ScaleX",
- "ScaleY"
- };
-
- rCount = !IsImpress() ? SAL_N_ELEMENTS(aPropNames) : 0;
- ppNames = aPropNames;
-}
-
-bool SdOptionsZoom::ReadData( const Any* pValues )
-{
- sal_Int32 x = 1, y = 1;
-
- if( pValues[0].hasValue() ) x = *o3tl::doAccess<sal_Int32>(pValues[ 0 ]);
- if( pValues[1].hasValue() ) y = *o3tl::doAccess<sal_Int32>(pValues[ 1 ]);
-
- SetScale( x, y );
-
- return true;
-}
-
-bool SdOptionsZoom::WriteData( Any* pValues ) const
-{
- sal_Int32 x, y;
-
- GetScale( x, y );
-
- pValues[ 0 ] <<= x;
- pValues[ 1 ] <<= y;
-
- return true;
-}
-
-/*************************************************************************
-|*
|* SdOptionsGrid
|*
\************************************************************************/
@@ -1136,7 +1083,6 @@ void SdOptionsPrintItem::SetOptions( SdOptions* pOpts ) const
SdOptions::SdOptions(bool bImpress) :
SdOptionsMisc( bImpress, true ),
SdOptionsSnap( bImpress, true ),
- SdOptionsZoom( bImpress ),
SdOptionsGrid( bImpress ),
SdOptionsPrint( bImpress, true )
{
@@ -1150,7 +1096,6 @@ void SdOptions::StoreConfig()
{
SdOptionsMisc::Store();
SdOptionsSnap::Store();
- SdOptionsZoom::Store();
SdOptionsGrid::Store();
SdOptionsPrint::Store();
}
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 7e02cb2ceb4b..403c7b88e312 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -321,27 +321,6 @@ private:
SdOptionsSnap maOptionsSnap;
};
-class SdOptionsZoom : public SdOptionsGeneric
-{
-private:
-
- sal_Int32 nX; // Zoom/ScaleX
- sal_Int32 nY; // Zoom/ScaleY
-
-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:
-
- explicit SdOptionsZoom(bool bImpress);
-
- void GetScale( sal_Int32& rX, sal_Int32& rY ) const { Init(); rX = nX; rY = nY; }
- void SetScale( sal_Int32 nInX, sal_Int32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } }
-};
-
class SdOptionsGrid : public SdOptionsGeneric, public SvxOptionsGrid
{
protected:
@@ -488,7 +467,7 @@ private:
class SdOptions final :
public SdOptionsMisc, public SdOptionsSnap,
- public SdOptionsZoom, public SdOptionsGrid,
+ public SdOptionsGrid,
public SdOptionsPrint
{
public: