tdf#135089 Move Presenter console settings to Slide Show settings

Change-Id: I0aeb180ee132bff359d46d963985196f5a24610f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158798
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>

1 files changed, 6 insertions, 24 deletions

diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 0492be483658..e02618ca8f18 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -409,8 +409,6 @@ SdOptionsMisc::SdOptionsMisc( bool bImpress, bool bUseConfig ) :
     bDoubleClickTextEdit( true ),
     bClickChangeRotation( false ),
     bEnableSdremote( false ),
-    bEnablePresenterScreen( true ),
-    bPresenterScreenFullScreen( true ),
     bSolidDragging( true ),
     bSummationOfParagraphs( false ),
     bTabBarVisible( true ),
@@ -446,8 +444,6 @@ bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const
             IsDoubleClickTextEdit() == rOpt.IsDoubleClickTextEdit() &&
             IsClickChangeRotation() == rOpt.IsClickChangeRotation() &&
             IsEnableSdremote() == rOpt.IsEnableSdremote() &&
-            IsEnablePresenterScreen() == rOpt.IsEnablePresenterScreen() &&
-            IsPresenterScreenFullScreen() == rOpt.IsPresenterScreenFullScreen() &&
             IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() &&
             IsTabBarVisible() == rOpt.IsTabBarVisible() &&
             IsSolidDragging() == rOpt.IsSolidDragging() &&
@@ -507,8 +503,6 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
         "PenColor",
         "PenWidth",
         "Start/EnableSdremote",
-        "Start/EnablePresenterScreen",
-        "Start/PresenterScreenFullScreen",
         "TabBarVisible",
         "Start/ShowNavigationPanel"
     };
@@ -571,17 +565,11 @@ bool SdOptionsMisc::ReadData( const Any* pValues )
         if( pValues[25].hasValue() )
             SetEnableSdremote( *o3tl::doAccess<bool>(pValues[ 25 ]) );
 
-        if( pValues[26].hasValue() )
-            SetEnablePresenterScreen( *o3tl::doAccess<bool>(pValues[ 26 ]) );
-
-        if (pValues[27].hasValue() )
-            SetPresenterScreenFullScreen( *o3tl::doAccess<bool>(pValues[ 27 ]) );
-
-        if( pValues[28].hasValue() ) {
-            SetTabBarVisible( *o3tl::doAccess<bool>(pValues[ 28 ]) );
+        if( pValues[26].hasValue() ) {
+            SetTabBarVisible( *o3tl::doAccess<bool>(pValues[ 26 ]) );
         }
-        if( pValues[29].hasValue() )
-            SetShowNavigationPanel( *o3tl::doAccess<bool>(pValues[ 29 ]) );
+        if( pValues[27].hasValue() )
+            SetShowNavigationPanel( *o3tl::doAccess<bool>(pValues[ 27 ]) );
 
     }
 
@@ -624,11 +612,9 @@ bool SdOptionsMisc::WriteData( Any* pValues ) const
         pValues[ 23 ] <<= GetPresentationPenColor();
         pValues[ 24 ] <<= GetPresentationPenWidth();
         pValues[ 25 ] <<= IsEnableSdremote();
-        pValues[ 26 ] <<= IsEnablePresenterScreen();
-        pValues[ 27 ] <<= IsPresenterScreenFullScreen();
-        pValues[ 28 ] <<= IsTabBarVisible();
+        pValues[ 26 ] <<= IsTabBarVisible();
 
-        pValues[ 29 ] <<= IsShowNavigationPanel();
+        pValues[ 27 ] <<= IsShowNavigationPanel();
 
     }
 
@@ -655,8 +641,6 @@ SdOptionsMiscItem::SdOptionsMiscItem( SdOptions const * pOpts, ::sd::FrameView c
     {
         maOptionsMisc.SetStartWithTemplate( pOpts->IsStartWithTemplate() );
         maOptionsMisc.SetEnableSdremote( pOpts->IsEnableSdremote() );
-        maOptionsMisc.SetEnablePresenterScreen( pOpts->IsEnablePresenterScreen() );
-        maOptionsMisc.SetPresenterScreenFullScreen( pOpts->IsPresenterScreenFullScreen() );
         maOptionsMisc.SetSummationOfParagraphs( pOpts->IsSummationOfParagraphs() );
         maOptionsMisc.SetTabBarVisible( pOpts->IsTabBarVisible() );
         maOptionsMisc.SetShowUndoDeleteWarning( pOpts->IsShowUndoDeleteWarning() );
@@ -737,8 +721,6 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const
     pOpts->SetDoubleClickTextEdit( maOptionsMisc.IsDoubleClickTextEdit() );
     pOpts->SetClickChangeRotation( maOptionsMisc.IsClickChangeRotation() );
     pOpts->SetEnableSdremote( maOptionsMisc.IsEnableSdremote() );
-    pOpts->SetEnablePresenterScreen( maOptionsMisc.IsEnablePresenterScreen() );
-    pOpts->SetPresenterScreenFullScreen( maOptionsMisc.IsPresenterScreenFullScreen() );
     pOpts->SetSummationOfParagraphs( maOptionsMisc.IsSummationOfParagraphs() );
     pOpts->SetTabBarVisible( maOptionsMisc.IsTabBarVisible() );