summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <s.mehrbrodt@gmail.com>2013-04-25 13:53:33 +0200
committerFridrich Strba <fridrich@documentfoundation.org>2013-04-26 14:12:52 +0000
commitc41dfa1265c6de8045f3a7bfd248ec0f8d9fc8c3 (patch)
treeccc3adc9c16988eb7fb5f22131709298acd7cdc2
parenta4660b78efba2de2e0d4ce85f955a751038e416e (diff)
Better wording for Impress "Start from first/current Slide"
The menu is now: Slide Show Start from first Slide Start from current Slide ... instead of: Slide Show Slide Show Slide Show From This Slide ... I also changed the recently introduced function name/uno command for "Start from current Slide". This should make no trouble, since this function has not seen a release so far. Change-Id: I248c9d63ec28071b2887f89912aa90fa1e4afcb5 Reviewed-on: https://gerrit.libreoffice.org/3604 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
-rw-r--r--include/svx/svxids.hrc2
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Accelerators.xcu2
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu11
-rw-r--r--sd/inc/sdcommands.h2
-rw-r--r--sd/sdi/SlideSorterController.sdi2
-rw-r--r--sd/sdi/sdraw.sdi2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx2
-rw-r--r--sd/source/ui/view/drviewse.cxx2
-rw-r--r--sd/source/ui/view/outlnvs2.cxx2
-rw-r--r--sd/uiconfig/simpress/menubar/menubar.xml3
10 files changed, 12 insertions, 18 deletions
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 @@
</node>
<node oor:name="F5_SHIFT" oor:op="replace">
<prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
- <value xml:lang="en-US">.uno:PresentationThisSlide</value>
+ <value xml:lang="en-US">.uno:PresentationCurrentSlide</value>
</prop>
</node>
<node oor:name="F5_SHIFT_MOD2" oor:op="replace">
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 @@
</node>
<node oor:name=".uno:Presentation" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Slide Show</value>
+ <value xml:lang="en-US">Start from ~first Slide</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:PresentationThisSlide" oor:op="replace">
+ <node oor:name=".uno:PresentationCurrentSlide" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Sl~ide Show From This Slide</value>
+ <value xml:lang="en-US">Start from c~urrent Slide</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -1534,11 +1534,6 @@
<value xml:lang="en-US">~Slide Show</value>
</prop>
</node>
- <!--node oor:name=".uno:ReviewMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Review</value>
- </prop>
- </node-->
<node oor:name=".uno:GroupMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Group</value>
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 @@
<menu:menu menu:id=".uno:SlideShowMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:Presentation"/>
- <menu:menuitem menu:id=".uno:PresentationThisSlide"/>
+ <menu:menuitem menu:id=".uno:PresentationCurrentSlide"/>
<menu:menuitem menu:id=".uno:PresentationDialog"/>
<menu:menuitem menu:id=".uno:RehearseTimings"/>
<menu:menuitem menu:id=".uno:Remote"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:AnimationEffects"/>
- <!--menu:menuitem menu:id=".uno:CustomAnimationSchemes" / -->
<menu:menuitem menu:id=".uno:CustomAnimation"/>
<menu:menuitem menu:id=".uno:SlideChangeWindow"/>
<menu:menuseparator/>