From 75346b4144b47d16d28f4c944199e366e97363ad Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Sat, 19 Nov 2016 19:44:10 +0100 Subject: Kill the AutoPilotPresentations UNO command The presentation wizard was removed in bb8040595c9b6f0ccde39e6833f27a50abb891d8 but the corresponding UNO command is still available. Change-Id: I54e676672bb53d0283394a0ebffbe9f94f29d9c0 Reviewed-on: https://gerrit.libreoffice.org/30983 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt --- configmgr/qa/unit/data.xcd | 5 ----- include/sfx2/sfxsids.hrc | 1 - .../org/openoffice/Office/UI/GenericCommands.xcu | 5 ----- sd/sdi/app.sdi | 6 ------ sd/source/ui/app/sdmod1.cxx | 25 ---------------------- sfx2/sdi/appslots.sdi | 5 ----- sfx2/sdi/sfx.sdi | 18 ---------------- sfx2/source/appl/appserv.cxx | 3 --- 8 files changed, 68 deletions(-) diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd index e3a3387e77fa..97da9e68b811 100644 --- a/configmgr/qa/unit/data.xcd +++ b/configmgr/qa/unit/data.xcd @@ -3737,11 +3737,6 @@ ~AutoCorrect... - - - AutoPilot: Presentation - - AutoPilot: Agenda diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 0685df689e2a..aaa19884c0bc 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -555,7 +555,6 @@ #define SID_ZOOM_PREV (SID_SVX_START + 403) #define SID_INET_DLG (SID_SVX_START + 416) #define SID_AUTO_CORRECT_DLG (SID_SVX_START + 424) -#define SID_SD_AUTOPILOT (SID_SVX_START + 425) #define SID_ATTR_CHAR_COLOR_EXT (SID_SVX_START + 488) #define SID_ATTR_CHAR_COLOR_BACKGROUND (SID_SVX_START + 489) #define SID_ATTR_CHAR_COLOR_BACKGROUND_EXT (SID_SVX_START + 490) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index c4f28d87fb3e..dd019018e120 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4448,11 +4448,6 @@ ~AutoCorrect Options... - - - AutoPilot: Presentation - - AutoPilot: Agenda diff --git a/sd/sdi/app.sdi b/sd/sdi/app.sdi index b2f6e16a4574..e616b6ec1cf9 100644 --- a/sd/sdi/app.sdi +++ b/sd/sdi/app.sdi @@ -32,12 +32,6 @@ interface StarImpress StateMethod = GetState; ] - SID_SD_AUTOPILOT // ole : ?, status : ? - [ - ExecMethod = Execute ; - StateMethod = GetState ; - ] - SID_NEWSD // ole : ?, status : ? [ ExecMethod = Execute ; diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 0fb7a27d8714..7dc6dad1bc5f 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -193,7 +193,6 @@ void SdModule::Execute(SfxRequest& rReq) } break; - case SID_SD_AUTOPILOT: case SID_NEWSD: { SfxFrame* pFrame = ExecuteNewDocument( rReq ); @@ -314,30 +313,6 @@ bool SdModule::OutlineToImpress(SfxRequest& rRequest) void SdModule::GetState(SfxItemSet& rItemSet) { - // disable Autopilot during presentation - if (rItemSet.GetItemState(SID_SD_AUTOPILOT) != SfxItemState::UNKNOWN) - { - if (!SvtModuleOptions().IsImpress()) - { - rItemSet.DisableItem(SID_SD_AUTOPILOT); - } - else - { - ::sd::DrawDocShell* pDocShell = dynamic_cast< ::sd::DrawDocShell *>( SfxObjectShell::Current() ); - if (pDocShell) - { - ::sd::ViewShell* pViewShell = pDocShell->GetViewShell(); - if (pViewShell) - { - if( sd::SlideShow::IsRunning( pViewShell->GetViewShellBase() ) ) - { - rItemSet.DisableItem(SID_SD_AUTOPILOT); - } - } - } - } - } - if( SfxItemState::DEFAULT == rItemSet.GetItemState( SID_ATTR_METRIC ) ) { ::sd::DrawDocShell* pDocSh = dynamic_cast< ::sd::DrawDocShell *>( SfxObjectShell::Current() ); diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi index bd03c1276b0f..6da19553c177 100644 --- a/sfx2/sdi/appslots.sdi +++ b/sfx2/sdi/appslots.sdi @@ -283,11 +283,6 @@ shell SfxApplication [ ExecMethod = OfaExec_Impl; ] - SID_SD_AUTOPILOT // status(final|play) - [ - ExecMethod = OfaExec_Impl; - StateMethod = OfaState_Impl; - ] SID_NEWSD // status(final|play) [ ExecMethod = OfaExec_Impl; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index dda5c788c5e5..0347532228af 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -5311,24 +5311,6 @@ SfxVoidItem NewXForms FN_XFORMS_INIT ] -SfxVoidItem AutoPilotPresentations SID_SD_AUTOPILOT -( SfxUnoFrameItem Frame SID_FILLFRAME, SfxBoolItem Hidden SID_HIDDEN ) -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = TRUE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = FALSE, - MenuConfig = TRUE, - ToolBoxConfig = FALSE, - GroupId = GID_APPLICATION; -] - - SfxVoidItem NewPresentation SID_NEWSD ( SfxUnoFrameItem Frame SID_FILLFRAME, SfxBoolItem Hidden SID_HIDDEN ) [ diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index e804007ce55c..de9b8af352f0 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -1615,7 +1615,6 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) break; } - case SID_SD_AUTOPILOT : case SID_NEWSD : { SvtModuleOptions aModuleOpt; @@ -1694,8 +1693,6 @@ void SfxApplication::OfaState_Impl(SfxItemSet &rSet) rSet.DisableItem( FN_XFORMS_INIT ); } - if ( !aModuleOpt.IsImpress() ) - rSet.DisableItem( SID_SD_AUTOPILOT ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit