summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--reportbuilder/util/description.xml2
-rw-r--r--sdext/source/presenter/bitmaps/em47.pngbin0 -> 5448 bytes
-rw-r--r--sdext/source/presenter/bitmaps/em47_hc.pngbin0 -> 3182 bytes
-rw-r--r--sdext/source/presenter/description.xml9
-rwxr-xr-xsdext/source/presenter/help/component.txt4
-rw-r--r--sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp12
-rw-r--r--sdext/source/presenter/makefile.mk4
7 files changed, 18 insertions, 13 deletions
diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml
index 186b7a443c74..82ae8544b48b 100644
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
@@ -17,7 +17,7 @@
<OpenOffice.org-minimal-version value="3.2" d:name="OpenOffice.org 3.2"/>
</dependencies>
<publisher>
- <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Oracle.</name>
+ <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Oracle</name>
</publisher>
<icon>
<default xlink:href="images/em47.png" />
diff --git a/sdext/source/presenter/bitmaps/em47.png b/sdext/source/presenter/bitmaps/em47.png
new file mode 100644
index 000000000000..a018f1710ea5
--- /dev/null
+++ b/sdext/source/presenter/bitmaps/em47.png
Binary files differ
diff --git a/sdext/source/presenter/bitmaps/em47_hc.png b/sdext/source/presenter/bitmaps/em47_hc.png
new file mode 100644
index 000000000000..418cd1479298
--- /dev/null
+++ b/sdext/source/presenter/bitmaps/em47_hc.png
Binary files differ
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
index af1c4fee348e..8a56838ad263 100644
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -12,7 +12,7 @@
</dependencies>
<registration>
- <simple-license accept-by="admin" default-license-id="lic-en-US">
+ <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
<license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
</simple-license>
</registration>
@@ -22,11 +22,16 @@
<platform value="UPDATED_PLATFORM" />
<publisher>
- <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Sun Microsystems</name>
+ <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Oracle</name>
</publisher>
<display-name>
<name lang="en">Presenter Console</name>
</display-name>
+ <icon>
+ <default xlink:href="bitmaps/em47.png" />
+ <high-contrast xlink:href="bitmaps/em47_hc.png" />
+ </icon>
+
</description>
diff --git a/sdext/source/presenter/help/component.txt b/sdext/source/presenter/help/component.txt
index 3be173ddb89d..f6ba254895ec 100755
--- a/sdext/source/presenter/help/component.txt
+++ b/sdext/source/presenter/help/component.txt
@@ -1,3 +1 @@
-The Presenter Console Extension provides more control over your slide show
-presentation, such as the ability to see the upcoming slide, the slide notes,
-and a presentation timer whereas the audience see only the current slide.
+The Presenter Console Extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide.
diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
index dd06ace98f95..d18f2027b1fe 100644
--- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
+++ b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,11 +29,11 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textpresenterxml" indexer="include" status="PUBLISH">
- <title xml-lang="en-US" id="tit" l10n="NEW">Sun Presenter Console Keyboard Shortcuts</title>
+ <title xml-lang="en-US" id="tit" l10n="NEW">Oracle Presenter Console Keyboard Shortcuts</title>
<filename>/com.sun.PresenterScreen-PLATFORMID/presenter.xhp</filename>
</topic>
</meta>
@@ -41,8 +41,8 @@
<bookmark xml-lang="en-US" branch="hid/com.sun.PresenterScreen" id="bm_id3138439" localize="false"/>
<bookmark xml-lang="en-US" branch="index" id="bm_id0921200912285678"><bookmark_value>Presenter Console shortcuts</bookmark_value>
</bookmark>
-<paragraph xml-lang="en-US" id="hd_id0921201912165661" role="heading" level="1" l10n="NEW">Sun Presenter Console Keyboard Shortcuts</paragraph>
- <paragraph xml-lang="en-US" id="par_id0921201912165656" role="paragraph" l10n="NEW">When running a slide show using the Sun Presenter Console, you can use the following keys:</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0921201912165661" role="heading" level="1" l10n="NEW">Oracle Presenter Console Keyboard Shortcuts</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0921201912165656" role="paragraph" l10n="NEW">When running a slide show using the Oracle Presenter Console, you can use the following keys:</paragraph>
<table id="tbl_id0921200901051232">
<tablerow>
<tablecell>
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 6f3538d7f806..c6dbe7185ec9 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -231,7 +231,9 @@ COMPONENT_BITMAPS= \
\
$(ZIP1DIR)$/bitmaps$/LabelMouseOverLeft.png \
$(ZIP1DIR)$/bitmaps$/LabelMouseOverCenter.png \
- $(ZIP1DIR)$/bitmaps$/LabelMouseOverRight.png
+ $(ZIP1DIR)$/bitmaps$/LabelMouseOverRight.png \
+ $(ZIP1DIR)$/bitmaps$/em47.png \
+ $(ZIP1DIR)$/bitmaps$/em47_hc.png
COMPONENT_MANIFEST= \
$(ZIP1DIR)$/META-INF$/manifest.xml