[Libreoffice-commits] core.git: include/svx officecfg/registry sd/inc sd/sdi sd/source sd/uiconfig

Samuel Mehrbrodt s.mehrbrodt at gmail.com
Fri Apr 26 07:13:12 PDT 2013


 include/svx/svxids.hrc                                                   |    2 -
 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu           |    2 -
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   11 ++--------
 sd/inc/sdcommands.h                                                      |    2 -
 sd/sdi/SlideSorterController.sdi                                         |    2 -
 sd/sdi/sdraw.sdi                                                         |    2 -
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx                   |    2 -
 sd/source/ui/view/drviewse.cxx                                           |    2 -
 sd/source/ui/view/outlnvs2.cxx                                           |    2 -
 sd/uiconfig/simpress/menubar/menubar.xml                                 |    3 --
 10 files changed, 12 insertions(+), 18 deletions(-)

New commits:
commit c41dfa1265c6de8045f3a7bfd248ec0f8d9fc8c3
Author: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
Date:   Thu Apr 25 13:53:33 2013 +0200

    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 at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 3c11c36..9971dcc 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 6cf3ae3..afb17b0 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 9efa408..d31e6a4 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 f64e686..abd03ce 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 5b717d1..36ddbd8 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 5e913a2..60c22ff 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 9df10f5..c36b7d3 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 70f36e4..36d8f78 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 6585a3c..586c6c8 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 96505a5..5d6a24a 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/>


More information about the Libreoffice-commits mailing list