- +

Icon - + Font Color @@ -57,12 +52,12 @@

- +

Icon - + Font Color @@ -72,12 +67,12 @@

- +

Icon - + Line spacing: 1 @@ -87,12 +82,12 @@

- +

Icon - + Line spacing: 1.5 @@ -102,12 +97,12 @@

- +

Icon - + Line spacing: 2 @@ -117,12 +112,12 @@

- +

Icon - + Superscript @@ -132,12 +127,12 @@

- +

Icon - + Subscript @@ -147,12 +142,12 @@

- +

Icon - + Line Style @@ -162,12 +157,12 @@

- +

Icon - + Line Color @@ -177,12 +172,12 @@

- +

Icon - + Line Width @@ -192,12 +187,12 @@

- +

Icon - + Area Style / Filling @@ -207,12 +202,12 @@

- +

Icon - + Align Top @@ -222,12 +217,12 @@

- +

Icon - + Align Bottom @@ -237,12 +232,12 @@

- +

Icon - + Align Center Vertically @@ -252,12 +247,12 @@

- +

Icon - + Apply @@ -267,12 +262,12 @@

- +

Icon - + Cancel @@ -281,12 +276,12 @@

- +

Icon - + Up One Level @@ -294,12 +289,12 @@

- +

Icon - + Create New Directory @@ -308,12 +303,12 @@

- +

Icon - + Up One Level @@ -323,12 +318,12 @@

- +

Icon - + Create New Folder @@ -338,12 +333,12 @@

- +

Icon - + Go to the previous comment @@ -353,12 +348,12 @@

- +

Icon - + Go to the next comment @@ -368,12 +363,12 @@

- +

Icon - + Open File @@ -383,12 +378,12 @@

- +

Icon - + Save As @@ -398,12 +393,12 @@

- +

Icon - + Export Directly as PDF diff --git a/source/text/shared/guide/redlining.xhp b/source/text/shared/guide/redlining.xhp index 4cd60155b9..724029a74a 100644 --- a/source/text/shared/guide/redlining.xhp +++ b/source/text/shared/guide/redlining.xhp @@ -33,17 +33,17 @@ review function; recording changes exampleTrack Changes, see review function -Recording and Displaying Changes - - The review function is available in %PRODUCTNAME for text documents and spreadsheet documents. +

Recording and Displaying Changes +

+ The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.When several authors are working on the same text or spreadsheet, the review function records and displays who made the various changes. On the final edit of the document, it is then possible to look at each individual change and decide whether it should be accepted or rejected.For example: You are an editor and are delivering your latest report. But before publication the report must be read by the senior editor and the proofreader, and both will add their changes. The senior editor writes "clarify" after one paragraph and crosses out another entirely. The proofreader corrects the spelling of your document.The edited document comes back to you, and you can incorporate or ignore the suggestions of the two reviewers.Let's say you also emailed a copy of the report to a good friend and colleague who has done research on a similar topic in the past. You asked for a few suggestions, and the document is now returned by email with your colleague's suggestions.As all your colleagues and the managers in your company work with $[officename], you can produce a final version of the document from the results you get back. -

@@ -51,5 +51,6 @@

diff --git a/source/text/shared/guide/redlining_accept.xhp b/source/text/shared/guide/redlining_accept.xhp index fa791afcb2..dbfea1cae8 100644 --- a/source/text/shared/guide/redlining_accept.xhp +++ b/source/text/shared/guide/redlining_accept.xhp @@ -30,12 +30,12 @@ changes; accepting or rejecting review function;accepting or rejecting changes -Accepting or Rejecting Changes - +

Accepting or Rejecting Changes +

The review function is available in %PRODUCTNAME for text documents and spreadsheet documents. -In Writer text documents you can also accept or reject changes by choosing commands from the context menu. +In Writer text documents you can also accept or reject changes by choosing commands from the context menu. When you edit a document in which others have made changes, you can accept or reject the changes individually or all together. diff --git a/source/text/shared/guide/redlining_doccompare.xhp b/source/text/shared/guide/redlining_doccompare.xhp index 996b16409e..3f9161a4d6 100644 --- a/source/text/shared/guide/redlining_doccompare.xhp +++ b/source/text/shared/guide/redlining_doccompare.xhp @@ -1,6 +1,4 @@ - - - @@ -36,9 +33,9 @@ changes;comparing to original review function; comparing documents mw made "comparing..." a two level entry -Comparing Versions of a Document - -The review function is available in %PRODUCTNAME for text documents and spreadsheet documents. +

Comparing Versions of a Document +

+The review function is available in %PRODUCTNAME for text documents and spreadsheet documents. Imagine you have some co-authors or reviewers who collaborate with you writing your original document. One day you send out copies of your document to all reviewers. You ask them to edit the copy and send it back. Normally, the reviewers enable change tracking by Edit - Track Changes - Record and you can easily see the changes. If one of the authors has made changes to a document without recording them, you can compare the changed document to your original document. @@ -56,7 +53,7 @@ You can now accept or reject the insertions and deletions. At the end you may save the reviewer's document as a new original with a new name. -

@@ -65,5 +62,6 @@

diff --git a/source/text/shared/guide/redlining_docmerge.xhp b/source/text/shared/guide/redlining_docmerge.xhp index 0716d545c9..3a31a80dc9 100644 --- a/source/text/shared/guide/redlining_docmerge.xhp +++ b/source/text/shared/guide/redlining_docmerge.xhp @@ -1,6 +1,4 @@ - - - @@ -34,9 +31,9 @@ merging; documents versions;merging document versions -Merging Versions - -The review function is available in %PRODUCTNAME for text documents and spreadsheet documents. +

Merging Versions +

+The review function is available in %PRODUCTNAME for text documents and spreadsheet documents. When a document has been edited by more than one person, it is possible to merge the edited copies into the original. The only requirement is that the documents differ only and exclusively in the recorded changes - all other original text must be identical. @@ -53,7 +50,7 @@ After you merge the documents you will see the recorded changes from the copy in the original document. -

@@ -62,5 +59,6 @@

diff --git a/source/text/shared/guide/redlining_enter.xhp b/source/text/shared/guide/redlining_enter.xhp index a04318a93d..397aa4fdf2 100644 --- a/source/text/shared/guide/redlining_enter.xhp +++ b/source/text/shared/guide/redlining_enter.xhp @@ -32,9 +32,9 @@ comments; on changesreview function;tracking changesUFI: deleted index review function;recording changesMW changed "settings;tracking changes" -Recording Changes - - The review function is available in %PRODUCTNAME for text documents and spreadsheet documents. +

Recording Changes +

+ The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.Not all changes are recorded. For example, the changing of a tab stop from align left to align right is not recorded. However, all usual changes made by a proofreader are recorded, such as additions, deletions, text alterations, and usual formatting.

@@ -68,7 +68,7 @@ To stop recording changes, choose Edit - Track Changes - Record again. The check mark is removed and you can now save the document. In a text document, you can highlight all lines that you have changed with an additional colored marking. This can be in the form of a red line in the margin, for example. To change the settings for tracking changes, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Changes or on the %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Calc - Changes. -

@@ -77,5 +77,6 @@

diff --git a/source/text/shared/guide/redlining_navigation.xhp b/source/text/shared/guide/redlining_navigation.xhp index 044db6b3b9..455005b6cd 100644 --- a/source/text/shared/guide/redlining_navigation.xhp +++ b/source/text/shared/guide/redlining_navigation.xhp @@ -1,5 +1,4 @@ - - - - + Protecting Records @@ -29,18 +24,18 @@ - - - + + + changes; protecting protecting; recorded changes records; protecting review function;protecting records mw added an index entry - Protecting Changes - - The review function is available in %PRODUCTNAME for text documents and spreadsheet documents. +

Protecting Changes +

+ The review function is available in %PRODUCTNAME for text documents and spreadsheet documents. To protect the changes made in a document during editing, choose Edit - Track Changes - Protect. To turn off the function or to accept or reject changes it is necessary to enter the correct password first. @@ -50,7 +45,7 @@ Enter a password consisting of at least one character and confirm it. Click OK. -

@@ -59,5 +54,6 @@

diff --git a/source/text/shared/guide/redlining_versions.xhp b/source/text/shared/guide/redlining_versions.xhp index a888cbdab7..8b86ac495c 100644 --- a/source/text/shared/guide/redlining_versions.xhp +++ b/source/text/shared/guide/redlining_versions.xhp @@ -1,7 +1,4 @@ - - - - - - + Version Management @@ -33,13 +28,12 @@ documents; version management version management -Version Management - +

Version Management +

The File menu contains a Versions command that enables you to save multiple versions of a document in the same file. You can choose to view individual versions of a document, or you can display the differences between versions with color markings. In the dialog to open a document, you can select from a combo box which version of this document you want to open.

diff --git a/source/text/shared/optionen/01040800.xhp b/source/text/shared/optionen/01040800.xhp new file mode 100644 index 0000000000..d3f82c5c6d --- /dev/null +++ b/source/text/shared/optionen/01040800.xhp @@ -0,0 +1,64 @@ + + + + + + + Comparison Options + /text/shared/optionen/01040800.xhp + + + + + document comparison;options + comparison;automatic + comparison;by word + comparison;by character + document comparison;random ID + +

+ +

Document Comparison Options

+ Defines the comparison options for the document. +

+ Open a text document, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Comparison. +

+ + + +

Compare documents

+ + + Automatic: Uses traditional algorithm for document comparison (default). + + + By word: compares documents segmenting contents word by word. + + + By characters: compares documents segmenting contents character by character. You can define the minimal number of character for the comparison. + + + +

Random Number to improve accuracy of document comparison

+ Introduce an identifier to improve accuracy of document comparison when done by word or by characters. + These options are enabled when the Compare documents options are by words or by characters. + +

Take it into account when comparing

+ Activates the document comparison using By word and By character options. + +

Ignore pieces of length

+ Set the minimum number of characters to trigger a valid comparison. + +

Store it when changing the document

+ Stores the random number in the document. + + -- cgit

To access this command... +

Open file with example: