summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@novell.com>2010-11-25 23:10:13 +0100
committerThorsten Behrens <tbehrens@novell.com>2010-11-25 23:13:42 +0100
commit90c8ee558f5dc1680e1201d24687b065b3f8e7e2 (patch)
tree4476d846867f8b163698f3255bcd88e4fe3c2c88
parentf10c27040a40cbc9e0b97258c1a0edc5f721d37f (diff)
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
-rw-r--r--framework/uiconfig/startmodule/menubar/menubar.xml2
-rwxr-xr-xofficecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu2
-rw-r--r--readlicense_oo/odt/makefile.mk4
-rw-r--r--readlicense_oo/prj/d.lst1
-rw-r--r--sfx2/inc/sfx2/sfxsids.hrc2
5 files changed, 7 insertions, 4 deletions
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
index fac0b3c081..5ac4c3eb4b 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 15dd7d20f6..ed5a78ee22 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 1e68a1722e..89cea1a3dc 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 2a368beb78..aa771c5011 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 161237ba54..c823aaa80a 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