diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 3c11c3686efe..9971dcc2eb2d 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -351,7 +351,7 @@ #define SID_OUTLINE_COLLAPSE_ALL ( SID_SVX_START + 155 ) #define SID_OUTLINE_BULLET ( SID_SVX_START + 156 ) #define SID_PRESENTATION ( SID_SVX_START + 157 ) -#define SID_PRESENTATION_THIS_SLIDE ( SID_SVX_START + 158 ) +#define SID_PRESENTATION_CURRENT_SLIDE ( SID_SVX_START + 158 ) #define SID_REHEARSE_TIMINGS ( SID_SVX_START + 159 ) #define SID_HIDE_SLIDE ( SID_SVX_START + 161 ) #define SID_CHOOSE_POLYGON ( SID_SVX_START + 162 ) diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 6cf3ae31b5bc..afb17b05cd16 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -2234,7 +2234,7 @@ I10N SHORTCUTS - NO TRANSLATE - .uno:PresentationThisSlide + .uno:PresentationCurrentSlide diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 9efa4080cf34..d31e6a49039e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -31,15 +31,15 @@ - ~Slide Show + Start from ~first Slide 1 - + - Sl~ide Show From This Slide + Start from c~urrent Slide 1 @@ -1534,11 +1534,6 @@ ~Slide Show - ~Group diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h index f64e686f1e51..abd03ce5a4e4 100644 --- a/sd/inc/sdcommands.h +++ b/sd/inc/sdcommands.h @@ -94,7 +94,7 @@ #define CMD_SID_OUTLINE_TEXT_AUTOFIT ".uno.OutlineTextAutofit" #define CMD_SID_PAGESETUP ".uno:PageSetup" #define CMD_SID_PRESENTATION ".uno:Presentation" -#define CMD_SID_PRESENTATION_THIS_SLIDE ".uno:PresentationThisSlide" +#define CMD_SID_PRESENTATION_CURRENT_SLIDE ".uno:PresentationCurrentSlide" #define CMD_SID_REMOTE_DLG ".uno:Remote" #define CMD_SID_PRESENTATION_LAYOUT ".uno:PresentationLayout" #define CMD_SID_RENAMELAYER ".uno:RenameLayer" diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi index 5b717d1409dc..36ddbd897033 100644 --- a/sd/sdi/SlideSorterController.sdi +++ b/sd/sdi/SlideSorterController.sdi @@ -136,7 +136,7 @@ interface SlideSorterView ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] - SID_PRESENTATION_THIS_SLIDE // ole : no, status : ? + SID_PRESENTATION_CURRENT_SLIDE // ole : no, status : ? [ ExecMethod = FuTemporary ; StateMethod = GetMenuState ; diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 5e913a2671fa..60c22fffeb8d 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -5196,7 +5196,7 @@ SfxVoidItem Presentation SID_PRESENTATION ] //-------------------------------------------------------------------------- -SfxVoidItem PresentationThisSlide SID_PRESENTATION_THIS_SLIDE +SfxVoidItem PresentationCurrentSlide SID_PRESENTATION_CURRENT_SLIDE () [ /* flags: */ diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 9df10f5d8026..c36b7d3496bc 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -141,7 +141,7 @@ void SlotManager::FuTemporary (SfxRequest& rRequest) switch (rRequest.GetSlot()) { case SID_PRESENTATION: - case SID_PRESENTATION_THIS_SLIDE: + case SID_PRESENTATION_CURRENT_SLIDE: case SID_REHEARSE_TIMINGS: ShowSlideShow (rRequest); pShell->Cancel(); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 70f36e437e2a..36d8f7802336 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -684,7 +684,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) break; case SID_PRESENTATION: - case SID_PRESENTATION_THIS_SLIDE: + case SID_PRESENTATION_CURRENT_SLIDE: case SID_REHEARSE_TIMINGS: { ShowSlideShow(rReq); diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 6585a3c7b459..586c6c873259 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -232,7 +232,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq) break; case SID_PRESENTATION: - case SID_PRESENTATION_THIS_SLIDE: + case SID_PRESENTATION_CURRENT_SLIDE: case SID_REHEARSE_TIMINGS: { pOlView->PrepareClose(); diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 96505a5d2243..5d6a24a9e804 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -300,13 +300,12 @@ - + -