From 0566fe1d60f5e764fea219e11683e8b0dbf498eb Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Wed, 7 Jan 2009 16:36:05 +0000 Subject: CWS-TOOLING: integrate CWS menuchanges 2009-01-07 17:12:18 +0100 mod r265974 : throw out comment tracking accellerator 2009-01-07 16:23:35 +0100 mod r265972 : CWS-TOOLING: rebase CWS menuchanges to trunk@265758 (milestone: DEV300:m38) 2008-12-03 16:21:15 +0100 mod r264798 : menu shortcut fixes 2008-12-03 15:53:23 +0100 mod r264794 : some shortcut changes 2008-12-02 13:35:56 +0100 fredrikh r264696 : i96794 2008-12-01 20:09:07 +0100 fredrikh r264633 : i96768 2008-12-01 20:08:37 +0100 fredrikh r264632 : i96768 2008-12-01 16:40:18 +0100 fredrikh r264619 : i96762 2008-12-01 16:37:37 +0100 fredrikh r264618 : i96762 2008-12-01 16:37:09 +0100 fredrikh r264617 : i96762 2008-12-01 13:14:43 +0100 fredrikh r264595 : i90650 2008-11-28 18:26:38 +0100 fredrikh r264569 : i94758 2008-11-28 18:22:31 +0100 fredrikh r264568 : i94758 2008-11-28 12:46:26 +0100 fredrikh r264541 : i94758 2008-11-26 16:58:51 +0100 fredrikh r264423 : i96625 2008-11-26 16:14:10 +0100 fredrikh r264412 : i96623 2008-11-26 16:13:02 +0100 fredrikh r264410 : i96623 2008-11-25 19:46:42 +0100 fredrikh r264330 : i96359 2008-11-25 13:50:34 +0100 fredrikh r264307 : i96556 2008-11-25 13:49:46 +0100 fredrikh r264306 : i96556 2008-11-25 13:48:32 +0100 fredrikh r264305 : i96556 2008-11-25 13:46:55 +0100 fredrikh r264304 : i96556 2008-11-25 13:45:29 +0100 fredrikh r264303 : i96357 2008-11-25 13:42:11 +0100 fredrikh r264302 : i96556 & i94758 2008-11-25 13:34:54 +0100 fredrikh r264301 : i96556 2008-11-25 13:33:30 +0100 fredrikh r264300 : i96556 2008-11-25 13:32:31 +0100 fredrikh r264299 : i96556 2008-11-25 13:31:57 +0100 fredrikh r264298 : i96556 2008-11-25 13:31:27 +0100 fredrikh r264297 : i96556 2008-11-25 13:30:31 +0100 fredrikh r264295 : i96556 2008-11-25 13:29:29 +0100 fredrikh r264294 : i96556 2008-11-25 13:28:17 +0100 fredrikh r264292 : i96556 2008-11-25 13:27:44 +0100 fredrikh r264290 : i96556 2008-11-25 13:26:54 +0100 fredrikh r264288 : i96556 2008-11-25 13:25:03 +0100 fredrikh r264287 : i96556 2008-11-25 13:21:29 +0100 fredrikh r264286 : i96556 2008-11-19 16:14:07 +0100 fredrikh r264004 : i96359 2008-11-19 14:35:43 +0100 fredrikh r263995 : i96353 2008-11-19 14:05:58 +0100 fredrikh r263991 : i96347 2008-11-19 14:05:36 +0100 fredrikh r263990 : i96347 2008-11-19 14:05:07 +0100 fredrikh r263989 : i96347 2008-11-19 13:11:59 +0100 fredrikh r263983 : i96347 2008-11-19 13:00:09 +0100 fredrikh r263982 : i96347 2008-10-29 14:54:51 +0100 mod r262804 : 94633 2008-10-29 14:54:10 +0100 mod r262803 : #i94633# 2008-10-29 12:58:38 +0100 ufi r262787 : i94958,3rd 2008-10-29 12:42:41 +0100 ufi r262783 : i94958,2nd 2008-10-29 12:00:23 +0100 ufi r262777 : i94958 2008-10-28 23:45:34 +0100 mod r262766 : #i95457# 2008-10-18 19:09:38 +0200 mod r262295 : accelerator change 2008-10-17 15:45:11 +0200 mod r262289 : fix typo 2008-10-15 23:17:04 +0200 mod r262245 : menu fix 2008-10-15 22:58:30 +0200 mod r262244 : fix footnote setting dialog 2008-10-15 22:58:01 +0200 mod r262243 : further changes to menu 2008-10-14 10:27:46 +0200 mod r262195 : new accelerator and menu changes 2008-10-14 10:27:37 +0200 mod r262194 : new accelerator and menu changes 2008-10-07 14:23:26 +0200 mod r262081 : #i79329# #i85158# #i88351# 2008-10-02 10:31:52 +0200 mod r262026 : #i94551# 2008-10-02 10:23:57 +0200 mod r262025 : #i87347# --- helpcontent2/source/text/scalc/01/02110000.xhp | 122 ++++++----- helpcontent2/source/text/scalc/guide/auto_off.xhp | 12 +- helpcontent2/source/text/scalc/guide/finding.xhp | 20 +- helpcontent2/source/text/scalc/main0102.xhp | 22 +- helpcontent2/source/text/scalc/main0103.xhp | 23 ++- helpcontent2/source/text/scalc/main0106.xhp | 25 ++- helpcontent2/source/text/sdraw/main0102.xhp | 19 +- helpcontent2/source/text/sdraw/main0103.xhp | 19 +- helpcontent2/source/text/sdraw/main0106.xhp | 26 ++- helpcontent2/source/text/shared/00/00000402.xhp | 75 +++---- helpcontent2/source/text/shared/00/00000406.xhp | 31 ++- helpcontent2/source/text/shared/00/00040500.xhp | 89 ++++---- helpcontent2/source/text/shared/00/00040502.xhp | 152 +++++++------- helpcontent2/source/text/shared/01/02230401.xhp | 69 +++---- helpcontent2/source/text/shared/01/06040000.xhp | 33 +-- helpcontent2/source/text/shared/01/06040100.xhp | 95 +++++---- helpcontent2/source/text/shared/01/06040200.xhp | 2 +- helpcontent2/source/text/shared/01/06040400.xhp | 28 ++- helpcontent2/source/text/shared/01/06040500.xhp | 20 +- helpcontent2/source/text/shared/02/01220000.xhp | 74 +++---- helpcontent2/source/text/shared/02/03200000.xhp | 5 +- .../source/text/shared/guide/autocorr_url.xhp | 24 +-- .../source/text/shared/guide/line_intext.xhp | 59 +++--- .../source/text/shared/guide/lineend_define.xhp | 24 +-- .../source/text/shared/guide/linestyle_define.xhp | 29 +-- .../source/text/shared/guide/paintbrush.xhp | 9 + .../source/text/shared/guide/protection.xhp | 223 ++++++++++----------- .../source/text/shared/guide/space_hyphen.xhp | 14 +- helpcontent2/source/text/simpress/main0102.xhp | 22 +- helpcontent2/source/text/simpress/main0103.xhp | 18 +- helpcontent2/source/text/simpress/main0106.xhp | 25 ++- helpcontent2/source/text/swriter/00/00000404.xhp | 88 ++++---- helpcontent2/source/text/swriter/00/00000405.xhp | 147 +++++++++++++- helpcontent2/source/text/swriter/00/00000406.xhp | 32 ++- helpcontent2/source/text/swriter/01/02110000.xhp | 122 ++++++----- helpcontent2/source/text/swriter/01/02150000.xhp | 42 ++-- helpcontent2/source/text/swriter/01/04030000.xhp | 24 +-- helpcontent2/source/text/swriter/01/04130000.xhp | 30 ++- helpcontent2/source/text/swriter/01/05150000.xhp | 35 ++-- helpcontent2/source/text/swriter/01/05150100.xhp | 35 ++-- helpcontent2/source/text/swriter/01/05150200.xhp | 37 ++-- helpcontent2/source/text/swriter/01/05150300.xhp | 33 ++- helpcontent2/source/text/swriter/01/06080000.xhp | 42 ++-- helpcontent2/source/text/swriter/01/06090000.xhp | 22 +- .../source/text/swriter/guide/auto_numbering.xhp | 85 ++++---- .../source/text/swriter/guide/auto_off.xhp | 44 ++-- .../source/text/swriter/guide/auto_spellcheck.xhp | 28 +-- .../source/text/swriter/guide/autocorr_except.xhp | 23 +-- .../source/text/swriter/guide/footnote_usage.xhp | 47 ++--- .../text/swriter/guide/nonprintable_text.xhp | 26 +-- .../text/swriter/guide/removing_line_breaks.xhp | 28 ++- .../source/text/swriter/guide/smarttags.xhp | 27 ++- .../source/text/swriter/guide/text_centervert.xhp | 26 +-- .../source/text/swriter/guide/text_frame.xhp | 14 +- .../source/text/swriter/guide/word_completion.xhp | 27 ++- helpcontent2/source/text/swriter/main0102.xhp | 20 +- helpcontent2/source/text/swriter/main0103.xhp | 18 +- helpcontent2/source/text/swriter/main0104.xhp | 21 +- helpcontent2/source/text/swriter/main0106.xhp | 25 ++- 59 files changed, 1334 insertions(+), 1222 deletions(-) (limited to 'helpcontent2') diff --git a/helpcontent2/source/text/scalc/01/02110000.xhp b/helpcontent2/source/text/scalc/01/02110000.xhp index 632a406a23..828a6bccbc 100644 --- a/helpcontent2/source/text/scalc/01/02110000.xhp +++ b/helpcontent2/source/text/scalc/01/02110000.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + Navigator /text/scalc/01/02110000.xhp @@ -50,131 +48,155 @@ scenarios;displaying names mw made "navigating..." a two level entry and deleted "navigating;data range" -Navigator + +Navigator Activates and deactivates the Navigator. The Navigator is a dockable window.
- +
-Choose Edit - Navigator to display the Navigator. -Column +Choose View - Navigator to display the Navigator. + +Column Enter the column letter. Press Enter to reposition the cell cursor to the specified column in the same row. -Row + +Row Enter a row number. Press Enter to reposition the cell cursor to the specified row in the same column. -Data Range + +Data Range Specifies the current data range denoted by the position of the cell cursor. - + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Data Range
-Start + + +Start Moves to the cell at the beginning of the current data range, which you can highlight using the Data Range button. - + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Start
-End + + +End Moves to the cell at the end of the current data range, which you can highlight using the Data Range button. - + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + End
-Toggle + + +Toggle Toggles the content view. Only the selected Navigator element and its subelements are displayed. Click the icon again to restore all elements for viewing. - + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Toggle
-Contents + + +Contents Allows you to hide/show the contents. - + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Contents
-Scenarios + + +Scenarios Displays all available scenarios. Double-click a name to apply that scenario. The result is shown in the sheet. For more information, choose Tools - Scenarios. - + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Scenarios
+ If the Navigator displays scenarios, you can access the following commands when you right-click a scenario entry: -Delete + +Delete Deletes the selected scenario. -Properties + +Properties Opens the Edit scenario dialog, where you can edit the scenario properties. -Drag Mode + +Drag Mode Opens a submenu for selecting the drag mode. You decide which action is performed when dragging and dropping an object from the Navigator into a document. Depending on the mode you select, the icon indicates whether a hyperlink, link or a copy is created. - + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Drag Mode
-Insert as Hyperlink + + +Insert as Hyperlink Inserts a hyperlink when you drag-and-drop an object from the Navigator into a document. You can later click the created hyperlink to set the cursor and the view to the respective object. If you insert a hyperlink that links to an open document, you need to save the document before you can use the hyperlink.UFI: fixes bugtraq 5009354 -Insert as Link + +Insert as Link Creates a link when you drag-and-drop an object from the Navigator into a document. -Insert as Copy + +Insert as Copy Generates a copy when you drag-and-drop an object from the Navigator into a document. -Objects + +Objects Displays all objects in your document. -Documents + +Documents Displays the names of all open documents. To switch to another open document in the Navigator, click the document name. The status (active, inactive) of the document is shown in brackets after the name. You can switch the active document in the Window menu. diff --git a/helpcontent2/source/text/scalc/guide/auto_off.xhp b/helpcontent2/source/text/scalc/guide/auto_off.xhp index 946c53516d..cb183bab62 100755 --- a/helpcontent2/source/text/scalc/guide/auto_off.xhp +++ b/helpcontent2/source/text/scalc/guide/auto_off.xhp @@ -10,7 +10,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: auto_off.xhp,v $ + * $RCSfile: soffice2xmlhelp.xsl,v $ * $Revision: 1.8.4.1 $ * * This file is part of OpenOffice.org. @@ -72,14 +72,16 @@ $[officename] Calc automatically converts certain entries to dates. For example, the entry 1.1 may be interpreted as January 1 of the current year, according to the locale settings of your operating system, and then displayed according to the date format applied to the cell.for sure 1.1 will not be interpreted as a date in the USofA !! To ensure that an entry is interpreted as text, add an apostrophe at the beginning of the entry. The apostrophe is not displayed in the cell. Quotation marks replaced by custom quotes -Choose Tools - AutoCorrect. Go to the Custom Quotes tab and unmark Replace. +Choose Tools - AutoCorrect Options. Go to the Custom Quotes tab and unmark Replace. Cell content always begins with uppercase -Choose Tools - AutoCorrect. Go to the Options tab. Unmark Capitalize first letter of every sentence. +Choose Tools - AutoCorrect + Options. Go to the Options tab. Unmark Capitalize first letter of every sentence. Replace word with another word -Choose Tools - AutoCorrect. Go to the Replace tab. Select the word pair and click Delete. +Choose Tools - AutoCorrect + Options. Go to the Replace tab. Select the word pair and click Delete.
Tools - Cell Contents - AutoInput -Tools - AutoCorrect +Tools - AutoCorrect Options
diff --git a/helpcontent2/source/text/scalc/guide/finding.xhp b/helpcontent2/source/text/scalc/guide/finding.xhp index ca65b40dc2..a9fead5784 100644 --- a/helpcontent2/source/text/scalc/guide/finding.xhp +++ b/helpcontent2/source/text/scalc/guide/finding.xhp @@ -1,8 +1,8 @@ - - + + + - - + Finding and Replacing in Calc text/scalc/guide/finding.xhp - -Find Replace main page - -
@@ -86,7 +82,7 @@ When you click Find, Calc will select the next cell that contains your text. You can watch and edit the text, then click Find again to advance to the next found cell. - + If you closed the dialog, you can press a key combination (CommandCtrl+Shift+F) to find the next cell without opening the dialog. @@ -96,9 +92,9 @@ When you click Find All, Calc selects all cells that contain your entry. Now you can for example set all found cells to bold, or apply a Cell Style to all at once. The Navigator - + -Choose Edit - Navigator to open the Navigator window. +Choose View - Navigator to open the Navigator window. The Navigator is the main tool for finding and selecting objects. diff --git a/helpcontent2/source/text/scalc/main0102.xhp b/helpcontent2/source/text/scalc/main0102.xhp index e896ff97ee..7664419655 100755 --- a/helpcontent2/source/text/scalc/main0102.xhp +++ b/helpcontent2/source/text/scalc/main0102.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + Edit /text/scalc/main0102.xhp
-Edit + +Edit This menu contains commands for editing the contents of the current document.
@@ -61,7 +60,6 @@ Find & Replace - Headers & Footers diff --git a/helpcontent2/source/text/scalc/main0103.xhp b/helpcontent2/source/text/scalc/main0103.xhp index ae04d503eb..4b80db4ea9 100755 --- a/helpcontent2/source/text/scalc/main0103.xhp +++ b/helpcontent2/source/text/scalc/main0103.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + View /text/scalc/main0103.xhp
-View + +View This menu contains commands for controlling the on-screen display of the document.
-Normal + +Normal Displays the normal view of the sheet. @@ -57,6 +57,7 @@ + Zoom diff --git a/helpcontent2/source/text/scalc/main0106.xhp b/helpcontent2/source/text/scalc/main0106.xhp index 8d20cd9d15..a798bfc5a2 100755 --- a/helpcontent2/source/text/scalc/main0106.xhp +++ b/helpcontent2/source/text/scalc/main0106.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + Tools /text/scalc/main0106.xhp
-Tools + +Tools The Tools menu contains commands to check spelling, to trace sheet references, to find mistakes and to define scenarios.
You can also create and assign macros and configure the look and feel of toolbars, menus, keyboard, and set the default options for $[officename] applications. -AutoCorrect - Goal Seek @@ -65,6 +62,8 @@ +AutoCorrect Options + Customize diff --git a/helpcontent2/source/text/sdraw/main0102.xhp b/helpcontent2/source/text/sdraw/main0102.xhp index df945dfc01..d259cf9f0b 100755 --- a/helpcontent2/source/text/sdraw/main0102.xhp +++ b/helpcontent2/source/text/sdraw/main0102.xhp @@ -1,8 +1,8 @@ - - + + + - - + Edit /text/sdraw/main0102.xhp - -Sun Microsystems, Inc. -converted from old format - fpe -
@@ -59,7 +55,6 @@ Find & Replace - Points Enables you to edit points on your drawing. Glue points diff --git a/helpcontent2/source/text/sdraw/main0103.xhp b/helpcontent2/source/text/sdraw/main0103.xhp index d6ad466b5e..cd13e52496 100755 --- a/helpcontent2/source/text/sdraw/main0103.xhp +++ b/helpcontent2/source/text/sdraw/main0103.xhp @@ -1,7 +1,8 @@ - - - + ************************************************************************ + --> + - - + View /text/sdraw/main0103.xhp - -Sun Microsystems, Inc. -converted from old format - fpe -
@@ -58,6 +56,7 @@ + Zoom diff --git a/helpcontent2/source/text/sdraw/main0106.xhp b/helpcontent2/source/text/sdraw/main0106.xhp index 13274a4cfa..9f2957e146 100755 --- a/helpcontent2/source/text/sdraw/main0106.xhp +++ b/helpcontent2/source/text/sdraw/main0106.xhp @@ -1,7 +1,8 @@ - - - + ************************************************************************ + --> + - - + Tools /text/sdraw/main0106.xhp - -Sun Microsystems, Inc. -converted from old format - fpe -
@@ -49,14 +47,14 @@
-AutoCorrect - +AutoCorrect Options + Customize diff --git a/helpcontent2/source/text/shared/00/00000402.xhp b/helpcontent2/source/text/shared/00/00000402.xhp index 96a06dd7c1..42fdf8dd94 100644 --- a/helpcontent2/source/text/shared/00/00000402.xhp +++ b/helpcontent2/source/text/shared/00/00000402.xhp @@ -1,7 +1,8 @@ - - - + ************************************************************************ + --> + - - + Edit Menu /text/shared/00/00000402.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - Edit Menu @@ -52,12 +55,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Undo @@ -72,12 +75,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Redo @@ -95,12 +98,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Cut @@ -116,12 +119,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Copy @@ -137,12 +140,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Paste @@ -159,12 +162,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Select All @@ -184,7 +187,7 @@
Choose Edit - Changes - Accept or Reject - List tab -Choose Format - AutoFormat - Apply and Edit Changes. AutoFormat dialog appears, click Edit Changes button, see List tab page +Choose Format - AutoCorrect - Apply and Edit Changes. AutoCorrect dialog appears, click Edit Changes button, see List tab page
Choose Edit - Changes - Accept or Reject - Filter tab @@ -206,12 +209,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Find & Replace @@ -229,17 +232,17 @@ On Form Design Bar, click Record Search - Similarity search check box - ... button (form view)
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Navigator On/Off diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp index 1416163299..bd190df209 100644 --- a/helpcontent2/source/text/shared/00/00000406.xhp +++ b/helpcontent2/source/text/shared/00/00000406.xhp @@ -49,7 +49,11 @@ +<<<<<<< .working +{ENTER ALTERNATE DESCRIPTION HERE} +======= {ENTER ALTERNATE DESCRIPTION HERE} +>>>>>>> .merge-right.r265757 @@ -75,8 +79,13 @@ {ENTER ALTERNATE DESCRIPTION HERE} +<<<<<<< .working + +Spellcheck +======= Spelling and Grammar +>>>>>>> .merge-right.r265757
@@ -104,8 +113,12 @@
Choose Tools - Media Player +<<<<<<< .working +Choose Tools - Macros - Organize Macros - %PRODUCTNAME Basic, or press Alt+F11 (if not assigned by your system) +======= Choose Tools - Macros - Organize Macros - %PRODUCTNAME Basic, or press Option Alt+F11 (if not assigned by your system) +>>>>>>> .merge-right.r265757
Choose Tools - Macros - Record Macro @@ -138,22 +151,33 @@ Choose Tools - Customize - Events tab Choose Tools - AutoCorrect + Options Choose Tools - AutoCorrect +<<<<<<< .working + Options +- Options tab +======= - Optionstab +>>>>>>> .merge-right.r265757 -Choose Tools - AutoCorrect- Smart Tags tab +Choose Tools - AutoCorrect Options- Smart Tags tab Choose Tools - AutoCorrect + Options - Replace tab Choose Tools - AutoCorrect + Options - Exceptions tab Choose Tools - AutoCorrect + Options - Custom Quotes tab -Choose Tools - AutoCorrect - Word Completion tab +Choose Tools - AutoCorrect + Options + - Word Completion tab Choose Tools - Options - %PRODUCTNAME Calc - View @@ -310,7 +334,8 @@ Open a spreadsheet document, choose Tools - Options - %PRODUCTNAME Calc - Changes -Open a presentation document, choose Tools - Options - %PRODUCTNAME Impress +Open a presentation document, choose Tools +- Options - %PRODUCTNAME Impress Open a presentation document, choose Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - General diff --git a/helpcontent2/source/text/shared/00/00040500.xhp b/helpcontent2/source/text/shared/00/00040500.xhp index 4ce02e5353..36585d1c46 100644 --- a/helpcontent2/source/text/shared/00/00040500.xhp +++ b/helpcontent2/source/text/shared/00/00040500.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + Format Menu /text/shared/00/00040500.xhp @@ -54,16 +51,17 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Character
+
@@ -74,24 +72,30 @@ Choose Format - Legend - Character tab (Chart documents) Choose Format - Axis - Character tab (Chart documents) -Choose Format - Cell - Font tab (spreadsheets) + +Choose Format - Cell - Font tab (spreadsheets) Menu Format - Page - Header/Footer - Edit button (spreadsheets) -
+ +
Choose Format - Character - Font Effects tab Choose Format - Styles and Formatting - open context menu of an entry and choose Modify/New - Font Effects tab -Menu Format - Page - Header/Footer - Edit button (spreadsheets) + +Menu Format - Page - Header/Footer - Edit button (spreadsheets) -
+ +
Choose Format - Character - Position tab Choose Format - Styles and Formatting - open context menu of an entry and click Modify/New - Alignment tab -Menu Format - Page - Header/Footer - Edit button (spreadsheets) + +Menu Format - Page - Header/Footer - Edit button (spreadsheets) -
+ +
Choose Format - Character - Asian Layout tab Choose Format - Styles and Formatting - open context menu of an entry and click Modify/New - Asian Layout tab @@ -112,16 +116,17 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Paragraph
+
@@ -141,7 +146,7 @@ (all options only in Writer or Calc) Choose Format - Paragraph - Borders tab Choose Format - Picture - Borders tab -Choose Format - Frame - Borders tab +Choose Format - Frame/Object - Borders tab Choose Format - Page - Borders tab Choose Format - Styles and Formatting - open context menu of an entry and choose Modify/New - Borders tab Choose Format - Page - Header - More button @@ -159,7 +164,7 @@ Choose Format - Paragraph - Background tab Choose Format - Character - Background tab Choose Format - Picture - Background tab -Choose Format - Frame - Background tab +Choose Format - Frame/Object - Background tab Choose Format - Page - Background tab Choose Format - Page - Header - More button Choose Format - Page - Footer - More button @@ -191,16 +196,17 @@ On Formatting Bar, click - + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Styles and Formatting
+
@@ -211,18 +217,19 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + 3D Effects
+
Choose Format - 3D Effects - Geometry tab @@ -242,16 +249,17 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Bullets On/Off
+
@@ -295,20 +303,23 @@ - + +
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Crop
+ -
+ +
Choose Format - Change Case diff --git a/helpcontent2/source/text/shared/00/00040502.xhp b/helpcontent2/source/text/shared/00/00040502.xhp index 2dd9f43da2..7e0eff3118 100644 --- a/helpcontent2/source/text/shared/00/00040502.xhp +++ b/helpcontent2/source/text/shared/00/00040502.xhp @@ -1,8 +1,8 @@ - - + + + - - + Format Menu /text/shared/00/00040502.xhp - -Sun Microsystems, Inc. -UFI: tried to fix #i22595# - Format Menu @@ -54,12 +50,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Line @@ -68,7 +64,7 @@
-Choose Format - Object - +Choose Format - Drawing Object - Graphic - Line - Line tab @@ -81,18 +77,18 @@ Choose Format - Chart Floor - Borders tab (charts) Choose Format - Chart Area - Borders tab (charts)
-Choose Format - Object - +Choose Format - Drawing Object - Graphic - Line - Line Styles tab -Choose Format - Object - +Choose Format - Drawing Object - Graphic - Line - Arrow Styles tab
-Choose Format - Object - +Choose Format - Drawing Object - Graphic - Area @@ -101,12 +97,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Area @@ -115,7 +111,7 @@
-Choose Format - Object - +Choose Format - Drawing Object - Graphic - Area - Area tab @@ -128,7 +124,7 @@ Choose Format - Page - Background tab (in $[officename] Impress and $[officename] Draw)
-Choose Format - Object - +Choose Format - Drawing Object - Graphic - Area - Colors tab @@ -149,45 +145,45 @@ Choose Format - Object Properties - Data Point - Transparency - tab (chart documents) Choose Format - Object Properties - Data Series - Transparency tab (chart documents)
-Choose Format - Object - +Choose Format - Drawing Object - Graphic - Area - Shadow tab -Choose Format - Object - +Choose Format - Drawing Object - Graphic - Area - Gradients tab -Choose Format - Object - +Choose Format - Drawing Object - Graphic - Area - Hatching tab -Choose Format - Object - +Choose Format - Drawing Object - Graphic - Area - Bitmaps tab -Choose Format - Object - Text - Text Attributes +Choose Format - Drawing Object - Text - Text Attributes Graphic - Define Text Attributes Text -Choose Format - Object - Text - Text Attributes +Choose Format - Drawing Object - Text - Text Attributes Graphic - Define Text Attributes Text - Text tab -Choose Format - Object - Text - Text Attributes +Choose Format - Drawing Object - Text - Text Attributes Graphic - Define Text Attributes Text - Text Animation tab
-Choose Format - Object - +Choose Format - Drawing Object - Graphic - Position and Size @@ -199,12 +195,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Position and SizeUFI: in Form Design toolbar @@ -219,39 +215,39 @@ Open the context menu for the object - choose Description -Choose Format - Object - +Choose Format - Drawing Object - Graphic - Position and Size - Position and Size tab
-Choose Format - Object - +Choose Format - Drawing Object - Graphic - Position and Size - Rotation tab
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Rotate
-Choose Format - Object - +Choose Format - Drawing Object - Graphic - Position and Size - Slant & Corner Radius tab -Choose Format - Object - +Choose Format - Drawing Object - Graphic - -Position and Size - Legend tab (only for textbox callouts, not for custom shapes callouts) +Position and Size - Legend tab (only for textbox callouts, not for custom shapes callouts)
Choose Edit - Points @@ -265,12 +261,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Edit Points @@ -297,12 +293,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Bold @@ -316,12 +312,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Italic @@ -335,12 +331,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Underline @@ -391,12 +387,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Align Left @@ -411,12 +407,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Align Right @@ -431,12 +427,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Align Center Horizontally Centered @@ -452,12 +448,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Justified @@ -480,12 +476,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Group @@ -501,12 +497,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Ungroup @@ -522,12 +518,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Exit Group @@ -543,12 +539,12 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Enter Group diff --git a/helpcontent2/source/text/shared/01/02230401.xhp b/helpcontent2/source/text/shared/01/02230401.xhp index 8f82e240ec..deed07c0a1 100644 --- a/helpcontent2/source/text/shared/01/02230401.xhp +++ b/helpcontent2/source/text/shared/01/02230401.xhp @@ -1,7 +1,8 @@ - - - - + ************************************************************************ + --> + + - + List /text/shared/01/02230401.xhp - -Sun Microsystems, Inc. -converted from old format - fpe -
@@ -48,60 +47,56 @@ Accept or reject individual changes.
- +
-The List tab displays all of the changes that were recorded in the current document. If you want to filter this list, click the Filter tab, and then select your filter criteria. - If the list contains nested changes, the dependencies are shown regardless of the filter. +The List tab displays all of the changes that were recorded in the current document. If you want to filter this list, click the Filter tab, and then select your filter criteria. If the list contains nested changes, the dependencies are shown regardless of the filter. - -Nested changes occur where changes made by different authors overlap. +Nested changes occur where changes made by different authors overlap. - -Click the plus sign beside an entry in the list to view all of the changes that were recorded for a cell. +Click the plus sign beside an entry in the list to view all of the changes that were recorded for a cell. - -If one of the nested changes for a cell matches a filter criterion, all of the changes for the cell are displayed. When you filter the change list, the entries in the list appear in different colors according to the following table: +If one of the nested changes for a cell matches a filter criterion, all of the changes for the cell are displayed. When you filter the change list, the entries in the list appear in different colors according to the following table: -
+
- + Color - + Meaning - + black - + The entry matches a filter criterion. - + blue - + One or more subentries matches a filter criterion. - + gray - + The subentry does not match a filter criterion. - + green - + The subentry matches a filter criterion. @@ -113,16 +108,13 @@ Selection fieldLists the changes that were recorded in the document. When you select an entry in the list, the change is highlighted in the document. To sort the list, click a column heading. Hold down Command Ctrl while you click to select multiple entries in the list.To edit the comment for an entry in the list, right-click the entry, and then choose Edit - Comment. - After you accept or reject a change, the entries of the list are re-ordered according to "Accepted" or "Rejected" status. Action Lists the changes that were made in the document. - -Position +Position - -Lists the cells with contents that were changed. +Lists the cells with contents that were changed. Author @@ -148,15 +140,12 @@ To reverse the acceptance or rejection of a change, choose Undo on the Edit menu. - - -Undo +Undo - -If you made changes by choosing Format - AutoFormat - Apply and Edit Changes, the Undo button appears in the dialog. Reverse the last Accept or Reject command. +If you made changes by choosing Format - AutoCorrect - Apply and Edit Changes, the Undo button appears in the dialog. Reverse the last Accept or Reject command. There are additional commands in the context menu of the list: diff --git a/helpcontent2/source/text/shared/01/06040000.xhp b/helpcontent2/source/text/shared/01/06040000.xhp index 0350c7d079..24853ba211 100644 --- a/helpcontent2/source/text/shared/01/06040000.xhp +++ b/helpcontent2/source/text/shared/01/06040000.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + AutoCorrect /text/shared/01/06040000.xhp @@ -47,11 +45,12 @@ AutoFormat function; switching on and off -AutoCorrect + +AutoCorrect Sets the options for automatically replacing text as you type.
- +
@@ -62,7 +61,7 @@ The AutoCorrect settings are applied when you press the Spacebar after you enter a word. -To turn on or to turn off the AutoCorrect feature, in $[officename] Calc choose Tools - Cell Contents - AutoInput, and in $[officename] Writer choose Format - AutoFormat - While Typing. To apply the AutoFormat settings to an entire text document, choose Format - AutoFormat - Apply. +To turn on or to turn off the AutoCorrect feature, in $[officename] Calc choose Tools - Cell Contents - AutoInput, and in $[officename] Writer choose Format - AutoCorrect - While Typing. To apply the AutoCorrect settings to an entire text document, choose Format - AutoCorrect - Apply. @@ -74,9 +73,11 @@ -
-AutoFormat + +
+AutoCorrect
- + + diff --git a/helpcontent2/source/text/shared/01/06040100.xhp b/helpcontent2/source/text/shared/01/06040100.xhp index f43d6e7f57..00059a9cc2 100644 --- a/helpcontent2/source/text/shared/01/06040100.xhp +++ b/helpcontent2/source/text/shared/01/06040100.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + Options /text/shared/01/06040100.xhp @@ -71,14 +69,16 @@ -Options + +Options Select the options for automatically correcting errors as you type, and then click OK.
-In text documents, you can choose to apply the AutoCorrect corrections while you type [T], or only when you modify existing text [M] with Format - AutoFormat - Apply. + +In text documents, you can choose to apply the AutoCorrect corrections while you type [T], or only when you modify existing text [M] with Format - AutoCorrect - Apply. When you choose to modify existing text with all options deselected, still all "Default" paragraph styles will be converted to "Text body" styles. see i72339Don't use inline switches for notes, tips and warnings. The icon will still show up. @@ -89,7 +89,8 @@ Capitalize first letter of every sentence. Capitalizes the first letter of every sentence. -The first letter in a Calc cell will never be capitalized automatically.see i78661 + +The first letter in a Calc cell will never be capitalized automatically.see i78661 Automatic *bold* and _underline_ @@ -101,66 +102,68 @@ Replaces 1/2, 1/4, 3/4 with the corresponding fraction characters. Replace 1st ... with 1^st ... Displays the text characters of ordinals, such as 1st, 2nd, or 3rd, as superscripts. -Replace DashesUFI: changed switches, added table, #61325#UFI: see i73558 for name: not the dashes are replaced but the hyphens (or even better the minus signs)Replaces one or two hyphens with a long dash (see the following table). +Replace DashesUFI: changed switches, added table, #61325#UFI: see i73558 for name: not the dashes are replaced but the hyphens (or even better the minus signs) +Replaces one or two hyphens with a long dash (see the following table). Text will be replaced after you type a trailing white space (space, tab, or return). In the following table, the A and B represent text consisting of letters A to z or digits 0 to 9.
- + Text that you type: - + Result that you get: - + A - B (A, space, minus, space, B) - + A – B (A, space, en-dash, space, B) - + A -- B (A, space, minus, minus, space, B) - + A – B (A, space, en-dash, space, B) - + A--B (A, minus, minus, B) - + A—B (A, em-dash, B)
(see note below the table) - + A-B (A, minus, B) - + A-B (unchanged) - + A -B (A, space, minus, B) - + A -B (unchanged) - + A --B (A, space, minus, minus, B) - + A –B (A, space, en-dash, B)
+ If the text has the Hungarian or Finnish language attribute, then two hyphens in the sequence A--B are replaced by an en-dash instead of an em-dash.i71908 Delete spaces and tabs at beginning and end of paragraph @@ -179,60 +182,62 @@ To cancel automatic numbering when you press Enter at the end of a line that starts with a numbering symbol, press Enter again. -The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style. + +The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style. -Apply border + +Apply border Automatically applies a border at the base of the preceding paragraph when you type three or more specific characters, and then press Enter. To create a single line, type three or more hyphens (-), or underscores ( _ ), and then press Enter. To create a double line, type three or more equal signs (=), asterisks (*), tildes (~), or hash marks (#), and then press Enter. To delete the created line, click the paragraph above the line, choose Format - Paragraph - Borders, delete the bottom border. The following table summarizes the line thickness for the different characters: - + --- - + 0.5pt single underline - + ___ - + 1.0pt single underline - + === - + 1.1pt double underline - + *** - + 4.5pt double underline - + ~~~ - + 6.0pt double underline - + ### - + 9.0pt double underline @@ -252,7 +257,8 @@ Automatically replaces the "Default" paragraph style with the Heading 1 to Heading 8 paragraph styles. To apply the Heading 1 paragraph style, type the text that you want to use as a heading (without a period), and then press Enter twice. To apply a sub-heading, press Tab one or more times, type the text (without a period), and then press Enter. Remove blank paragraphs -UFI: test if this also only applies to Default, body and body indented, or to all para stylesRemoves empty paragraphs from the current document when you choose Format - AutoFormat - Apply. +UFI: test if this also only applies to Default, body and body indented, or to all para styles +Removes empty paragraphs from the current document when you choose Format - AutoCorrect - Apply. Replace Custom Styles @@ -271,7 +277,8 @@ Combines consecutive single-line paragraphs into a single paragraph. This option only works on paragraphs that use the "Default" paragraph style. If a paragraph is longer than the specified length value, the paragraph is combined with the next paragraph. To enter a different length value, select the option, and then click Edit. -Edit + +Edit Modifies the selected AutoCorrect option. diff --git a/helpcontent2/source/text/shared/01/06040200.xhp b/helpcontent2/source/text/shared/01/06040200.xhp index 6a052cc546..c69588c9e2 100644 --- a/helpcontent2/source/text/shared/01/06040200.xhp +++ b/helpcontent2/source/text/shared/01/06040200.xhp @@ -54,7 +54,7 @@ Replace Edits the replacement table for automatically correcting or replacing words or abbreviations in your document. -To enable the replacement table, choose Tools - AutoCorrect, click the Options tab, and then select Use replacement table. To use the replacement table while you type, choose Format - AutoFormat - While Typing. +To enable the replacement table, choose Tools - AutoCorrect Options, click the Options tab, and then select Use replacement table. To use the replacement table while you type, choose Format - AutoCorrect - While Typing.
diff --git a/helpcontent2/source/text/shared/01/06040400.xhp b/helpcontent2/source/text/shared/01/06040400.xhp index 08001e4c09..33db44e9c7 100755 --- a/helpcontent2/source/text/shared/01/06040400.xhp +++ b/helpcontent2/source/text/shared/01/06040400.xhp @@ -1,7 +1,8 @@ - - - + ************************************************************************ + --> + - - + Custom Quotes /text/shared/01/06040400.xhp - -Sun Microsystems, Inc. -converted from old format - fpe -
@@ -52,7 +50,7 @@ Specify the AutoCorrect options for quotation marks in your document.
- +
Single quotes / Double quotes Specify the replacement characters to use for single or double quotation marks. @@ -67,13 +65,13 @@ Start quote -Select the special character that will automatically replace the current opening quotation mark in your document when you choose Format - AutoFormat - Apply. +Select the special character that will automatically replace the current opening quotation mark in your document when you choose Format - AutoCorrect - Apply. End quote -Select the special character that will automatically replace the current closing quotation mark in your document when you choose Format - AutoFormat - Apply. +Select the special character that will automatically replace the current closing quotation mark in your document when you choose Format - AutoCorrect - Apply. diff --git a/helpcontent2/source/text/shared/01/06040500.xhp b/helpcontent2/source/text/shared/01/06040500.xhp index fee830584e..4f94b681ce 100755 --- a/helpcontent2/source/text/shared/01/06040500.xhp +++ b/helpcontent2/source/text/shared/01/06040500.xhp @@ -1,8 +1,8 @@ - - + + + - - + AutoCorrect context menu /text/shared/01/06040500.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - AutoCorrect function; context menu @@ -68,7 +64,7 @@ AutoCorrect -To always replace the highlighted word, click a word in the list. The word pair is stored in the replacement table under Tools - AutoCorrect - Replace. +To always replace the highlighted word, click a word in the list. The word pair is stored in the replacement table under Tools - AutoCorrect Options - Replace. Word is <name of language> Changes the language settings for the highlighted word, if the word is found in another dictionary. diff --git a/helpcontent2/source/text/shared/02/01220000.xhp b/helpcontent2/source/text/shared/02/01220000.xhp index 97fa279e40..c7378a509d 100644 --- a/helpcontent2/source/text/shared/02/01220000.xhp +++ b/helpcontent2/source/text/shared/02/01220000.xhp @@ -1,7 +1,8 @@ - - - + ************************************************************************ + --> + + - -Navigator + +Navigator /text/shared/02/01220000.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - - - - - You can also call the Navigator by selecting Edit - Navigator Edit - Navigator Edit - Navigator Edit - Navigator Edit - Navigator -
-
- - - - - - Icon - - - Navigator On/Off - - - -
-
- - + +You can also call the Navigator by selecting View - Navigator +View - Navigator +View - Navigator +View - Navigator +View - Navigator +
+ + + + +{ENTER ALTERNATE DESCRIPTION HERE} + + + +Navigator On/Off + + +
+ +
+ diff --git a/helpcontent2/source/text/shared/02/03200000.xhp b/helpcontent2/source/text/shared/02/03200000.xhp index 5c87ff4b70..14d1ac51d0 100644 --- a/helpcontent2/source/text/shared/02/03200000.xhp +++ b/helpcontent2/source/text/shared/02/03200000.xhp @@ -49,11 +49,8 @@ Change Anchor
Allows you to switch between anchoring options. - The Change Anchor icon is only visible when an object such as a graphic, control field or frame + The Change Anchor icon is only visible when an object such as a graphic or control field or frame is selected. - -You can anchor an object to the page, to a paragraph, or as a character. If the object is surrounded by a frame, it is possible to anchor it to the frame. -You can anchor an object to the page, to a paragraph or as a character. Further information about the anchoring is contained in the Anchoring Help section. diff --git a/helpcontent2/source/text/shared/guide/autocorr_url.xhp b/helpcontent2/source/text/shared/guide/autocorr_url.xhp index 8bbd2ce403..851d823829 100755 --- a/helpcontent2/source/text/shared/guide/autocorr_url.xhp +++ b/helpcontent2/source/text/shared/guide/autocorr_url.xhp @@ -1,7 +1,8 @@ - - - - - + ************************************************************************ + --> + - - + Turning off Automatic URL Recognition /text/shared/guide/autocorr_url.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - AutoCorrect function; URL recognition @@ -58,7 +54,7 @@ When you enter text, $[officename] automatically recognizes a word that may be a URL and replaces the word with a hyperlink. $[officename] formats the hyperlink with direct font attributes (color and underline) the properties of which are obtained from certain Character Styles. If you do not want $[officename] to automatically recognize URLs as you are typing, there are several ways of turning off this feature. Undo URL Recognition - + When you are typing and notice that a text has just been automatically converted into a hyperlink, press CommandCtrl+Z to undo this formatting. @@ -73,7 +69,7 @@ If you want to modify the URL recognition for text documents, open a text document. -Choose Tools - AutoCorrect. +Choose Tools - AutoCorrect Options. In the AutoCorrect dialog, select the Options tab. diff --git a/helpcontent2/source/text/shared/guide/line_intext.xhp b/helpcontent2/source/text/shared/guide/line_intext.xhp index 5bfa517ce1..001bd5d320 100644 --- a/helpcontent2/source/text/shared/guide/line_intext.xhp +++ b/helpcontent2/source/text/shared/guide/line_intext.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + Drawing Lines in Text /text/shared/guide/line_intext.xhp @@ -57,54 +55,57 @@ To define the line attributes and direction, use the Line drawing object as follows: - + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + 1. - + On the Standard bar, click the Show Draw Functions icon to open the Drawing toolbar, and click the Line icon. The mouse pointer changes to a cross-hair symbol with a line beside it. - - + + + 2. - + In your document, click where the line should begin. Hold down the mouse button and drag to the point where you want the line to end. If you also hold down the Shift key, you can draw only horizontal, vertical, and diagonal lines. - + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + 3. - + Release the mouse button once the line has the desired direction and length. You can then draw more lines. End this function by pressing the Esc key or by clicking the Select icon from the Drawing bar. - - + + + 4. - + After clicking the Select icon, you can select all of the lines at the same time by clicking each line while holding down the Shift key. This multiple selection enables you to assign all of them a common color, width or other attribute.
- + + Create a horizontal line by applying the preset Paragraph Style Horizontal Line. Click into an empty paragraph, and double-click the Horizontal Line Style in the Styles and Formatting window. If the entry for horizontal lines is not visible in the list of Paragraph Styles, select "All Styles" in the lower listbox. @@ -113,9 +114,9 @@ Automatic lines in Writer - + -If you start a new line in a Writer text document by typing three or more hyphen characters and press the Enter key, the characters are removed and the previous paragraph gets a line as a bottom border. +If you start a new line in a Writer text document by typing three or more hyphen characters and press the Enter key, the characters are removed and the previous paragraph gets a line as a bottom border. To create a single line, type three or more hyphens (-), or underscores ( _ ), and then press Enter. To create a double line, type three or more equal signs (=), asterisks (*), tildes (~), or hash marks (#), and then press Enter. @@ -125,7 +126,7 @@ To undo an automatic border replacement once, choose Edit - Undo. -To disable the automatic borders, choose Tools - AutoCorrect - Options and clear Apply border. +To disable the automatic borders, choose Tools - AutoCorrect Options - Options and clear Apply border. The lines and other drawing objects that you insert in text are not defined in HTML, and are therefore not exported directly into HTML format. Instead, they are exported as graphics. diff --git a/helpcontent2/source/text/shared/guide/lineend_define.xhp b/helpcontent2/source/text/shared/guide/lineend_define.xhp index 5bb031c1f5..e0ead9a6f2 100755 --- a/helpcontent2/source/text/shared/guide/lineend_define.xhp +++ b/helpcontent2/source/text/shared/guide/lineend_define.xhp @@ -1,8 +1,8 @@ - - + + + - - + Defining Line Ends /text/shared/guide/lineend_define.xhp - -Sun Microsystems, Inc. -FPE: Deleted screenshot. Cleaned. - defining; arrowheads and other line ends @@ -57,7 +53,11 @@ Use the draw functions to create an object to be used as a line end. -Select the object and choose Format - Object - Line. +Select the object and choose Format - Drawing Object - +Graphic - + + +Line. In the dialog, click the Arrow Styles. diff --git a/helpcontent2/source/text/shared/guide/linestyle_define.xhp b/helpcontent2/source/text/shared/guide/linestyle_define.xhp index ad145368f9..d952faeb16 100755 --- a/helpcontent2/source/text/shared/guide/linestyle_define.xhp +++ b/helpcontent2/source/text/shared/guide/linestyle_define.xhp @@ -1,7 +1,8 @@ - - - + ************************************************************************ + --> + - - + Defining Line Styles /text/shared/guide/linestyle_define.xhp - -Sun Microsystems, Inc. -FPE: Deleted screenshot. Cleaned -dedr: reviewed - line styles;defining @@ -54,7 +51,11 @@ dedr: reviewed Select a line drawing object in a document. -Choose Format - Object - Line and click the Line Styles tab. +Choose Format - Drawing Object - +Graphic - + + +Line and click the Line Styles tab. Specify the line options that you want. diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp index 0ee5980242..3a01cb4a87 100755 --- a/helpcontent2/source/text/shared/guide/paintbrush.xhp +++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp @@ -60,7 +60,11 @@ On the Standard Bar, click the Format Paintbrush icon. The cursor changes to a paint bucket. If you want to apply the formatting to more than one selection, double-click the Format Paintbrush icon +<<<<<<< .working +{ENTER ALTERNATE DESCRIPTION HERE} +======= {ENTER ALTERNATE DESCRIPTION HERE} +>>>>>>> .merge-right.r265757 . After you apply all the formatting, click the icon again. @@ -108,8 +112,13 @@ Object is selected +<<<<<<< .working + +Copies the object formatting that is defined in the Format - Graphics or Format - Drawing Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied. +======= Copies the object formatting that is defined in the Format - Graphics or Format - Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied. +>>>>>>> .merge-right.r265757 diff --git a/helpcontent2/source/text/shared/guide/protection.xhp b/helpcontent2/source/text/shared/guide/protection.xhp index 3e09969b3f..b42a207520 100644 --- a/helpcontent2/source/text/shared/guide/protection.xhp +++ b/helpcontent2/source/text/shared/guide/protection.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - -Protecting Content in %PRODUCTNAME + +Protecting Content in %PRODUCTNAME /text/shared/guide/protection.xhp - - - protecting; contents protected contents contents protection @@ -57,109 +52,101 @@ OLE objects;protecting graphics;protecting frames;protecting - - mw moved 4 index entries to swriter/guide/protection.xhp - Protecting Content in %PRODUCTNAME +mw moved 4 index entries to swriter/guide/protection.xhp +Protecting Content in %PRODUCTNAME - The following is an overview of the different ways of protecting contents in %PRODUCTNAME from being modified, deleted or viewed. - Protecting All Documents When Saving - All documents that are saved in OpenDocument format can be saved with a password. Documents that are saved with a password cannot be opened without the password. The content is secured so that it cannot be read with an external editor. This applies to content, graphics and OLE objects. - - - - - - Turning on protection - - - Choose File - Save As and mark the Save with password check box. Save the document. - - - - - Turning off protection - - - Open the document, entering the correct password. Choose File - Save As and clear the Save with password check box. - - -
- Information entered in File - Properties is not encrypted. This includes the name of the author, creation date, word and character counts. - Protecting Revision Marking - With every change made in %PRODUCTNAME Calc and %PRODUCTNAME Writer, the review function records who made the change. This function can be turned on with protection, so that it can only be turned off when the correct password is entered. Until then, all changes will continue to be recorded. Acceptance or rejection of changes is not possible. - - - - - - Turning on protection - - - Choose Edit - Changes - Protect Records. Enter and confirm a password of at least 5 characters. - - - - - Turning off protection - - - Choose Edit - Changes - Protect Records. Enter the correct password. - - -
- MW moved contents of "Protecting Cell Ranges in StarOffice Calc" to the Calc guides cell_protect.xhp and cell_unprotect.xhp. - MW moved Writer specific contents to the new writer guide protection.xhp - Protecting Frames, Graphics, and OLE Objects - You can protect the content, position and size of inserted graphics. The same applies to frames (in Writer) and OLE objects. - - - - - - Turning on protection - - - For example, for graphics inserted in Writer: Choose Format - Graphics - Options tab. Under Protect, mark Contents, Position and/or Size. - - - - - Turning off protection - - - For example, for graphics inserted in Writer: Choose Format - Graphics - Options tab. Under Protect, unmark as appropriate. - - -
- Protecting Drawing Objects and Form Objects - The draw objects that you insert into your documents with the Drawing toolbar can be protected from being accidentally moved or changed in size. You can do the same with form objects inserted with the Form Controls toolbar. - - - - - - Turning on protection - - - Choose Format - Object - Position and Size - Position and Size tab. Mark the Position or Size check box. - - - - - Turning off protection - - - Choose Format - Object - Position and Size - Position and Size tab. Unmark the Position or Size check box. - - -
- removed webdav text, see i71792 - MW moved "Opening Microsoft Office Documents That Are Protected With a Password" to shared/guide/ms_import_export_limitations.xhp - - - - - Protecting Content in %PRODUCTNAME Writer - Protecting Cells in %PRODUCTNAME Calc - +The following is an overview of the different ways of protecting contents in %PRODUCTNAME from being modified, deleted or viewed. +Protecting All Documents When Saving +All documents that are saved in OpenDocument format can be saved with a password. Documents that are saved with a password cannot be opened without the password. The content is secured so that it cannot be read with an external editor. This applies to content, graphics and OLE objects. + + + +Turning on protection + + +Choose File - Save As and mark the Save with password check box. Save the document. + + + + +Turning off protection + + +Open the document, entering the correct password. Choose File - Save As and clear the Save with password check box. + + +
+ +Information entered in File - Properties is not encrypted. This includes the name of the author, creation date, word and character counts. +Protecting Revision Marking +With every change made in %PRODUCTNAME Calc and %PRODUCTNAME Writer, the review function records who made the change. This function can be turned on with protection, so that it can only be turned off when the correct password is entered. Until then, all changes will continue to be recorded. Acceptance or rejection of changes is not possible. + + + +Turning on protection + + +Choose Edit - Changes - Protect Records. Enter and confirm a password of at least 5 characters. + + + + +Turning off protection + + +Choose Edit - Changes - Protect Records. Enter the correct password. + + +
+MW moved contents of "Protecting Cell Ranges in StarOffice Calc" to the Calc guides cell_protect.xhp and cell_unprotect.xhp.MW moved Writer specific contents to the new writer guide protection.xhp +Protecting Frames, Graphics, and OLE Objects +You can protect the content, position and size of inserted graphics. The same applies to frames (in Writer) and OLE objects. + + + +Turning on protection + + +For example, for graphics inserted in Writer: Choose Format - Graphics - Options tab. Under Protect, mark Contents, Position and/or Size. + + + + +Turning off protection + + +For example, for graphics inserted in Writer: Choose Format - Graphics - Options tab. Under Protect, unmark as appropriate. + + +
+ +Protecting Drawing Objects and Form Objects +The draw objects that you insert into your documents with the Drawing toolbar can be protected from being accidentally moved or changed in size. You can do the same with form objects inserted with the Form Controls toolbar. + + + +Turning on protection + + +Choose Format - Drawing Object - Position and Size - Position and Size tab. Mark the Position or Size check box. + + + + +Turning off protection + + +Choose Format - Drawing Object - Position and Size - Position and Size tab. Unmark the Position or Size check box. + + +
+removed webdav text, see i71792MW moved "Opening Microsoft Office Documents That Are Protected With a Password" to shared/guide/ms_import_export_limitations.xhp + + + + + +Protecting Content in %PRODUCTNAME Writer +Protecting Cells in %PRODUCTNAME Calc + diff --git a/helpcontent2/source/text/shared/guide/space_hyphen.xhp b/helpcontent2/source/text/shared/guide/space_hyphen.xhp index 796a9db11b..a67d920de0 100755 --- a/helpcontent2/source/text/shared/guide/space_hyphen.xhp +++ b/helpcontent2/source/text/shared/guide/space_hyphen.xhp @@ -1,9 +1,8 @@ - - - - + + - + Edit /text/simpress/main0102.xhp
-Edit + +Edit This menu contains commands for editing the contents of the current document.
@@ -57,7 +56,6 @@ Find & Replace - Duplicate Points diff --git a/helpcontent2/source/text/simpress/main0103.xhp b/helpcontent2/source/text/simpress/main0103.xhp index dccda2938f..be05aee654 100755 --- a/helpcontent2/source/text/simpress/main0103.xhp +++ b/helpcontent2/source/text/simpress/main0103.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + View /text/simpress/main0103.xhp
-View + +View This menu contains commands for controlling the on-screen display of the document.
@@ -62,6 +61,7 @@ + Zoom diff --git a/helpcontent2/source/text/simpress/main0106.xhp b/helpcontent2/source/text/simpress/main0106.xhp index 6512455bb6..893a021172 100755 --- a/helpcontent2/source/text/simpress/main0106.xhp +++ b/helpcontent2/source/text/simpress/main0106.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + Tools /text/simpress/main0106.xhp
-Tools + +Tools Contains spelling tools, a gallery of object art that you can add to your document, as well as tools for configuring menus, and setting program preferences.
-AutoCorrect - +AutoCorrect Options + Customize diff --git a/helpcontent2/source/text/swriter/00/00000404.xhp b/helpcontent2/source/text/swriter/00/00000404.xhp index bae3e97c9b..b81496ce3f 100644 --- a/helpcontent2/source/text/swriter/00/00000404.xhp +++ b/helpcontent2/source/text/swriter/00/00000404.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + Insert Menu /text/swriter/00/00000404.xhp @@ -74,16 +72,17 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Insert Fields
+
Choose Insert - Fields - Other - Document tab @@ -108,16 +107,17 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Section
+
Choose Insert - Section - Section tab or choose Format - Sections @@ -125,38 +125,40 @@ Choose Insert - Section - Indents tab or choose Format - Sections
-Footnote: Choose Insert - Footnote +Choose Insert - Footnote/Endnote -Open context menu - choose Footnote (inserted Footnote/Endnote) +Open context menu - choose Footnote/Endnote (inserted Footnote/Endnote) Open Insert toolbar, click
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Insert Footnote Directly
+
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Insert Endnote Directly
+
Choose Insert - Caption @@ -177,16 +179,17 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Bookmark
+
Choose Insert - Script (only HTML documents) @@ -200,16 +203,17 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Entry
+
Choose Insert - Indexes and Tables - Indexes and Tables @@ -254,7 +258,8 @@ Choose Insert - Indexes and Tables - Indexes and Tables - Entries tab (when Bibliography is the selected type) -Choose Insert - Indexes and Tables - Bibliography Entry and click Edit +Choose Insert - Indexes and Tables - +Bibliography Entry and click Edit Choose Insert - Indexes and Tables - Indexes and Tables - Styles tab @@ -269,22 +274,23 @@
Choose Insert - Frame -Choose Format - Frame +Choose Format - Frame/Object Open Insert toolbar, click
- + -Frame +{ENTER ALTERNATE DESCRIPTION HERE} - + Insert Frame Manually
+
@@ -296,16 +302,17 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Table
+
Choose Insert - Horizontal Line @@ -317,16 +324,17 @@
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + File
+
Choose Insert - Header diff --git a/helpcontent2/source/text/swriter/00/00000405.xhp b/helpcontent2/source/text/swriter/00/00000405.xhp index ae349c9ef0..46708e8126 100644 --- a/helpcontent2/source/text/swriter/00/00000405.xhp +++ b/helpcontent2/source/text/swriter/00/00000405.xhp @@ -70,7 +70,7 @@
Choose Format - Page - Columns tab -Choose Format - Frame - Columns tab +Choose Format - Frame/Object - Columns tab Choose Format - Styles and Formatting - open context menu Modify/New - Columns tab Choose Insert - Frame - Columns tab Choose Insert/Format - Section(s) - Columns tab @@ -95,13 +95,13 @@
Choose Format - Styles and Formatting - open context menu Modify/New (for Numbering Styles)
-Choose Format - AutoFormat - While Typing +Choose Format - AutoCorrect - While Typing -Choose Format - AutoFormat +Choose Format - AutoCorrect -Choose Format - AutoFormat - Apply +Choose Format - AutoCorrect - Apply -Choose Format - AutoFormat - Apply and Edit Changes +Choose Format - AutoCorrect - Apply and Edit Changes Choose Table - AutoFormat (with cursor in a table) @@ -117,7 +117,11 @@ +<<<<<<< .working +{ENTER ALTERNATE DESCRIPTION HERE} +======= {ENTER ALTERNATE DESCRIPTION HERE} +>>>>>>> .merge-right.r265757 @@ -130,13 +134,13 @@
Choose Format - Picture - Type tab -Choose Format - Frame - Type tabUFI: removed some lines with Format-Object, see #i64150 +Choose Format - Frame/Object - Type tabUFI: removed some lines with Format-Object, see #i64150 Choose Format - Styles and Formatting - open context menu Modify/New - Type tab Choose Insert - Frame - Type tab
Choose Format - Picture - Wrap tab -Choose Format - Frame - Wrap tab +Choose Format - Frame/Object - Wrap tab Choose Insert - Frame - Wrap tab Choose Format - Wrap @@ -145,12 +149,12 @@
Choose Format - Picture - Hyperlink tab -Choose Format - Frame - Hyperlink tab +Choose Format - Frame/Object - Hyperlink tab Choose Insert - Frame - Hyperlink tab
Choose Format - Picture - Options tab -Choose Format - Frame - Options tab +Choose Format - Frame/Object - Options tab Choose Format - Styles and Formatting - open context menu Modify/New - Options tab Choose Insert - Frame - Options tab
@@ -158,7 +162,7 @@
Choose Insert/Format - Picture - Macro tab -Choose Insert/Format - Frame - Macro tab +Choose Insert/Format - Frame/Object - Macro tab Choose Edit - AutoText - AutoText (button) - Macro Choose Edit - ImageMap - open context menu - Macro @@ -180,6 +184,49 @@ Right-click in a table, choose Cell +<<<<<<< .working +
+Choose Table - Merge Cells + +On the Table Bar, click +
+ + + + +{ENTER ALTERNATE DESCRIPTION HERE} + + + +Merge Cells + + +
+ +
+
+
+Choose Table - Split Cells + +On the Table Bar, click +
+ + + + +{ENTER ALTERNATE DESCRIPTION HERE} + + + +Split Cells + + +
+ +
+
+======= +>>>>>>> .merge-right.r265757 In the context menu of a cell, choose Cell - Protect
@@ -200,7 +247,11 @@ +<<<<<<< .working +{ENTER ALTERNATE DESCRIPTION HERE} +======= {ENTER ALTERNATE DESCRIPTION HERE} +>>>>>>> .merge-right.r265757 @@ -211,6 +262,29 @@
+<<<<<<< .working +
+Choose Table - Autofit - Distribute Rows Equally + +Open Optimize toolbar from Table Bar, click +
+ + + + +{ENTER ALTERNATE DESCRIPTION HERE} + + + +Distribute Rows Equally + + +
+ +
+
+======= +>>>>>>> .merge-right.r265757 Choose Table - Select - Row
@@ -222,7 +296,11 @@ +<<<<<<< .working +{ENTER ALTERNATE DESCRIPTION HERE} +======= {ENTER ALTERNATE DESCRIPTION HERE} +>>>>>>> .merge-right.r265757 @@ -247,7 +325,11 @@ +<<<<<<< .working +{ENTER ALTERNATE DESCRIPTION HERE} +======= {ENTER ALTERNATE DESCRIPTION HERE} +>>>>>>> .merge-right.r265757 @@ -258,6 +340,29 @@
+<<<<<<< .working +
+Choose Table - Autofit - Distribute Columns Equally + +Open Optimize toolbar from Table Bar, click +
+ + + + +{ENTER ALTERNATE DESCRIPTION HERE} + + + +Space Columns Equally + + +
+ +
+
+======= +>>>>>>> .merge-right.r265757 Choose Table - Select - Column
@@ -270,7 +375,11 @@ +<<<<<<< .working +{ENTER ALTERNATE DESCRIPTION HERE} +======= {ENTER ALTERNATE DESCRIPTION HERE} +>>>>>>> .merge-right.r265757 @@ -280,7 +389,11 @@ +<<<<<<< .working +{ENTER ALTERNATE DESCRIPTION HERE} +======= {ENTER ALTERNATE DESCRIPTION HERE} +>>>>>>> .merge-right.r265757 @@ -299,7 +412,11 @@ +<<<<<<< .working +{ENTER ALTERNATE DESCRIPTION HERE} +======= {ENTER ALTERNATE DESCRIPTION HERE} +>>>>>>> .merge-right.r265757 @@ -311,14 +428,18 @@
-Choose Format - Frame +Choose Format - Frame/Object
+<<<<<<< .working +{ENTER ALTERNATE DESCRIPTION HERE} +======= {ENTER ALTERNATE DESCRIPTION HERE} +>>>>>>> .merge-right.r265757 @@ -334,7 +455,11 @@ +<<<<<<< .working +{ENTER ALTERNATE DESCRIPTION HERE} +======= {ENTER ALTERNATE DESCRIPTION HERE} +>>>>>>> .merge-right.r265757 diff --git a/helpcontent2/source/text/swriter/00/00000406.xhp b/helpcontent2/source/text/swriter/00/00000406.xhp index e8a7b59576..abceda496f 100755 --- a/helpcontent2/source/text/swriter/00/00000406.xhp +++ b/helpcontent2/source/text/swriter/00/00000406.xhp @@ -1,8 +1,8 @@ - - + + + - - + Tools Menu /text/swriter/00/00000406.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - Tools Menu @@ -54,13 +50,13 @@ Choose Tools - Outline Numbering - Numbering tab -Choose Tools - Line Numbering (not for HTML format) +Choose Tools - Line Numbering (not for HTML format) -Choose Tools - Footnotes +Choose Tools - Footnotes/Endnotes -Choose Tools - Footnotes - Footnotes tab +Choose Tools - Footnotes/Endnotes - Footnotes tab -Choose Tools - Footnotes - Endnotes tab +Choose Tools - Footnotes/Endnotes - Endnotes tab Choose Table - Convert - Text to Table @@ -97,12 +93,12 @@ Click Mail Merge icon on the Table Data bar:
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Mail Merge diff --git a/helpcontent2/source/text/swriter/01/02110000.xhp b/helpcontent2/source/text/swriter/01/02110000.xhp index f691e49433..f35b46f63b 100644 --- a/helpcontent2/source/text/swriter/01/02110000.xhp +++ b/helpcontent2/source/text/swriter/01/02110000.xhp @@ -1,7 +1,8 @@ - - - + ************************************************************************ + --> + - - + Navigator /text/swriter/01/02110000.xhp - -Sun Microsystems, Inc. -converted from old format - fpe -dedr: fixed #i31269# -FPE: Deleted screenshot -
- +
-To open the Navigator, choose Edit - Navigator. To move the Navigator, drag its title bar. To dock the Navigator, drag its title bar to the left or to the right edge of the workspace. To undock the Navigator, double-click in a free area of the Navigator. +To open the Navigator, choose View - Navigator. To move the Navigator, drag its title bar. To dock the Navigator, drag its title bar to the left or to the right edge of the workspace. To undock the Navigator, double-click in a free area of the Navigator. Click the plus sign (+) next to a category in the Navigator to view the items in the category. To view the number of items in a category, rest your mouse pointer over the category in the Navigator. To jump to an item in the document, double-click the item in the Navigator. To jump to the next or previous item in a document, click the Navigation icon to open the Navigation toolbar, click the item category, and then click the up or down arrows. A hidden section in a document appears gray in the Navigator, and displays the text "hidden" when you rest the mouse pointer over it. The same applies to header and footer contents of Page Styles that are not used in a document, and hidden contents in tables, text frames, graphics, OLE objects, and indexes. @@ -63,12 +59,12 @@ FPE: Deleted screenshot Switches between master view and normal view if a master document is open.Switches between master view and normal view if a master document is open.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Toggle @@ -80,12 +76,12 @@ FPE: Deleted screenshotTo continue the search, click the Repeat Search icon on the Navigation toolbar.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Navigation @@ -96,12 +92,12 @@ FPE: Deleted screenshotJumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, "Graphics".Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, "Graphics".
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Previous Object @@ -112,12 +108,12 @@ FPE: Deleted screenshotJumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, "Graphics".Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, "Graphics".
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Next Object @@ -133,12 +129,12 @@ FPE: Deleted screenshotShows or hides the Navigator list.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + List box on/off @@ -149,12 +145,12 @@ FPE: Deleted screenshotSwitches between the display of all categories in the Navigator and the selected category.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Switch Content View @@ -166,12 +162,12 @@ FPE: Deleted screenshotClick here to set a reminder at the current cursor position. You can define up to five reminders. To jump to a reminder, click the Navigation icon, in the Navigation window click the Reminder icon, and then click the Previous or Next button.Click here to set a reminder at the current cursor position. You can define up to five reminders. To jump to a reminder, click the Navigation icon, in the Navigation window click the Reminder icon, and then click the Previous or Next button.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Set Reminder @@ -182,12 +178,12 @@ FPE: Deleted screenshotMoves the cursor to the header, or from the header to the document text area.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Header @@ -198,12 +194,12 @@ FPE: Deleted screenshotMoves the cursor to the footer, or from the footer to the document text area.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Footer @@ -214,12 +210,12 @@ FPE: Deleted screenshotJumps between the footnote text and the footnote anchor.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Anchor <-> Text @@ -230,12 +226,12 @@ FPE: Deleted screenshotSets the drag and drop options for inserting items from the Navigator into a document, for example, as a hyperlink. Click this icon, and then choose the option that you want to use.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Drag mode @@ -258,12 +254,12 @@ FPE: Deleted screenshotClick 1 to only view the top level headings in the Navigator window, and 10 to view all of the headings.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Outline level @@ -274,12 +270,12 @@ FPE: Deleted screenshotMoves the selected heading, and the text below the heading, up one heading position in the Navigator and in the document. To move only the selected heading and not the text associated with the heading, hold down Ctrl, and then click this icon.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Chapter Up @@ -290,12 +286,12 @@ FPE: Deleted screenshotMoves the selected heading, and the text below the heading, down one heading position in the Navigator and in the document. To move only the selected heading and not the text associated with the heading, hold down Ctrl, and then click this icon.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Chapter down @@ -306,12 +302,12 @@ FPE: Deleted screenshotIncreases the outline level of the selected heading, and the headings that occur below the heading, by one. To only increase the outline level of the selected heading, hold down Ctrl, and then click this icon.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Promote level @@ -322,12 +318,12 @@ FPE: Deleted screenshotDecreases the outline level of the selected heading, and the headings that occur below the heading, by one. To only decrease the outline level of the selected heading, hold down Ctrl, and then click this icon.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Demote level diff --git a/helpcontent2/source/text/swriter/01/02150000.xhp b/helpcontent2/source/text/swriter/01/02150000.xhp index 0cbc3b8b96..a3a0564c53 100644 --- a/helpcontent2/source/text/swriter/01/02150000.xhp +++ b/helpcontent2/source/text/swriter/01/02150000.xhp @@ -1,7 +1,8 @@ - - - + ************************************************************************ + --> + - -Edit Footnotes +Footnote/Endnote /text/swriter/01/02150000.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - - + -Edit Footnotes -Edits the selected footnote or endnote anchor. Click in front of or behind the footnote or endnote, and then choose this command. +Footnote/Endnote +Edits the selected footnote or endnote anchor. Click in front of the footnote or endnote, and then choose this command.
- +
To edit the text of a footnote or endnote, click in the footnote area at the bottom of the page, or at the end of the document. To quickly jump to the footnote or endnote text, click the anchor for note in the document. You can also position the cursor in front of or behind the marker, and then press Ctrl+Shift+PgDn. To jump back to the anchor for the note, press PgUp. @@ -74,12 +72,12 @@ Moves to the previous footnote or endnote anchor in the document.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Previous footnote @@ -90,17 +88,17 @@ Moves to the next footnote or endnote anchor in the document.
- + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + Next footnote
-Insert Footnote dialog. +Insert Footnote/Endnote dialog. diff --git a/helpcontent2/source/text/swriter/01/04030000.xhp b/helpcontent2/source/text/swriter/01/04030000.xhp index a97e8f6bf7..15cb0265ef 100644 --- a/helpcontent2/source/text/swriter/01/04030000.xhp +++ b/helpcontent2/source/text/swriter/01/04030000.xhp @@ -1,8 +1,8 @@ - - + + + - -Insert Footnote +Footnote/Endnote /text/swriter/01/04030000.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - -Insert Footnote +Footnote/Endnote Inserts a footnote or an endnote in the document. The anchor for the note is inserted at the current cursor position. You can choose between automatic numbering or a custom symbol. The following applies to both footnotes and endnotes. @@ -57,13 +53,13 @@ Footnotes are inserted at the end of a page, and endnotes are inserted at the end of a document. UFI: what about sections? Will endnotes be placed there?
- +
Numbering Select the type of numbering that you want to use for footnotes and endnotes. Automatic -Automatically assigns consecutive numbers to the footnotes or endnotes that you insert. To change the settings for automatic numbering, choose Tools - Footnotes. +Automatically assigns consecutive numbers to the footnotes or endnotes that you insert. To change the settings for automatic numbering, choose Tools - Footnotes/Endnotes. diff --git a/helpcontent2/source/text/swriter/01/04130000.xhp b/helpcontent2/source/text/swriter/01/04130000.xhp index 9c2363cf8f..c1a426f509 100644 --- a/helpcontent2/source/text/swriter/01/04130000.xhp +++ b/helpcontent2/source/text/swriter/01/04130000.xhp @@ -1,7 +1,8 @@ - - - + ************************************************************************ + --> + - - + Frame /text/swriter/01/04130000.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - - + Frame Inserts a frame that you can use to create a layout of one or more columns of text and objects.
- +
-To edit a frame, click the border to select it, and then choose Format - Frame. You can also resize or move a selected frame using special shortcut keys. +To edit a frame, click the border to select it, and then choose Format - Frame/Object. You can also resize or move a selected frame using special shortcut keys. To delete a frame, click the border of the frame, and then press Delete. If you see small red arrows at the beginning and the end of text in frame, use the arrow keys to scroll through the remaining text. In the preview area of the Frame dialog, the frame is represented by a green rectangle, and the reference area by a red rectangle. @@ -65,7 +63,7 @@ - + Icon on the Insert toolbar: Draws a frame where you drag in the document. Click the arrow next to the icon to select the number of columns for the frame. diff --git a/helpcontent2/source/text/swriter/01/05150000.xhp b/helpcontent2/source/text/swriter/01/05150000.xhp index e72f0d559a..9b956daeda 100755 --- a/helpcontent2/source/text/swriter/01/05150000.xhp +++ b/helpcontent2/source/text/swriter/01/05150000.xhp @@ -1,7 +1,8 @@ - - - - - + ************************************************************************ + --> + - - -AutoFormat + +AutoCorrect /text/swriter/01/05150000.xhp - -Sun Microsystems, Inc. -converted from old format - fpe -
AutoFormat function; text documents -AutoFormat -Automatically formats the file according to the options that you set under Tools - AutoCorrect. +AutoCorrect +Automatically formats the file according to the options that you set under Tools - AutoCorrect + Options.
- +
+AutoCorrect Options +Opens the AutoCorrect dialog. To open the AutoFormat for Tables dialog, click in a table cell, and then choose Table - AutoFormat. diff --git a/helpcontent2/source/text/swriter/01/05150100.xhp b/helpcontent2/source/text/swriter/01/05150100.xhp index 3047d56e7b..2f0fbdf8c8 100644 --- a/helpcontent2/source/text/swriter/01/05150100.xhp +++ b/helpcontent2/source/text/swriter/01/05150100.xhp @@ -1,7 +1,8 @@ - - - + ************************************************************************ + --> + - - + While Typing /text/swriter/01/05150100.xhp - -Sun Microsystems, Inc. -converted from old format - fpe -
- + While Typing -Automatically formats the document while you type. To set the formatting options, choose Tools - AutoCorrect, and then click the Options tab. +Automatically formats the document while you type. To set the formatting options, choose Tools - AutoCorrect + Options, and then click the Options tab.
- +
-You can use AutoFormat to format text documents and plain ASCII text files, but not characters that you have manually formatted. Automatic word completion only occurs after you type a word for the second time in a document. -To reverse the last AutoFormat action, choose Edit - Undo. +You can use AutoCorrect to format text documents and plain ASCII text files, but not characters that you have manually formatted. Automatic word completion only occurs after you type a word for the second time in a document. +To reverse the last AutoCorrect action, choose Edit - Undo. -Other AutoFormat rules +Other AutoCorrect rules diff --git a/helpcontent2/source/text/swriter/01/05150200.xhp b/helpcontent2/source/text/swriter/01/05150200.xhp index a037db1121..aef854f350 100644 --- a/helpcontent2/source/text/swriter/01/05150200.xhp +++ b/helpcontent2/source/text/swriter/01/05150200.xhp @@ -1,7 +1,8 @@ - - - + ************************************************************************ + --> + - - + Apply /text/swriter/01/05150200.xhp - -Sun Microsystems, Inc. -converted from old format - fpe -
- + automatic heading formatting @@ -53,16 +51,17 @@ separator lines;AutoFormat function Apply -Automatically formats the file according to the options that you set under Tools - AutoCorrect. +Automatically formats the file according to the options that you set under Tools - AutoCorrect + Options.
- +
When you apply automatic formats, the following rules apply: -AutoFormat for Headings +AutoCorrect for Headings A paragraph is formatted as a heading when the following conditions are met: - + paragraph begins with a capital letter @@ -73,13 +72,13 @@ empty paragraph above and below the paragraph -AutoFormat for Bullets / Numbering +AutoCorrect for Bullets / Numbering To create a bulleted list, type a hyphen (-), star (*), or plus sign (+), followed by a space or tab at the beginning of a paragraph. To create a numbered list, type a number followed by a period (.), followed by a space or tab at the beginning of a paragraph. Automatic numbering is only applied to paragraphs formatted with the Standard, Text body or Text body indent paragraph styles. -AutoFormat for Separator Lines +AutoCorrect for Separator Lines If you type three or more hyphens (---), underscores (___) or equal signs (===) on line and then press Enter, the paragraph is replaced by a horizontal line as wide as the page. The line is actually the lower border of the preceding paragraph. The following rules apply: - + Three hyphens (-) yield a single line (0.05 pt thick, gap 0.75 mm). diff --git a/helpcontent2/source/text/swriter/01/05150300.xhp b/helpcontent2/source/text/swriter/01/05150300.xhp index b91314cf24..7e960cc611 100644 --- a/helpcontent2/source/text/swriter/01/05150300.xhp +++ b/helpcontent2/source/text/swriter/01/05150300.xhp @@ -1,7 +1,8 @@ - - - + ************************************************************************ + --> + - - + Apply and Edit Changes /text/swriter/01/05150300.xhp - -Sun Microsystems, Inc. -converted from old format - fpe -
- + Apply and Edit Changes -Automatically formats the file according to the options that you set under Tools - AutoCorrect. In a dialog, you are asked to accept or reject the changes. +Automatically formats the file according to the options that you set under Tools - AutoCorrect + Options. In a dialog, you are asked to accept or reject the changes.
- +
Accept All @@ -60,8 +59,8 @@ Rejects all of the formatting changes. Edit Changes -Opens a dialog where you can accept or reject AutoFormat changes. You can also view the changes made by a specific author or on a specific date. +Opens a dialog where you can accept or reject AutoCorrect changes. You can also view the changes made by a specific author or on a specific date. -Accept or Reject AutoFormat Changes, Filter tab +Accept or Reject Changes, Filter tab diff --git a/helpcontent2/source/text/swriter/01/06080000.xhp b/helpcontent2/source/text/swriter/01/06080000.xhp index 16e47b953d..8bafaa4ba9 100644 --- a/helpcontent2/source/text/swriter/01/06080000.xhp +++ b/helpcontent2/source/text/swriter/01/06080000.xhp @@ -1,7 +1,8 @@ - - - + ************************************************************************ + --> + + -Footnote options +Footnotes/Endnotes Settings /text/swriter/01/06080000.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - - - - -Footnote options - Specifies the display settings for footnotes and endnotes. -
- + + +Footnotes/Endnotes Settings +Specifies the display settings for footnotes and endnotes. + +
+
- - - + + + diff --git a/helpcontent2/source/text/swriter/01/06090000.xhp b/helpcontent2/source/text/swriter/01/06090000.xhp index 35697f8fe1..18beb3247a 100644 --- a/helpcontent2/source/text/swriter/01/06090000.xhp +++ b/helpcontent2/source/text/swriter/01/06090000.xhp @@ -1,8 +1,8 @@ - - + + + - - + Convert Text to Table /text/swriter/01/06090000.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - converting; text, into tables @@ -55,7 +51,7 @@ Converts the selected text into a table, or the selected table into text.
- +
The options available in this dialog depending on the type of conversion. Separate text at @@ -79,7 +75,7 @@ Equal width for all columns Creates columns of equal width, regardless of the position of the column marker. -AutoFormat +AutoCorrect Options diff --git a/helpcontent2/source/text/swriter/guide/auto_numbering.xhp b/helpcontent2/source/text/swriter/guide/auto_numbering.xhp index b31ffd31c7..abb596dba7 100644 --- a/helpcontent2/source/text/swriter/guide/auto_numbering.xhp +++ b/helpcontent2/source/text/swriter/guide/auto_numbering.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - -Creating Numbered or Bulleted Lists as You Type + +Creating Numbered or Bulleted Lists as You Type /text/swriter/guide/auto_numbering.xhp - - - numbering; lists, while typing bullet lists;creating while typing lists;automatic numbering @@ -54,36 +49,36 @@ bullets; using automatically automatic bullets paragraphs; automatic numbering - - MW deleted "applying;" - Creating Numbered or Bulleted Lists as You Type +MW deleted "applying;" +Creating Numbered or Bulleted Lists as You Type - $[officename] can automatically apply numbering or bullets as you type. - To Enable Automatic Numbering and Bulleting - - - Choose Tools - AutoCorrect, click the Options tab, and then select Apply Numbering - Symbol. - - - Choose Format - AutoFormat, and ensure that While Typing is selected. - - - The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style. - To Create a Numbered or Bulleted List While You Type - - - Type 1., i., or I. to start a numbered list. Type * or - to start a bulleted list. You can also type a right parenthesis after the number instead of a period , for example, 1) or i). - - - Enter a space, type your text, and then press Enter. The new paragraph automatically receives the next number or bullet. - - - Press Enter again to finish the list. - - - You can start a numbered list with any number. - - - Format - Bullets and Numbering - +$[officename] can automatically apply numbering or bullets as you type. +To Enable Automatic Numbering and Bulleting + + +Choose Tools - AutoCorrect + Options, click the Options tab, and then select Apply Numbering - Symbol. + + +Choose Format - AutoCorrect, and ensure that While Typing is selected. + + +The automatic numbering option is only applied to paragraphs that are formatted with the "Default", "Text body", or "Text body indent" paragraph style. +To Create a Numbered or Bulleted List While You Type + + +Type 1., i., or I. to start a numbered list. Type * or - to start a bulleted list. You can also type a right parenthesis after the number instead of a period , for example, 1) or i). + + +Enter a space, type your text, and then press Enter. The new paragraph automatically receives the next number or bullet. + + +Press Enter again to finish the list. + + +You can start a numbered list with any number. + + +Format - Bullets and Numbering + diff --git a/helpcontent2/source/text/swriter/guide/auto_off.xhp b/helpcontent2/source/text/swriter/guide/auto_off.xhp index d91537eb08..2301a9431c 100755 --- a/helpcontent2/source/text/swriter/guide/auto_off.xhp +++ b/helpcontent2/source/text/swriter/guide/auto_off.xhp @@ -1,7 +1,8 @@ - - - - - + ************************************************************************ + --> + - - -Turning Off AutoFormat and AutoCorrect + +Turning Off AutoCorrect /text/swriter/guide/auto_off.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - turning off automatic correction @@ -59,22 +55,23 @@ AutoCorrect function;turning off -Turning Off AutoFormat and AutoCorrect +Turning Off AutoCorrect By default, $[officename] automatically corrects many common typing errors and applies formatting while you type. - + To quickly undo an automatic correction or completion, press Command Ctrl+Z. -To turn off most AutoFormat features, remove the check mark from the menu Format - AutoFormat - While Typing. +To turn off most AutoCorrect features, remove the check mark from the menu Format - AutoCorrect - While Typing. To remove a word from the AutoCorrect list: -Choose Tools - AutoCorrect.name changed for SO8 +Choose Tools - AutoCorrect + Options. Click the Replace tab. @@ -89,7 +86,8 @@ To stop replacing quotation marks: -Choose Tools - AutoCorrect. +Choose Tools - AutoCorrect + Options. Click the Custom Quotes tab @@ -101,7 +99,8 @@ To stop capitalizing the first letter of a sentence: -Choose Tools - AutoCorrect. +Choose Tools - AutoCorrect + Options. Click the Options tab. @@ -114,7 +113,8 @@ $[officename] automatically draws a line when you type three of the following characters and press Enter: - _ = * ~ # -Choose Tools - AutoCorrect. +Choose Tools - AutoCorrect + Options. Click the Options tab. diff --git a/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp b/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp index c7f6b0f456..5f381dc7f8 100755 --- a/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp +++ b/helpcontent2/source/text/swriter/guide/auto_spellcheck.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + Automatically Check Spelling /text/swriter/guide/auto_spellcheck.xhp @@ -47,7 +45,8 @@ automatic spellcheck checking spelling;while typing words;disabling spellcheck -MW deleted "text;"Automatically Check Spelling +MW deleted "text;" +Automatically Check Spelling You can have $[officename] automatically check spelling while you type and underline possible misspelt words with a red wavy line. To check spelling automatically while you type: @@ -59,12 +58,13 @@ Right-click a word with a red wavy underline, and then choose a suggested replacement word from the list, or from the AutoCorrect submenu. - + -If you choose a word from the AutoCorrect submenu, the underlined word and the replacement word are automatically added to the AutoCorrect list for the current language. To view the AutoCorrect list, choose Tools - AutoCorrect, and then click the Replace tab. +If you choose a word from the AutoCorrect submenu, the underlined word and the replacement word are automatically added to the AutoCorrect list for the current language. To view the AutoCorrect list, choose Tools - AutoCorrect + Options, and then click the Replace tab. - + You can also add the underlined word to your custom dictionary by choosing Add. diff --git a/helpcontent2/source/text/swriter/guide/autocorr_except.xhp b/helpcontent2/source/text/swriter/guide/autocorr_except.xhp index 22eb148190..1cc56d54da 100644 --- a/helpcontent2/source/text/swriter/guide/autocorr_except.xhp +++ b/helpcontent2/source/text/swriter/guide/autocorr_except.xhp @@ -1,8 +1,8 @@ - - + + + - - + Adding Exceptions to the AutoCorrect List /text/swriter/guide/autocorr_except.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - AutoCorrect function; adding exceptions @@ -58,13 +54,14 @@ To Add an Exception to the AutoCorrect Exceptions List -Choose Tools - AutoCorrect, and then click the Exceptions tab. +Choose Tools - AutoCorrect + Options, and then click the Exceptions tab. Do one of the following: - + Type the abbreviation followed by a period in the Abbreviations (no subsequent capital) box and click New. diff --git a/helpcontent2/source/text/swriter/guide/footnote_usage.xhp b/helpcontent2/source/text/swriter/guide/footnote_usage.xhp index ee4827364f..1e1b9c6e47 100644 --- a/helpcontent2/source/text/swriter/guide/footnote_usage.xhp +++ b/helpcontent2/source/text/swriter/guide/footnote_usage.xhp @@ -1,8 +1,8 @@ - - + + + - - + Inserting and Editing Footnotes or Endnotes /text/swriter/guide/footnote_usage.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - endnotes;inserting and editing @@ -61,7 +57,7 @@ Click in your document where you want to place the anchor of the note. -Choose Insert - Footnote. +Choose Insert - Footnote/Endnote. In the Numbering area, select the format that you want to use. If you select Character, click the browse button (...) and select the character that you want to use for the footnote. @@ -78,55 +74,56 @@ - + -Icon +{ENTER ALTERNATE DESCRIPTION HERE} - + You can also insert footnotes by clicking the Insert Footnote Directly icon on the Insert toolbar.
Editing Footnotes or Endnotes - + To edit the text of a footnote or endnote, click in the note, or click the anchor for the note in the text. - + -Mouse hand cursor +{ENTER ALTERNATE DESCRIPTION HERE} - + The mouse pointer changes to a hand when you rest it over a footnote or endnote anchor in your document.
- + + To change the format of a footnote, click in the footnote, press F11 to open the Styles and Formatting window, right-click "Footnote" in the list, and then choose Modify. - + -To jump from the footnote or endnote text to the note anchor in the text, press PageUp. +To jump from the footnote or endnote text to the note anchor in the text, press PageUp. -To edit the numbering properties of a footnote or endnote anchor, click in front of the anchor, and choose Edit - Footnote. +To edit the numbering properties of a footnote or endnote anchor, click in front of the anchor, and choose Edit - Footnote/Endnote. -To change the formatting that $[officename] applies to footnotes and endnotes, choose Tools - Footnotes. +To change the formatting that $[officename] applies to footnotes and endnotes, choose Tools - Footnotes/Endnotes. To edit the properties of the text area for footnotes or endnotes, choose Format - Page, and then click the Footnote tab. - + To remove a footnote, delete the footnote anchor in the text. diff --git a/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp b/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp index 1750b6f5c6..443248f9d2 100644 --- a/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp +++ b/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + Creating Non-printing Text /text/swriter/guide/nonprintable_text.xhp @@ -45,8 +43,10 @@ non-printing text text; non-printable -mw copied two entries from hidden_text.xhpCreating Non-printing Text -MW created this guide from hidden_text.xhpTo create text that is not to be printed do the following: +mw copied two entries from hidden_text.xhp +Creating Non-printing Text +MW created this guide from hidden_text.xhp +To create text that is not to be printed do the following: Choose Insert - Frame. @@ -55,7 +55,7 @@ Enter text in the frame and if you want, resize the frame. -Choose Format - Frame, and then click the Options tab. +Choose Format - Frame/Object, and then click the Options tab. In the Properties area, clear the Print check box. diff --git a/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp b/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp index 4a1e775885..38e1354f96 100644 --- a/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp +++ b/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp @@ -1,8 +1,8 @@ - - + + + - - + Removing Line Breaks /text/swriter/guide/removing_line_breaks.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - hard returns in pasted text @@ -53,11 +49,13 @@ MW changed "removing;..." to "deleting;...". Removing Line Breaks -Use the AutoFormat feature to remove line breaks that occur within sentences. Unwanted line breaks can occur when you copy text from another source and paste it into a text document. -This AutoFormat feature only works on text that is formatted with the "Default" paragraph style. +Use the AutoCorrect feature to remove line breaks that occur within sentences. Unwanted line breaks can occur when you copy text from another source and paste it into a text document. +This AutoCorrect feature only works on text that is formatted with the "Default" paragraph style. -Choose Tools - AutoCorrect. +Choose Tools - AutoCorrect + Options +. @@ -73,7 +71,7 @@ In the Apply Style box on the Formatting bar, choose Default. -Choose Format - AutoFormat - Apply. +Choose Format - AutoCorrect - Apply.
diff --git a/helpcontent2/source/text/swriter/guide/smarttags.xhp b/helpcontent2/source/text/swriter/guide/smarttags.xhp index 765f187065..5c1cfd4106 100644 --- a/helpcontent2/source/text/swriter/guide/smarttags.xhp +++ b/helpcontent2/source/text/swriter/guide/smarttags.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + Using Smart Tags /text/swriter/guide/smarttags.xhp @@ -48,13 +46,14 @@ options;smart tags disabling;smart tags installing;smart tags -MW moved 2 index entries from shared/01/06040700.xhp, inverted "smart tags;options", made "smart tags;" a one level entry and added 2 entriesUsing Smart Tags +MW moved 2 index entries from shared/01/06040700.xhp, inverted "smart tags;options", made "smart tags;" a one level entry and added 2 entries +Using Smart Tags Smart Tags provide additional information and functionality to specified words in a Writer document. The available features can be different for different Smart Tags extensions. Installing Smart Tags Smart Tags can be supplied as extensions to %PRODUCTNAME Writer. To install a Smart Tag, do one of the following: - + Save the *.oxt extension file to your harddrive, then double-click the *.oxt file in your file manager. Alternatively, in %PRODUCTNAME choose Tools - Extension Manager to open the Extension Manager, click Add and browse to the file. @@ -65,9 +64,9 @@ Smart Tags menu Any text in a Writer document can be marked with a Smart Tag, by default a magenta colored underline. You can change the color in Tools - Options - %PRODUCTNAME - Appearance. When you point to a Smart Tag, a tip help informs you to Ctrl-click to open the Smart Tags menu. If you don't use a mouse, position the cursor inside the marked text and open the context menu by Shift+F10. -In the Smart Tags menu you see the available actions that are defined for this Smart Tag. Choose an option from the menu. The Smart Tags Options command opens the Smart Tags page of Tools - Autocorrect. +In the Smart Tags menu you see the available actions that are defined for this Smart Tag. Choose an option from the menu. The Smart Tags Options command opens the Smart Tags page of Tools - Autocorrect Options. To enable and disable Smart Tags -When you have installed at least one Smart Tags extension, you see the Smart Tags page in Tools - Autocorrect. Use this dialog to enable or disable Smart Tags and to manage the installed tags. +When you have installed at least one Smart Tags extension, you see the Smart Tags page in Tools - Autocorrect Options. Use this dialog to enable or disable Smart Tags and to manage the installed tags. Text that is recognized as a Smart Tag is not checked by the automatic spellcheck. diff --git a/helpcontent2/source/text/swriter/guide/text_centervert.xhp b/helpcontent2/source/text/swriter/guide/text_centervert.xhp index f098f4c5da..45949dd945 100644 --- a/helpcontent2/source/text/swriter/guide/text_centervert.xhp +++ b/helpcontent2/source/text/swriter/guide/text_centervert.xhp @@ -1,7 +1,8 @@ - - - - - + ************************************************************************ + --> + - - + Using a Frame to Center Text on a Page /text/swriter/guide/text_centervert.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - text frames; centering on pages @@ -71,7 +67,7 @@ Click OK. -To hide the borders of the frame, select the frame, and then choose Format - Frame. Click the Borders tab, and then click in the Set No Border box in the Line Arrangement area. +To hide the borders of the frame, select the frame, and then choose Format - Frame/Object. Click the Borders tab, and then click in the Set No Border box in the Line Arrangement area. To resize the frame, drag the edges of the frame. diff --git a/helpcontent2/source/text/swriter/guide/text_frame.xhp b/helpcontent2/source/text/swriter/guide/text_frame.xhp index a21a565937..27ce10a933 100644 --- a/helpcontent2/source/text/swriter/guide/text_frame.xhp +++ b/helpcontent2/source/text/swriter/guide/text_frame.xhp @@ -1,9 +1,8 @@ - - - - + + - + Word Completion for Text Documents /text/swriter/guide/word_completion.xhp @@ -52,12 +50,17 @@ deactivating;word completion refusing word completions rejecting word completions -mw made a two level entry of "switching off..." and "word completion", copied two entries to word_completion_adjust.xhp and added a new entryWord Completion for Text Documents +mw made a two level entry of "switching off..." and "word completion", copied two entries to word_completion_adjust.xhp and added a new entry +Word Completion for Text Documents $[officename] collects words that you frequently use in the current session. When you later type the first three letters of a collected word, $[officename] automatically completes the word. +<<<<<<< .working +If there is more than one word in the AutoCorrect memory that matches the three letters that you type, press Ctrl+Tab to cycle through the available words. To cycle in the opposite direction, press Ctrl+Shift+Tab. +======= If there is more than one word in the AutoCorrect memory that matches the three letters that you type, press CommandCtrl+Tab to cycle through the available words. To cycle in the opposite direction, press CommandCtrl+Shift+Tab. +>>>>>>> .merge-right.r265757 Using word completion - + By default, you accept the word completion by pressing the Enter key. @@ -68,7 +71,9 @@ Switching off the word completion - Choose Tools - AutoCorrect - Word Completion . + Choose Tools - AutoCorrect + Options + - Word Completion . Clear Enable word completion . diff --git a/helpcontent2/source/text/swriter/main0102.xhp b/helpcontent2/source/text/swriter/main0102.xhp index 09e749abd8..df834912aa 100755 --- a/helpcontent2/source/text/swriter/main0102.xhp +++ b/helpcontent2/source/text/swriter/main0102.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + Edit /text/swriter/main0102.xhp
-Edit + +Edit This menu contains commands for editing the contents of the current document.
@@ -64,7 +63,6 @@ Find & Replace - AutoText Exchange Database diff --git a/helpcontent2/source/text/swriter/main0103.xhp b/helpcontent2/source/text/swriter/main0103.xhp index c9c248921e..00b1034574 100755 --- a/helpcontent2/source/text/swriter/main0103.xhp +++ b/helpcontent2/source/text/swriter/main0103.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + View /text/swriter/main0103.xhp
-View + +View This menu contains commands for controlling the on-screen display of the document.
@@ -59,6 +58,7 @@ + Zoom diff --git a/helpcontent2/source/text/swriter/main0104.xhp b/helpcontent2/source/text/swriter/main0104.xhp index 086ffcdec4..5b79e2079b 100755 --- a/helpcontent2/source/text/swriter/main0104.xhp +++ b/helpcontent2/source/text/swriter/main0104.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + Insert /text/swriter/main0104.xhp
-Insert + +Insert The Insert menu contains commands for inserting new elements in your document. This includes sections, footnotes, notes, special characters, graphics, and objects from other applications.
Manual Break @@ -59,7 +58,7 @@ -Footnote +Footnote/Endnote Caption diff --git a/helpcontent2/source/text/swriter/main0106.xhp b/helpcontent2/source/text/swriter/main0106.xhp index 1d5524729f..75b6b54b22 100755 --- a/helpcontent2/source/text/swriter/main0106.xhp +++ b/helpcontent2/source/text/swriter/main0106.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - + Tools /text/swriter/main0106.xhp
-Tools + +Tools Contains spelling tools, a gallery of object art that you can add to your document, as well as tools for configuring menus, and setting program preferences.
-AutoCorrect - Outline Numbering Line Numbering @@ -70,6 +67,8 @@ +AutoCorrect Options + Customize -- cgit