Remove pointer (pen) from Navigator window

It doesn't appear to have worked since LibreOffice 5.0,
and the best use case (to use it during a live slideshow)
has been removed per bug 96414.

Change-Id: I25dbaa0b9ab86a2a7324b9c496473bf29a5f6ac2
Reviewed-on: https://gerrit.libreoffice.org/22087
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

2 files changed, 13 insertions, 63 deletions

diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 32098f7c57e6..bbee98c57b1c 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -266,49 +266,22 @@ sd::DrawDocShell* SdNavigatorWin::GetDrawDocShell( const SdDrawDocument* pDoc )
 IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectToolboxHdl, ToolBox *, void)
 {
     sal_uInt16 nId = maToolbox->GetCurItemId();
-    sal_uInt16 nSId = 0;
     PageJump ePage = PAGE_NONE;
 
-    switch( nId )
-    {
-        case TBI_PEN:
-        {
-            if( nId == TBI_PEN )
-            {
-                nSId = SID_NAVIGATOR_PEN;
-            }
+    if( nId == TBI_FIRST )
+        ePage = PAGE_FIRST;
+    else if( nId == TBI_PREVIOUS )
+        ePage = PAGE_PREVIOUS;
+    else if( nId == TBI_NEXT )
+        ePage = PAGE_NEXT;
+    else if( nId == TBI_LAST )
+        ePage = PAGE_LAST;
 
-            if( nSId > 0 )
-            {
-                SfxBoolItem aItem( nSId, true );
-                mpBindings->GetDispatcher()->Execute(
-                    nSId, SfxCallMode::SLOT |SfxCallMode::RECORD, &aItem, 0L );
-            }
-        }
-        break;
-
-        case TBI_FIRST:
-        case TBI_PREVIOUS:
-        case TBI_NEXT:
-        case TBI_LAST:
-        {
-            if( nId == TBI_FIRST )
-                ePage = PAGE_FIRST;
-            else if( nId == TBI_PREVIOUS )
-                ePage = PAGE_PREVIOUS;
-            else if( nId == TBI_NEXT )
-                ePage = PAGE_NEXT;
-            else if( nId == TBI_LAST )
-                ePage = PAGE_LAST;
-
-            if( ePage != PAGE_NONE )
-            {
-                SfxUInt16Item aItem( SID_NAVIGATOR_PAGE, (sal_uInt16)ePage );
-                mpBindings->GetDispatcher()->Execute(
-                    SID_NAVIGATOR_PAGE, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L );
-            }
-        }
-        break;
+    if( ePage != PAGE_NONE )
+    {
+        SfxUInt16Item aItem( SID_NAVIGATOR_PAGE, (sal_uInt16)ePage );
+        mpBindings->GetDispatcher()->Execute(
+        SID_NAVIGATOR_PAGE, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L );
     }
 }
 
@@ -871,17 +844,6 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
         const SfxUInt32Item& rStateItem = dynamic_cast<const SfxUInt32Item&>(*pItem);
         sal_uInt32 nState = rStateItem.GetValue();
 
-        // pen
-        if( nState & NAVBTN_PEN_DISABLED &&
-            pNavigatorWin->maToolbox->IsItemEnabled( TBI_PEN ) )
-            pNavigatorWin->maToolbox->EnableItem( TBI_PEN, false );
-        if( nState & NAVBTN_PEN_CHECKED &&
-            !pNavigatorWin->maToolbox->IsItemChecked( TBI_PEN ) )
-            pNavigatorWin->maToolbox->CheckItem( TBI_PEN );
-        if( nState & NAVBTN_PEN_UNCHECKED &&
-            pNavigatorWin->maToolbox->IsItemChecked( TBI_PEN ) )
-            pNavigatorWin->maToolbox->CheckItem( TBI_PEN, false );
-
         // only if doc in LB is the active
         NavDocInfo* pInfo = pNavigatorWin->GetDocInfo();
         if( pInfo && pInfo->IsActive() )
diff --git a/sd/source/ui/dlg/navigatr.src b/sd/source/ui/dlg/navigatr.src
index 74db25aae41e..9065c221da0c 100644
--- a/sd/source/ui/dlg/navigatr.src
+++ b/sd/source/ui/dlg/navigatr.src
@@ -48,17 +48,6 @@ Window FLT_NAVIGATOR
         {
             ToolBoxItem
             {
-                AutoCheck = TRUE ;
-                Identifier = TBI_PEN ;
-                HelpId = HID_SD_NAVIGATOR_TBI_PEN ;
-                Text [ en-US ] = "Pointer" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SEPARATOR ;
-            };
-            ToolBoxItem
-            {
                 Identifier = TBI_FIRST ;
                 HelpId = HID_SD_NAVIGATOR_TBI_FIRST ;
                 Text [ en-US ] = "First Slide" ;
@@ -115,7 +104,6 @@ Window FLT_NAVIGATOR
     #define NAVIGATR_IDLIST \
         IdList =            \
         {                   \
-            TBI_PEN ;   \
             TBI_FIRST ; \
             TBI_PREVIOUS ;  \
             TBI_NEXT ;  \