[Libreoffice-commits] .: Branch 'libreoffice-3-3' - framework/uiconfig officecfg/registry readlicense_oo/odt readlicense_oo/prj sfx2/inc

[Thorsten Behrens]

 framework/uiconfig/startmodule/menubar/menubar.xml                   |    2 +-
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |    2 +-
 readlicense_oo/odt/makefile.mk                                       |    4 +++-
 readlicense_oo/prj/d.lst                                             |    1 +
 sfx2/inc/sfx2/sfxsids.hrc                                            |    2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 90c8ee558f5dc1680e1201d24687b065b3f8e7e2
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Nov 25 23:10:13 2010 +0100

    Put show credits entry into all app ui configs
    
    * fix cmd url typo in GenericCommands.xcu
    * build & deliver credits.odt
    * avoid duplicate slot id for ShowCredits menu item

diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
index fac0b3c..5ac4c3e 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -76,7 +76,7 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:Credits"/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 15dd7d2..ed5a78e 100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4145,7 +4145,7 @@
                     <value xml:lang="en-US">License Information...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:Credits" oor:op="replace">
+            <node oor:name=".uno:ShowCredits" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">%PRODUCTNAME Credits...</value>
                 </prop>
diff --git a/readlicense_oo/odt/makefile.mk b/readlicense_oo/odt/makefile.mk
index 1e68a17..89cea1a 100644
--- a/readlicense_oo/odt/makefile.mk
+++ b/readlicense_oo/odt/makefile.mk
@@ -36,7 +36,7 @@ TARGET=odt
 
 # --- Files --------------------------------------------------------
 
-all: $(MISC)$/LICENSE.odt
+all: $(MISC)$/LICENSE.odt $(MISC)$/CREDITS.odt
 
 # --- Targets ------------------------------------------------------
 
@@ -44,3 +44,5 @@ all: $(MISC)$/LICENSE.odt
 
 $(MISC)$/LICENSE.odt: LICENSE.odt
     $(COPY) LICENSE.odt $@
+$(MISC)$/CREDITS.odt: CREDITS.odt
+    $(COPY) CREDITS.odt $@
diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst
index 2a368be..aa771c5 100644
--- a/readlicense_oo/prj/d.lst
+++ b/readlicense_oo/prj/d.lst
@@ -27,6 +27,7 @@ mkdir: %_DEST%\bin%_EXT%\ure
 ..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html
 
 ..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt
+..\%__SRC%\misc\CREDITS.odt %_DEST%\bin%_EXT%\CREDITS.odt
 
 dos: echo =====================================================================
 dos: echo Delivering README files
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 161237b..c823aaa 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -126,7 +126,7 @@
 #define SID_HELP_HELPFILEBOX				(SID_SFX_START + 419)
 #define SID_HELP_HELPFILEBOX_SELECTED		(SID_SFX_START + 420)
 #define SID_SHOW_LICENSE					(SID_SFX_START + 1683)
-#define SID_SHOW_CREDITS					(SID_SFX_START + 1684)
+#define SID_SHOW_CREDITS					(SID_SFX_START + 1711)
 #define SID_HELP_TUTORIALS					(SID_SFX_START + 1695)
 
 // default-ids for document