tdf#106195 - clarify direct formatting removal

Change-Id: Iec28e28286eac9effb2512c803fdffbad204d53a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/114522
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

2 files changed, 25 insertions, 12 deletions

diff --git a/source/text/shared/00/00000005.xhp b/source/text/shared/00/00000005.xhp
index a98c586324..7ce114ccb7 100644
--- a/source/text/shared/00/00000005.xhp
+++ b/source/text/shared/00/00000005.xhp
@@ -81,12 +81,12 @@
    <h2 xml-lang="en-US" id="hd_id3147084">DDE</h2>
    <paragraph xml-lang="en-US" id="par_id3145154" role="paragraph">DDE stands for "Dynamic Data Exchange," which is a predecessor of OLE, "Object Linking and Embedding". With DDE, objects are linked through file reference, but not embedded.</paragraph>
    <paragraph xml-lang="en-US" id="par_id3154820" role="paragraph">You can create a DDE link using the following procedure: Select cells from a Calc spreadsheet, copy them into the clipboard and switch to another spreadsheet and select the <emph>Edit - Paste Special</emph> dialog. Select <emph>the Link</emph> option to insert the contents as a DDE link. When activating a link, the inserted cell area will be read from its original file.</paragraph>
-
   </section>
   <section id="Section7">
    <h2 xml-lang="en-US" id="hd_id3150439">Direct and Style Formatting</h2>
-   <paragraph xml-lang="en-US" id="par_id3159254" role="paragraph">If you format a document without Styles, it is referred to as "direct" formatting. This means modifying text or other objects, such as frames or tables, by applying various attributes directly. The format applies only to the selected area and all changes must be made separately. Styles, on the other hand, are not applied to the text directly, but rather are defined in the Styles window and then applied. One advantage is that when you change a Style, all parts of the document to which that Style is assigned are modified at the same time.</paragraph>
-   <paragraph xml-lang="en-US" id="par_id3147287" role="paragraph">You can remove direct formatting from your document by selecting the entire text with the shortcut keys <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+A</keycode> and then choosing <menuitem>Format - Clear Direct Formatting</menuitem>.</paragraph>
+   <paragraph role="paragraph" id="par_id431619103899855">A style is a set of formatting atributes, grouped and identified by a name (the style name). When you apply a style to an object, the object is formatted with the set of attributes of the style. Several objects of same nature can have the same style. As consequence, when you change the set of formatting attributes of the style, all objects associated with the style also change their formatting attributes accordingly. Use styles to uniformly format a large set of paragraphs, cells, and objects and better manage the formatting of documents.</paragraph>
+   <paragraph xml-lang="en-US" id="par_id3159254" role="paragraph">When you do not use styles, and apply formatting attributes to parts of text directly, this is called Direct formatting (also called manual formatting). The formatting is applied only to the selected area of the document. If the document has several paragraphs, frames, or any other object, you apply direct formatting on each object. Direct formatting is available with the Format menu and with the Formatting toolbar.</paragraph>
+    <paragraph role="paragraph" id="par_id971619105747398">A direct formatting attribute applied on a object overrides the corresponding attribute of the style applied to the object.</paragraph>    
   </section>
   <section id="andocken">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155132"><bookmark_value>windows; docking definition</bookmark_value>
diff --git a/source/text/shared/01/05010000.xhp b/source/text/shared/01/05010000.xhp
index 5be40a396e..6b66f2390e 100644
--- a/source/text/shared/01/05010000.xhp
+++ b/source/text/shared/01/05010000.xhp
@@ -19,9 +19,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-
-
-		<helpdocument version="1.0">
+<helpdocument version="1.0">
 <meta>
 <topic id="textshared0105010000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Clear Direct Formatting</title>
@@ -30,16 +28,21 @@
 </meta>
 <body>
 <section id="standard">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3157959"><bookmark_value>formatting; undoing when writing</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3157959">
+<bookmark_value>formatting; undoing when writing</bookmark_value>
+<bookmark_value>paragraph;clear direct formatting</bookmark_value>
+<bookmark_value>format;clear direct formatting</bookmark_value>
+<bookmark_value>direct formatting;clear</bookmark_value>
 <bookmark_value>hyperlinks; deleting</bookmark_value>
 <bookmark_value>deleting; hyperlinks</bookmark_value>
 <bookmark_value>cells;resetting formats</bookmark_value>
-</bookmark><comment>MW changed "formats;" to "formatting;"</comment>
+</bookmark>
+  <comment>MW changed "formats;" to "formatting;"</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:ResetAttributes" id="bm_id2958684" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SetDefault" id="bm_id3244018" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:StandardTextAttributes" id="bm_id2575480" localize="false"/>
 
-<paragraph role="heading" id="hd_id3153391" xml-lang="en-US" level="1"><link href="text/shared/01/05010000.xhp" name="Clear Direct Formatting">Clear Direct Formatting</link></paragraph>
+<h1 id="hd_id3153391"><link href="text/shared/01/05010000.xhp" name="Clear Direct Formatting">Clear Direct Formatting</link></h1>
 <paragraph role="paragraph" id="par_id3145829" xml-lang="en-US"><ahelp hid=".">Removes direct formatting from the selection.</ahelp></paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3147261" xml-lang="en-US"><switchinline select="appl"><caseinline select="CHART">
@@ -48,9 +51,19 @@
 <embed href="text/shared/00/00040500.xhp#standard"/>
 </section>
 <switch select="appl">
-<case select="WRITER"><paragraph role="tip" id="par_id671594846326658">Applied character styles will not be affected by Clear Direct Formatting, only direct formatting applied on top of the character styles. To remove formatting applied by a character style, reapply the <emph>Default</emph> character style.</paragraph></case>
-<case select="WRITER"><paragraph role="tip" id="par_id3157959" xml-lang="en-US">To stop applying a direct format, such as underlining, while you type new text at the end of a line, press Shift+Ctrl+X.</paragraph>
-</case>
+  <case select="CALC"></case>
+  <case select="IMPRESS"></case>
+  <case select="DRAW"></case>
+<default>
+  <note id="par_id671594846326658">Applied styles (paragraph, character, and other types) are not affected by <emph>Clear Direct Formatting</emph>, only direct formatting applied on top of the styles. To remove formatting applied by a character or paragraph style, reapply the corresponding <emph>Default</emph> style.</note>
+  <tip id="par_id3157959" xml-lang="en-US">To stop applying a direct format, such as underlining, while you type new text at the end of a line, press <keycode>Shift+Ctrl+X</keycode>.</tip>
+  
+<note id="par_id91619108534060">Bullets and numbering are properties of lists. <emph>Clear Direct Formatting</emph> does not clear directly formatted bullets and numbering found in a paragraph. To remove the bullet and numbering applied directly to a paragraph, use the <emph>Toggle Unordered List</emph>, the <emph>Togle Ordered List</emph> or the <emph>No List</emph> icons on the Formatting toolbar.</note>
+</default>
 </switch>
+  <section id="relatedtopics">
+   <paragraph role="paragraph" localize="false" id="par_id1001619100302668"><embedvar href="text/shared/guide/undo_formatting.xhp#undo_formatting" markup="ignore"/></paragraph>
+   <paragraph role="paragraph" localize="false" id="par_id91619108461039"><embedvar href="text/shared/guide/numbering_stop.xhp#numbering_stop" markup="ignore"/></paragraph>  
+</section>
 </body>
 </helpdocument>