hcshared26: merge with DEV300_m79 second try

1 files changed, 12 insertions, 8 deletions

diff --git a/helpcontent2/source/text/shared/guide/fontwork.xhp b/helpcontent2/source/text/shared/guide/fontwork.xhp
index cc28e6de8c..90247d93ce 100755
--- a/helpcontent2/source/text/shared/guide/fontwork.xhp
+++ b/helpcontent2/source/text/shared/guide/fontwork.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * 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,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedguidefontworkxml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Fontwork For Graphical Text Art</title>
@@ -42,7 +42,7 @@
       <bookmark_value>designing; fonts</bookmark_value>
       <bookmark_value>TextArt, see Fontwork</bookmark_value>
       <bookmark_value>WordArt, see Fontwork</bookmark_value>
-      <bookmark_value>Fontwork icons</bookmark_value>
+      <bookmark_value>Fontwork</bookmark_value>
       <bookmark_value>text effects</bookmark_value>
       <bookmark_value>effects; Fontwork icons</bookmark_value>
       <bookmark_value>text; Fontwork icons</bookmark_value>
@@ -60,13 +60,17 @@
             <paragraph xml-lang="en-US" id="par_id0202200911373965" role="paragraph" l10n="NEW">If you don't see the Drawing toolbar or the Fontwork toolbar, choose <item type="menuitem">View - Toolbars</item> to enable the toolbar.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_idN1069C" role="paragraph" l10n="CHG">On the <emph>Drawing</emph> toolbar or on the <emph>Fontwork</emph> toolbar, click the <emph>Fontwork Gallery</emph> icon. 
+            <paragraph xml-lang="en-US" id="par_idN1069C" role="paragraph" l10n="CHG">On the <emph>Drawing</emph> toolbar or on the <emph>Fontwork</emph> toolbar, click the <emph>Fontwork Gallery</emph> icon.
 <image id="img_id7040009" src="res/commandimagelist/sc_fontworkgalleryfloater.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id7040009">Icon</alt>
 	</image></paragraph>
          </listitem>
          <listitem>
+
+	 <bookmark xml-lang="en-US" branch="hid/HID_CTL_FONTWORK_FAVORITES" id="bm_id3156415" localize="false"/>
+<paragraph role="paragraph" id="par_id3149761" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="." visibility="hidden">Select a Fontwork style and click OK to insert the Fontwork into your document. Double-click or Ctrl+double-click the Fontwork in your document to enter text edit mode and change the text.</ahelp></paragraph>
+
             <paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">In the <emph>Fontwork Gallery</emph> dialog, select a Fontwork style and click OK.</paragraph>
-            <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">The Fontwork object is inserted into your document.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">The Fontwork object is inserted into your document. Fontwork objects are Custom Shapes. Using the 3D Settings toolbar, you can switch the view at any time from 2D to 3D and back.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_idN106A4" role="paragraph" l10n="NEW">Double-click the object to enter text edit mode.</paragraph>
@@ -117,7 +121,7 @@
       </list>
       <section id="relatedtopics">
          <paragraph xml-lang="en-US" id="par_idN108E7" role="paragraph" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork toolbar</link></paragraph>
-         <embed href="text/shared/01/05280000.xhp#hd_id3146959"/>
+         <embed href="text/shared/01/05280000.xhp#fntwrk"/>
       </section>
    </body>
 </helpdocument>
\ No newline at end of file