From ac1db7fbf890d5393d5a2132d6bafe13dbc1c7a9 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Mon, 25 Jan 2016 15:24:01 +0100 Subject: more "switchinline (and link) not being valid child of emph" fixes Change-Id: I58212c56b4301bb260b3787b1afdffbfc710ca2c --- source/text/shared/00/00000021.xhp | 2 +- source/text/shared/01/01010201.xhp | 2 +- source/text/shared/01/01020000.xhp | 4 ++-- source/text/shared/01/01070000.xhp | 2 +- source/text/shared/01/01070001.xhp | 2 +- source/text/shared/01/05020700.xhp | 2 +- source/text/shared/autopi/01050000.xhp | 2 +- source/text/shared/guide/accessibility.xhp | 2 +- source/text/shared/guide/doc_autosave.xhp | 4 ++-- source/text/shared/guide/doc_save.xhp | 2 +- source/text/shared/guide/fax.xhp | 2 +- source/text/shared/guide/ms_user.xhp | 4 ++-- source/text/shared/main0650.xhp | 2 +- source/text/shared/optionen/macrosecurity.xhp | 2 +- source/text/swriter/01/04090001.xhp | 2 +- source/text/swriter/01/04090003.xhp | 4 ++-- source/text/swriter/01/04130100.xhp | 2 +- source/text/swriter/01/04200000.xhp | 2 +- source/text/swriter/01/05090201.xhp | 2 +- source/text/swriter/01/06030000.xhp | 4 ++-- source/text/swriter/02/18030700.xhp | 2 +- source/text/swriter/02/18130000.xhp | 2 +- source/text/swriter/guide/fields.xhp | 2 +- 23 files changed, 28 insertions(+), 28 deletions(-) (limited to 'source/text') diff --git a/source/text/shared/00/00000021.xhp b/source/text/shared/00/00000021.xhp index 155d846b8c..18e4c8f3dc 100644 --- a/source/text/shared/00/00000021.xhp +++ b/source/text/shared/00/00000021.xhp @@ -232,7 +232,7 @@ In current versions, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose Tools - Options - Load/Save - General and select the ODF format version. If you want to exchange documents with users that still use OpenOffice.org 1 or StarOffice 7, save the document using the respectively named filter in the File type listbox. -If you want to define another file format as the default, choose %PRODUCTNAME - PreferencesTools - Options - Load/Save - General to find alternative file formats for each $[officename] document type. +If you want to define another file format as the default, choose %PRODUCTNAME - PreferencesTools - Options - Load/Save - General to find alternative file formats for each $[officename] document type. XML file structure Documents in OpenDocument file format are stored as compressed zip archives that contain XML files. To view these XML files, you can open the OpenDocument file with an unzip program. The following files and directories are contained within the OpenDocument files: diff --git a/source/text/shared/01/01010201.xhp b/source/text/shared/01/01010201.xhp index 69c1f6b934..21ad612adc 100644 --- a/source/text/shared/01/01010201.xhp +++ b/source/text/shared/01/01010201.xhp @@ -45,7 +45,7 @@ Address Creates a label with your return address. Text that is currently in the Label text box is overwritten. -To change your return address, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME, and then click on the User Data tab. +To change your return address, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME, and then click on the User Data tab. Database Select the database that you want to use as the data source for your label. diff --git a/source/text/shared/01/01020000.xhp b/source/text/shared/01/01020000.xhp index c9a1238f85..c3c568942a 100644 --- a/source/text/shared/01/01020000.xhp +++ b/source/text/shared/01/01020000.xhp @@ -50,7 +50,7 @@
-The following sections describe the %PRODUCTNAME Open dialog box. To activate the %PRODUCTNAME Open and Save dialog boxes, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME- General, and then select the Use %PRODUCTNAME dialogs in the Open/Save dialogs area. +The following sections describe the %PRODUCTNAME Open dialog box. To activate the %PRODUCTNAME Open and Save dialog boxes, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME- General, and then select the Use %PRODUCTNAME dialogs in the Open/Save dialogs area. If the file that you want to open contains Styles, special rules apply. @@ -139,7 +139,7 @@ in the Documents and Settings folder -all template folders as defined in %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - Paths +all template folders as defined in %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - Paths
When you use File - Template - Save to save a template, the template will be stored in your user template folder. When you open a document that is based on such a template, the document will be checked for a changed template as decribed below. The template is associated with the document, it may be called a "sticky template". diff --git a/source/text/shared/01/01070000.xhp b/source/text/shared/01/01070000.xhp index 051286492a..e4ab584f84 100644 --- a/source/text/shared/01/01070000.xhp +++ b/source/text/shared/01/01070000.xhp @@ -41,7 +41,7 @@
-The following sections describe the %PRODUCTNAME Save as dialog. To activate the %PRODUCTNAME Open and Save dialog boxes, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME- General, and then select the Use %PRODUCTNAME dialogs in the Open/Save dialogs area. +The following sections describe the %PRODUCTNAME Save as dialog. To activate the %PRODUCTNAME Open and Save dialog boxes, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME- General, and then select the Use %PRODUCTNAME dialogs in the Open/Save dialogs area. To save a document as a template, use the command File - Save As Template.
diff --git a/source/text/shared/01/01070001.xhp b/source/text/shared/01/01070001.xhp index ec00edf285..28e39ae15c 100644 --- a/source/text/shared/01/01070001.xhp +++ b/source/text/shared/01/01070001.xhp @@ -42,7 +42,7 @@
-The following sections describe the $[officename] Export dialog box. To activate the $[officename] Open and Save dialog boxes, choose %PRODUCTNAME - PreferencesTools - Options - $[officename] - General, and then select the Use $[officename] dialogs in the Open/Save dialogs area. +The following sections describe the $[officename] Export dialog box. To activate the $[officename] Open and Save dialog boxes, choose %PRODUCTNAME - PreferencesTools - Options - $[officename] - General, and then select the Use $[officename] dialogs in the Open/Save dialogs area. Up One Level Create New Directory diff --git a/source/text/shared/01/05020700.xhp b/source/text/shared/01/05020700.xhp index ae3c604448..1b7951b861 100644 --- a/source/text/shared/01/05020700.xhp +++ b/source/text/shared/01/05020700.xhp @@ -45,7 +45,7 @@ Line change Set the options for line breaks in Asian language documents. Apply list of forbidden characters to the beginning and end of line -Prevents the characters in the list from starting or ending a line. The characters are relocated to either the previous or the next line. To edit the list of restricted characters, choose %PRODUCTNAME - PreferencesTools - Options - Language Settings - Asian Layout. +Prevents the characters in the list from starting or ending a line. The characters are relocated to either the previous or the next line. To edit the list of restricted characters, choose %PRODUCTNAME - PreferencesTools - Options - Language Settings - Asian Layout. Allow hanging punctuation Prevents commas and periods from breaking the line. Instead, these characters are added to the end of the line, even in the page margin. diff --git a/source/text/shared/autopi/01050000.xhp b/source/text/shared/autopi/01050000.xhp index 93bf0fa643..80c01fb17e 100644 --- a/source/text/shared/autopi/01050000.xhp +++ b/source/text/shared/autopi/01050000.xhp @@ -39,7 +39,7 @@
-To start the Presentation Wizard automatically when opening a new presentation, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Impress - General and check the Start with Wizard box. +To start the Presentation Wizard automatically when opening a new presentation, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Impress - General and check the Start with Wizard box. Within each wizard page, you can undo, modify, or skip altogether the editing steps. If you decide to skip over one of the pages, the wizard uses the default settings. diff --git a/source/text/shared/guide/accessibility.xhp b/source/text/shared/guide/accessibility.xhp index 0f5871bc43..886960d30a 100644 --- a/source/text/shared/guide/accessibility.xhp +++ b/source/text/shared/guide/accessibility.xhp @@ -40,7 +40,7 @@ Zooming of on-screen user interface for menus, icons, and documents - The user interface is scalable through your Window Manageroperating system settings. The default font size for dialogs is 12pt, corresponding to a scale of 100%. You can also change the font size for dialogs in %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - View. The zoom factor of a document can be changed in View - Zoom, or by double-clicking the zoom factor displayed in the Status Bar. + The user interface is scalable through your Window Manageroperating system settings. The default font size for dialogs is 12pt, corresponding to a scale of 100%. You can also change the font size for dialogs in %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - View. The zoom factor of a document can be changed in View - Zoom, or by double-clicking the zoom factor displayed in the Status Bar. Please note that accessibility support relies on Java technology for communications with assistive technology tools. This means that the first program startup may take a few seconds longer, because the Java runtime environment has to be started as well. diff --git a/source/text/shared/guide/doc_autosave.xhp b/source/text/shared/guide/doc_autosave.xhp index 45413a752b..ea662b9507 100644 --- a/source/text/shared/guide/doc_autosave.xhp +++ b/source/text/shared/guide/doc_autosave.xhp @@ -49,7 +49,7 @@ To create a backup file every time you save a document -Choose %PRODUCTNAME - PreferencesTools - Options - Load/Save - General. +Choose %PRODUCTNAME - PreferencesTools - Options - Load/Save - General. Mark Always create backup copy. @@ -67,7 +67,7 @@ To save recovery information automatically every n minutes -Choose %PRODUCTNAME - PreferencesTools - Options - Load/Save - General. +Choose %PRODUCTNAME - PreferencesTools - Options - Load/Save - General. Mark Save AutoRecovery information every and select the time interval. diff --git a/source/text/shared/guide/doc_save.xhp b/source/text/shared/guide/doc_save.xhp index 52d0ef10ae..29f0555e0a 100644 --- a/source/text/shared/guide/doc_save.xhp +++ b/source/text/shared/guide/doc_save.xhp @@ -57,7 +57,7 @@ When you save a new file for the first time, the Save As dialog opens, in which you can enter a name, folder and drive or volume for the file. To open this dialog, choose File - Save As. -You can set the automatic creation of a backup copy under %PRODUCTNAME - PreferencesTools - Options - Load/Save - General. +You can set the automatic creation of a backup copy under %PRODUCTNAME - PreferencesTools - Options - Load/Save - General. Automatic extension to the file name When saving a file, %PRODUCTNAME always appends an extension to the file name, except when the file name already has an extension that matches the file type. See the list of ODF extensions. Some examples for the automatic extensions are listed in the following table: diff --git a/source/text/shared/guide/fax.xhp b/source/text/shared/guide/fax.xhp index f81a7a562e..924aacc855 100644 --- a/source/text/shared/guide/fax.xhp +++ b/source/text/shared/guide/fax.xhp @@ -51,7 +51,7 @@ You can configure $[officename] so that a single click on an icon automatically sends the current document as a fax: -Choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Print. +Choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Print. Select the fax driver from the Fax list box and click OK. diff --git a/source/text/shared/guide/ms_user.xhp b/source/text/shared/guide/ms_user.xhp index 5943199863..54790cad32 100644 --- a/source/text/shared/guide/ms_user.xhp +++ b/source/text/shared/guide/ms_user.xhp @@ -89,7 +89,7 @@ Saving Documents by Default in Microsoft Office Formats -Choose %PRODUCTNAME - PreferencesTools - Options - Load/Save - General. +Choose %PRODUCTNAME - PreferencesTools - Options - Load/Save - General. In the Default file format and ODF settings area, first select a document type, then select the file type for saving. @@ -118,7 +118,7 @@ You may delete the VBA macros from the Microsoft Office file on loading or on saving. -Choose %PRODUCTNAME - PreferencesTools - Options - Load/Save - VBA Properties to set the VBA macro handling of $[officename]. +Choose %PRODUCTNAME - PreferencesTools - Options - Load/Save - VBA Properties to set the VBA macro handling of $[officename]. diff --git a/source/text/shared/main0650.xhp b/source/text/shared/main0650.xhp index d61a38e13e..413119c50b 100644 --- a/source/text/shared/main0650.xhp +++ b/source/text/shared/main0650.xhp @@ -37,7 +37,7 @@ The Java platform support needs to be activated under $[officename] to run Java applications. -Activate Java platform support by choosing %PRODUCTNAME - PreferencesTools - Options - $[officename] - Advanced. +Activate Java platform support by choosing %PRODUCTNAME - PreferencesTools - Options - $[officename] - Advanced. Before you can use a JDBC driver, you need to add its class path. Choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - Advanced, and click the Class Path button. After you add the path information, restart %PRODUCTNAME. diff --git a/source/text/shared/optionen/macrosecurity.xhp b/source/text/shared/optionen/macrosecurity.xhp index f9d3945db3..320c1ebb5f 100644 --- a/source/text/shared/optionen/macrosecurity.xhp +++ b/source/text/shared/optionen/macrosecurity.xhp @@ -30,7 +30,7 @@ Macro Security -The Macro Security dialog appears when a document contains one or more macros. You can also call the dialog from the %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - Security page. +The Macro Security dialog appears when a document contains one or more macros. You can also call the dialog from the %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - Security page.
diff --git a/source/text/swriter/01/04090001.xhp b/source/text/swriter/01/04090001.xhp index 1515f1204b..75088f5ee3 100644 --- a/source/text/swriter/01/04090001.xhp +++ b/source/text/swriter/01/04090001.xhp @@ -95,7 +95,7 @@ Sender - Inserts fields containing user data. You can change the user-data that is displayed by choosing %PRODUCTNAME - PreferencesTools - Options - $[officename] - User Data. + Inserts fields containing user data. You can change the user-data that is displayed by choosing %PRODUCTNAME - PreferencesTools - Options - $[officename] - User Data. diff --git a/source/text/swriter/01/04090003.xhp b/source/text/swriter/01/04090003.xhp index 24e81b7a19..60a1cf71ee 100644 --- a/source/text/swriter/01/04090003.xhp +++ b/source/text/swriter/01/04090003.xhp @@ -95,7 +95,7 @@ Hidden text -Inserts a text field that is hidden when the condition that you specify is met. To use this function, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids and clear the Fields: Hidden text check box. +Inserts a text field that is hidden when the condition that you specify is met. To use this function, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids and clear the Fields: Hidden text check box. @@ -103,7 +103,7 @@ Hidden Paragraph -Hides a paragraph when the condition that you specify is met. To use this function, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids and clear the Fields: Hidden paragraph check box. +Hides a paragraph when the condition that you specify is met. To use this function, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids and clear the Fields: Hidden paragraph check box. diff --git a/source/text/swriter/01/04130100.xhp b/source/text/swriter/01/04130100.xhp index 6e69ab0f6c..2a18f5afe9 100644 --- a/source/text/swriter/01/04130100.xhp +++ b/source/text/swriter/01/04130100.xhp @@ -36,7 +36,7 @@ You can resize and move selected frames and objects with the keyboard. To move a selected frame or object, press an arrow key. To move by one pixel, hold down OptionAlt, and then press an arrow key. To resize a selected frame or object, first press Ctrl+Tab. Now one of the handles blinks to show that it is selected. To select another handle, press Ctrl+Tab again. Press an arrow key to resize the object by one grid unit. To resize by one pixel, hold down OptionAlt, and then press an arrow key. -The increment by which you move an object with the keyboard is determined by the document grid. To change the properties of the document grid, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Grid. +The increment by which you move an object with the keyboard is determined by the document grid. To change the properties of the document grid, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Grid. diff --git a/source/text/swriter/01/04200000.xhp b/source/text/swriter/01/04200000.xhp index 045de4b395..44a26fb63a 100644 --- a/source/text/swriter/01/04200000.xhp +++ b/source/text/swriter/01/04200000.xhp @@ -35,7 +35,7 @@
- An inserted script is indicated by a small green rectangle. If you do not see the rectangle, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer/Web - View, and select the Comments check box. To edit a script, double-click the green rectangle. + An inserted script is indicated by a small green rectangle. If you do not see the rectangle, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer/Web - View, and select the Comments check box. To edit a script, double-click the green rectangle. If your document contains more than one script, the Edit Script dialog contains previous and next buttons to jump from script to script. Jump to Previous Script. diff --git a/source/text/swriter/01/05090201.xhp b/source/text/swriter/01/05090201.xhp index e642dbd82f..1c53a232b3 100644 --- a/source/text/swriter/01/05090201.xhp +++ b/source/text/swriter/01/05090201.xhp @@ -65,7 +65,7 @@ To delete a row, place the cursor in the row that you want to delete, hold down OptionAlt and press Delete, release, and then press the up or the down arrow. -To change the behavior of tables in a text document, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Table. +To change the behavior of tables in a text document, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Table. Table Bar diff --git a/source/text/swriter/01/06030000.xhp b/source/text/swriter/01/06030000.xhp index 3f3bea7c54..d9a2b7346f 100644 --- a/source/text/swriter/01/06030000.xhp +++ b/source/text/swriter/01/06030000.xhp @@ -60,12 +60,12 @@ To exclude paragraphs from the automatic hyphenation, select the paragraphs, choose Format - Paragraph, click the Text Flow tab, and then clear the Automatically check box in the Hyphenation area. -To disable the Hyphenation dialog and always hyphenate automatically, choose %PRODUCTNAME - PreferencesTools - Options - Language Settings - Writing Aids, and select the Hyphenate without inquiry check box. +To disable the Hyphenation dialog and always hyphenate automatically, choose %PRODUCTNAME - PreferencesTools - Options - Language Settings - Writing Aids, and select the Hyphenate without inquiry check box. To manually enter a hyphen directly in the document, click in the word where you want to add the hyphen, and then press Command Ctrl+Minus sign (-). To insert a non-breaking (protected) hyphen directly in the document, click in the word that you want to hyphenate, and then press Shift+Command +Ctrl +Minus sign(-). -To hide soft hyphens, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids, and then clear the Custom hyphens check box. +To hide soft hyphens, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids, and then clear the Custom hyphens check box. Word Word diff --git a/source/text/swriter/02/18030700.xhp b/source/text/swriter/02/18030700.xhp index f740899d0d..a10d03113f 100644 --- a/source/text/swriter/02/18030700.xhp +++ b/source/text/swriter/02/18030700.xhp @@ -34,7 +34,7 @@ Author -Inserts the name of the person who created the document here as a field. The field applies the entry made under %PRODUCTNAME - PreferencesTools - Options - $[officename] - User data. +Inserts the name of the person who created the document here as a field. The field applies the entry made under %PRODUCTNAME - PreferencesTools - Options - $[officename] - User data.
diff --git a/source/text/swriter/02/18130000.xhp b/source/text/swriter/02/18130000.xhp index 51c7bfd5b4..0c4a20d32b 100644 --- a/source/text/swriter/02/18130000.xhp +++ b/source/text/swriter/02/18130000.xhp @@ -32,7 +32,7 @@ Direct Cursor On/Off -Activates or deactivates the direct cursor. You can specify the behavior of the direct cursor by choosing %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids. +Activates or deactivates the direct cursor. You can specify the behavior of the direct cursor by choosing %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids.
diff --git a/source/text/swriter/guide/fields.xhp b/source/text/swriter/guide/fields.xhp index a99c84676c..30e71fdc74 100644 --- a/source/text/swriter/guide/fields.xhp +++ b/source/text/swriter/guide/fields.xhp @@ -41,7 +41,7 @@ Viewing FieldsFields consist of a field name and the field content. To switch the field display between the field name or the field content, choose View - Field Names.To display or hide field highlighting in a document, choose View - Field Shadings. To permanently disable this feature, choose %PRODUCTNAME - PreferencesTools - Options - $[officename] - Application Colors, and clear the check box in front of Field shadings. - To change the color of field shadings, choose %PRODUCTNAME - PreferencesTools - Options - $[officename] - Application Colors, locate the Field shadings option, and then select a different color in the Color setting box. + To change the color of field shadings, choose %PRODUCTNAME - PreferencesTools - Options - $[officename] - Application Colors, locate the Field shadings option, and then select a different color in the Color setting box.Field PropertiesMost field types in a document, including database fields, store and display variable values.The following field types execute an action when you click the field: -- cgit