summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2010-06-03 11:55:10 +0200
committerIvo Hinkelmann <ihi@openoffice.org>2010-06-03 11:55:10 +0200
commitc71a27b22b0fa9f82ec28b0b1bfcf354a8e42519 (patch)
treeec21f30fde671acdf4b23c81783298b18dc634a5
parent0f47e6c606365ca292c6b7681233ce3fb6f4716f (diff)
parent8f59ef66eaaf1469408ff82ffef1e91d282c471a (diff)
CWS-TOOLING: integrate CWS renaissance2ooo/DEV300_m81
-rw-r--r--helpcontent2/source/text/simpress/01/03070000.xhp12
-rw-r--r--helpcontent2/source/text/simpress/01/03130000.xhp7
-rw-r--r--helpcontent2/source/text/simpress/01/04010000.xhp4
-rw-r--r--helpcontent2/source/text/simpress/01/05120000.xhp5
-rw-r--r--helpcontent2/source/text/simpress/01/05130000.xhp11
-rwxr-xr-xhelpcontent2/source/text/simpress/main0200.xhp8
6 files changed, 22 insertions, 25 deletions
diff --git a/helpcontent2/source/text/simpress/01/03070000.xhp b/helpcontent2/source/text/simpress/01/03070000.xhp
index 0b7d6db524..4f1e6efd91 100644
--- a/helpcontent2/source/text/simpress/01/03070000.xhp
+++ b/helpcontent2/source/text/simpress/01/03070000.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,22 +29,18 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsimpress0103070000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Presentation Toolbar</title>
+<title id="tit" xml-lang="en-US">Presentation</title>
<filename>/text/simpress/01/03070000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-10T10:14:04">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="praesentation">
<bookmark xml-lang="en-US" branch="hid/.uno:CommonTaskBarVisible" id="bm_id3154013" localize="false"/>
-<paragraph role="heading" id="hd_id3153144" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/01/03070000.xhp" name="Presentation Toolbar">Presentation Toolbar</link></paragraph>
+<paragraph role="heading" id="hd_id3153144" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/01/03070000.xhp" name="Presentation">Presentation</link></paragraph>
<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CommonTaskBarVisible">Common commands for slides.</ahelp></paragraph>
</section>
<section id="howtoget">
diff --git a/helpcontent2/source/text/simpress/01/03130000.xhp b/helpcontent2/source/text/simpress/01/03130000.xhp
index 14b0ac83ec..b0bc6424d2 100644
--- a/helpcontent2/source/text/simpress/01/03130000.xhp
+++ b/helpcontent2/source/text/simpress/01/03130000.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,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsimpress0103130000xml" indexer="include" status="PUBLISH">
@@ -47,8 +47,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:Presentation" id="bm_id3150012" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SD_BTN_PRESENTATION" id="bm_id3151075" localize="false"/>
<paragraph role="heading" id="hd_id3159153" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/01/03130000.xhp" name="Slide Show">Slide Show</link></paragraph>
-<paragraph role="paragraph" id="par_id3154016" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="bldpra"><ahelp hid="HID_SD_BTN_PRESENTATION">Starts your slide show.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3154016" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="bldpra"><ahelp hid="HID_SD_BTN_PRESENTATION">Starts your slide show.</ahelp></variable></paragraph>
</section>
<section id="howtoget">
<embed href="text/simpress/00/00000403.xhp#asbsp"/>
diff --git a/helpcontent2/source/text/simpress/01/04010000.xhp b/helpcontent2/source/text/simpress/01/04010000.xhp
index 3784920070..ec8c1531b0 100644
--- a/helpcontent2/source/text/simpress/01/04010000.xhp
+++ b/helpcontent2/source/text/simpress/01/04010000.xhp
@@ -6,7 +6,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
@@ -45,7 +45,7 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_INSERTPAGE" id="bm_id8576712" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertPage" id="bm_id3149666" localize="false"/><paragraph role="heading" id="hd_id3159155" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/01/04010000.xhp" name="Insert Slide / Page">Insert Slide / Page</link></paragraph>
-<paragraph role="paragraph" id="par_id3146119" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="seitetext"><ahelp hid=".uno:InsertPage"><switchinline select="appl"><caseinline select="IMPRESS">Inserts a slide after the currently selected slide.
+<paragraph role="paragraph" id="par_id3146119" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="seitetext"><ahelp hid=".uno:InsertPage"><switchinline select="appl"><caseinline select="IMPRESS">Inserts a slide after the currently selected slide.
</caseinline><defaultinline>Inserts a page after the currently selected page.</defaultinline></switchinline></ahelp>
</variable></paragraph>
<section id="howtoget">
diff --git a/helpcontent2/source/text/simpress/01/05120000.xhp b/helpcontent2/source/text/simpress/01/05120000.xhp
index 86a80df9da..7eb687a139 100644
--- a/helpcontent2/source/text/simpress/01/05120000.xhp
+++ b/helpcontent2/source/text/simpress/01/05120000.xhp
@@ -6,7 +6,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
@@ -42,8 +42,7 @@
<body>
<bookmark xml-lang="en-US" branch="hid/SID_PRESENTATION_LAYOUT" id="bm_id8828300" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:PresentationLayout" id="bm_id3155961" localize="false"/><paragraph role="heading" id="hd_id3154253" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/01/05120000.xhp" name="Slide Design">Slide Design</link></paragraph>
-<paragraph role="paragraph" id="par_id3148485" xml-lang="en-US" l10n="U" oldref="2"><variable id="seitenvorlagetext"><ahelp hid=".uno:PresentationLayout">Displays the <emph>Slide Design</emph> dialog, where you can select a layout scheme for the current slide. Any objects in the slide design are inserted behind objects in the current slide.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3148485" xml-lang="en-US" l10n="U" oldref="2"><variable id="seitenvorlagetext"><ahelp hid=".uno:PresentationLayout">Displays the <emph>Slide Design</emph> dialog, where you can select a layout scheme for the current slide. Any objects in the slide design are inserted behind objects in the current slide.</ahelp></variable></paragraph>
<section id="howtoget">
<embed href="text/simpress/00/00000405.xhp#seitenvorlage"/>
</section>
diff --git a/helpcontent2/source/text/simpress/01/05130000.xhp b/helpcontent2/source/text/simpress/01/05130000.xhp
index ae794d7f9a..6f4b07ca63 100644
--- a/helpcontent2/source/text/simpress/01/05130000.xhp
+++ b/helpcontent2/source/text/simpress/01/05130000.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,17 +29,13 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsimpress0105130000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Slide Layout</title>
<filename>/text/simpress/01/05130000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-04T11:37:02">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154754"><bookmark_value>changing; slide layouts</bookmark_value>
@@ -53,6 +49,9 @@
<section id="howtoget">
<embed href="text/simpress/00/00000405.xhp#adnsei"/>
</section>
+
+<paragraph role="paragraph" id="par_id31469757" xml-lang="en-US" l10n="NEW"><switchinline select="appl"><caseinline select="IMPRESS">The icon in the Presentation toolbar opens a submenu. Select the slide layout for the slide.</caseinline></switchinline></paragraph>
+
<embed href="text/simpress/guide/masterpage.xhp#masterpage"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/simpress/main0200.xhp b/helpcontent2/source/text/simpress/main0200.xhp
index 05e05721fa..7f35cd873a 100755
--- a/helpcontent2/source/text/simpress/main0200.xhp
+++ b/helpcontent2/source/text/simpress/main0200.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,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsimpressmain0200xml" indexer="include" status="PUBLISH">
@@ -51,6 +51,9 @@
<section id="Section1">
<embed href="text/shared/main0201.xhp#funktionsleiste"/>
</section>
+<section id="present">
+<embed href="text/simpress/01/03070000.xhp#praesentation"/>
+</section>
<section id="Section2">
<embed href="text/simpress/main0210.xhp#werkzeugleiste"/>
</section>
@@ -92,6 +95,7 @@
</section>
<section id="Section15">
<embed href="text/simpress/02/10110000.xhp#einfuegen"/>
+<paragraph role="paragraph" id="par_id31474099" xml-lang="en-US" l10n="NEW">Add objects, including charts, spreadsheets, and images, to your document.</paragraph>
</section>
</sort>
</body>