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>

9 files changed, 14 insertions, 97 deletions

diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 928a19f722c5..0c05093eef5a 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -325,7 +325,6 @@
 #define SID_NAVIGATOR_STATE                 (SID_SD_START+288)
 #define SID_NAVIGATOR_INIT                  (SID_SD_START+289)
     // FREE
-#define SID_NAVIGATOR_PEN                   (SID_SD_START+291)
 #define SID_NAVIGATOR_PAGE                  (SID_SD_START+292)
 #define SID_NAVIGATOR_OBJECT                (SID_SD_START+293)
 #define SID_ANIMATOR_INIT                   (SID_SD_START+294)
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index c24b66273d74..fdc48b228890 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -28,7 +28,6 @@
 #define HID_SD_NAVIGATOR                                        "SD_HID_SD_NAVIGATOR"
 #define HID_SD_NAVIGATOR_TBX                                    "SD_HID_SD_NAVIGATOR_TBX"
 #define HID_SD_NAVIGATOR_LB                                     "SD_HID_SD_NAVIGATOR_LB"
-#define HID_SD_NAVIGATOR_TBI_PEN                                "SD_HID_SD_NAVIGATOR_TBI_PEN"
 #define HID_SD_NAVIGATOR_TBI_FIRST                              "SD_HID_SD_NAVIGATOR_TBI_FIRST"
 #define HID_SD_NAVIGATOR_TBI_PREV                               "SD_HID_SD_NAVIGATOR_TBI_PREV"
 #define HID_SD_NAVIGATOR_TBI_NEXT                               "SD_HID_SD_NAVIGATOR_TBI_NEXT"
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index b97d2b340173..228467b77c1f 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
@@ -106,11 +106,6 @@ interface ImpressEditView : DrawView
         ExecMethod = ExecAnimationWin ;
         StateMethod = GetAnimationWinState ;
     ]
-    SID_NAVIGATOR_PEN // ole : no, status : ?
-    [
-        ExecMethod = ExecNavigatorWin ;
-        StateMethod = GetNavigatorWinState ;
-    ]
     SID_PRESENTATION_DLG
     [
         ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index ab32aa799599..48fcbd183162 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -3418,26 +3418,6 @@ SfxStringItem NavigatorPageName SID_NAVIGATOR_PAGENAME
     GroupId = GID_EDIT;
 ]
 
-SfxBoolItem NavigatorPen SID_NAVIGATOR_PEN
-
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    FastCall = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_EDIT;
-]
 
 SfxUInt32Item NavigatorState SID_NAVIGATOR_STATE
 
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 ;  \
diff --git a/sd/source/ui/inc/navigatr.hrc b/sd/source/ui/inc/navigatr.hrc
index 92f9e1894d34..1dce27251d79 100644
--- a/sd/source/ui/inc/navigatr.hrc
+++ b/sd/source/ui/inc/navigatr.hrc
@@ -19,7 +19,6 @@
 #define FLT_NAVIGATOR 575
 #define  STR_OBJECTS_TREE (FLT_NAVIGATOR+1)
 #define TLB_OBJECTS 1
-#define TBI_PEN 2
 #define TBI_FIRST 3
 #define TBI_PREVIOUS 4
 #define TBI_NEXT 5
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 576538297f41..f07cf1f0a698 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -29,10 +29,6 @@
 
 #define NAVSTATE_NONE           0x00000000
 
-#define NAVBTN_PEN_DISABLED     0x00000020
-#define NAVBTN_PEN_CHECKED      0x00000040
-#define NAVBTN_PEN_UNCHECKED    0x00000080
-
 #define NAVTLB_UPDATE           0x00000100
 
 #define NAVBTN_FIRST_ENABLED    0x00001000
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx
index 9c0129531b32..572378f09aa7 100644
--- a/sd/source/ui/view/drviewsd.cxx
+++ b/sd/source/ui/view/drviewsd.cxx
@@ -66,7 +66,6 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq )
         }
         break;
 
-        case SID_NAVIGATOR_PEN:
         case SID_NAVIGATOR_PAGE:
         case SID_NAVIGATOR_OBJECT:
         {
@@ -160,7 +159,7 @@ void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet )
     bool   bEndless = false;
     OUString aPageName;
 
-    nState |= NAVBTN_PEN_DISABLED | NAVTLB_UPDATE;
+    nState |= NAVTLB_UPDATE;
 
     if (mpActualPage != nullptr)
     {