INTEGRATION: CWS hc680postbeta (1.3.2); FILE MERGED

2005/01/24 12:11:52 fpe 1.3.2.2: regular update
2005/01/18 12:42:35 fpe 1.3.2.1: Regular Update

1 files changed, 10 insertions, 9 deletions

diff --git a/helpcontent2/source/text/shared/01/05020200.xhp b/helpcontent2/source/text/shared/01/05020200.xhp
index 370f96fc68..fd6f1eaa37 100644
--- a/helpcontent2/source/text/shared/01/05020200.xhp
+++ b/helpcontent2/source/text/shared/01/05020200.xhp
@@ -37,8 +37,8 @@
  *  License at http://www.openoffice.org/license.html.
  *
  *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
  *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
  *  See the License for the specific provisions governing your rights and
  *  obligations concerning the Software.
@@ -62,7 +62,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-10-07T13:09:04">UFI: fix to #112392#, spec "Hidden Text in Writer"
+<lastedited date="2005-01-19T16:57:37">UFI: fix to #112392#, spec "Hidden Text in Writer"
 dedr: reviewed</lastedited>
 </history>
 </meta>
@@ -85,8 +85,6 @@ dedr: reviewed</lastedited>
 <bookmark_value>fonts; outlines</bookmark_value>
 <bookmark_value>shadows; fonts</bookmark_value>
 <bookmark_value>fonts; shadows</bookmark_value>
-<bookmark_value>blinking fonts</bookmark_value>
-<bookmark_value>flashing fonts</bookmark_value>
 <bookmark_value>colors; fonts</bookmark_value>
 <bookmark_value>fonts; colors</bookmark_value>
 </bookmark>
@@ -145,7 +143,10 @@ dedr: reviewed</lastedited>
 <paragraph role="heading" id="hd_id3163714" xml-lang="en-US" level="3" l10n="U" oldref="74">Shadows</paragraph>
 <paragraph role="paragraph" id="par_id3150962" xml-lang="en-US" l10n="U" oldref="75"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_SHADOW">Adds a shadow that casts below and to the right of the selected characters.</ahelp></paragraph>
 <switch select="appl">
-<case select="WRITER"><comment>UFI: fixed bugtraq 5031302 Blinking (and Effects) only in Writer</comment>
+<case select="WRITER">
+<bookmark xml-lang="en-US" branch="index" id="bm_id410168"><bookmark_value>blinking fonts</bookmark_value>
+<bookmark_value>flashing fonts</bookmark_value>
+</bookmark>
 <bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING" id="bm_id3159179" localize="false"/>
 <paragraph role="heading" id="hd_id3152941" xml-lang="en-US" level="3" l10n="U" oldref="15">Blinking</paragraph>
 <paragraph role="paragraph" id="par_id3145662" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING">Makes the selected characters blink. You cannot change the blink frequency.</ahelp></paragraph>
@@ -190,11 +191,11 @@ dedr: reviewed</lastedited>
 </switch>
 <bookmark xml-lang="en-US" branch="hid/.uno:Color" id="bm_id3155418" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:FontColor" id="bm_id3145801" localize="false"/>
-<paragraph role="paragraph" id="par_id3144766" xml-lang="en-US" l10n="U" oldref="84"><switchinline select="appl"><caseinline select="CHART">
-</caseinline><defaultinline><ahelp hid=".uno:FontColor" visibility="hidden"><variable id="textfarbe">Click to apply the current font color to the selected characters. You can also click here, and then drag a selection to change the text color. Click the arrow next to the icon to open the <emph>Font color </emph>toolbar. 
-</variable></ahelp></defaultinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3144766" xml-lang="en-US" l10n="CHG" oldref="84"><ahelp hid=".uno:FontColor" visibility="hidden"><variable id="textfarbe">Click to apply the current font color to the selected characters. You can also click here, and then drag a selection to change the text color. Click the arrow next to the icon to open the <emph>Font color </emph>toolbar. 
+</variable></ahelp></paragraph>
 <section id="relatedtopics">
 <embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
+<embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
 <paragraph role="paragraph" id="par_id3151053" xml-lang="en-US" l10n="C"><link href="text/shared/optionen/01010500.xhp" name="$[officename] color tables">$[officename] color tables</link></paragraph>
 <embed href="text/shared/guide/text_color.xhp#text_color"/>
 </section>