Top

Choose Insert - Picture - Scan @@ -58,9 +58,9 @@

Choose Insert - Special Character -Choose Format - Bullets and Numbering - Customize - Character button +Choose Format - Bullets and Numbering - Customize - Character button -Choose Format - Bullets and Numbering - Customize - Character button +Choose Format - Bullets and Numbering - Customize - Character button Open the Insert toolbar, click

@@ -236,7 +236,7 @@

-Open a file of a type that is unknown to %PRODUCTNAME and that is no text file +Open a file of a type that is unknown to %PRODUCTNAME and that is no text file

Choose View - Toolbars - Hyperlink Bar diff --git a/helpcontent2/source/text/shared/00/00000450.xhp b/helpcontent2/source/text/shared/00/00000450.xhp index 6f828ec3fc..3d812364fe 100644 --- a/helpcontent2/source/text/shared/00/00000450.xhp +++ b/helpcontent2/source/text/shared/00/00000450.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,15 +45,15 @@ View - Database Objects - Queries -In a database file window, choose Edit - Database - Properties - Advanced Settings tab +In a database file window, choose Edit - Database - Properties - Advanced Settings tab -In a database file window of type ODBC or Address book, choose Edit - Database - Connection Type +In a database file window of type ODBC or Address book, choose Edit - Database - Connection Type Path selection button in various Wizards / Edit Buttons for some entries in %PRODUCTNAME - PreferencesTools - Options - $[officename] - Paths -In a database file window of type ODBC, choose Edit - Database - Connection Type +In a database file window of type ODBC, choose Edit - Database - Connection Type see #i56356 -In a database file window of type Address book - LDAP, choose Edit - Database - Properties +In a database file window of type Address book - LDAP, choose Edit - Database - Properties In a database file window of type JDBC, choose Edit - Database - Properties @@ -69,9 +69,9 @@ In a database file window, choose Tools - SQL -In a database file window, click the Queries icon +In a database file window, click the Queries icon -In a database file window, click the Tables icon +In a database file window, click the Tables icon

In a database file window, click the Tables icon. Choose Insert - Table Design or Edit - Edit @@ -84,9 +84,9 @@ In a database file window, click the Queries icon, then choose Edit - Edit -In a database file window, click the Queries icon, then choose Edit - Edit. When referenced fields no longer exist, you see this dialog +In a database file window, click the Queries icon, then choose Edit - Edit. When referenced fields no longer exist, you see this dialog -Open query design and choose Insert - New Relation, or double-click on a connection line between two tables. +Open query design and choose Insert - New Relation, or double-click on a connection line between two tables.

@@ -142,7 +142,7 @@ -

Icon +

Icon @@ -154,7 +154,7 @@ In a database file window, choose Edit - Database - Properties -Drag and drop a table or a query into the table part of another database file window +Drag and drop a table or a query into the table part of another database file window In a database file window, choose Insert - Form diff --git a/helpcontent2/source/text/shared/01/04050000.xhp b/helpcontent2/source/text/shared/01/04050000.xhp index e2e426d7f6..1407612e52 100644 --- a/helpcontent2/source/text/shared/01/04050000.xhp +++ b/helpcontent2/source/text/shared/01/04050000.xhp @@ -57,8 +57,8 @@

Inserting comments - In Writer, the command Insert - Comment or the Command+Option -Ctrl+Alt+N key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box. +issue 113019 112000In Writer, the command Insert - Comment or the Command+Option +Ctrl+Alt+C key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box. In Calc, Draw, and Impress, the command Insert - Comment inserts a comment. The author name and the date and time of creating this comment is shown at the bottom of the comment box. The comments by different authors get different colors. Choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - User Data to enter your name so that it can show up as the comment author. diff --git a/helpcontent2/source/text/shared/01/05100500.xhp b/helpcontent2/source/text/shared/01/05100500.xhp index 78a5cf1e95..9456055700 100644 --- a/helpcontent2/source/text/shared/01/05100500.xhp +++ b/helpcontent2/source/text/shared/01/05100500.xhp @@ -1,11 +1,11 @@ - + - - + + Top @@ -39,7 +39,6 @@

- Top Aligns the contents of the cell to the top edge of the cell. diff --git a/helpcontent2/source/text/shared/01/05100600.xhp b/helpcontent2/source/text/shared/01/05100600.xhp index c40caeca85..793e026763 100644 --- a/helpcontent2/source/text/shared/01/05100600.xhp +++ b/helpcontent2/source/text/shared/01/05100600.xhp @@ -1,11 +1,11 @@ - + - - + + -Middle +Center (vertical) /text/shared/01/05100600.xhp

- -Middle -Centers the contents of the cell horizontally in the cell. +Center (vertival) +Centers the contents of the cell between top and bottom of the cell.

In the context menu of a cell, choose Cell - Center diff --git a/helpcontent2/source/text/shared/01/05100700.xhp b/helpcontent2/source/text/shared/01/05100700.xhp index 7bd233e7ca..e4c728b855 100644 --- a/helpcontent2/source/text/shared/01/05100700.xhp +++ b/helpcontent2/source/text/shared/01/05100700.xhp @@ -1,11 +1,11 @@ - + - - + + Bottom @@ -39,7 +39,6 @@

- Bottom Aligns the contents of the cell to the bottom edge of the cell. diff --git a/helpcontent2/source/text/shared/01/05210100.xhp b/helpcontent2/source/text/shared/01/05210100.xhp index bc7e23a3df..f380fbe686 100644 --- a/helpcontent2/source/text/shared/01/05210100.xhp +++ b/helpcontent2/source/text/shared/01/05210100.xhp @@ -4,7 +4,7 @@ - + Area /text/shared/01/05210100.xhp - -Sun Microsystems, Inc. -converted from old format - fpe -

@@ -57,7 +53,7 @@

Fill - + Select the type of fill that you want to apply to the selected drawing object. diff --git a/helpcontent2/source/text/shared/01/05220000.xhp b/helpcontent2/source/text/shared/01/05220000.xhp index ce53f48269..3f29b1b585 100644 --- a/helpcontent2/source/text/shared/01/05220000.xhp +++ b/helpcontent2/source/text/shared/01/05220000.xhp @@ -1,11 +1,11 @@ - + - - + + Text @@ -103,6 +103,6 @@ Full width - Anchors the text to the full width of the drawing or text object. + Anchors the text to the full width of the drawing object or text object. \ No newline at end of file diff --git a/helpcontent2/source/text/shared/01/06040000.xhp b/helpcontent2/source/text/shared/01/06040000.xhp index 4bfd6502b3..fc890d13f7 100644 --- a/helpcontent2/source/text/shared/01/06040000.xhp +++ b/helpcontent2/source/text/shared/01/06040000.xhp @@ -1,17 +1,11 @@ - - - - + ************************************************************************ --> - - - AutoCorrect - /text/shared/01/06040000.xhp - - - -AutoCorrect function;switching on and off + +AutoCorrect +text/shared/01/06040000.xhp + + + + +AutoCorrect function;switching on and off +AutoComplete, see also AutoCorrect/AutoInput -MW deleted "AutoFormat function;" and changed "AutoCorrect function;" -AutoCorrect - Sets the options for automatically replacing text as you type. - -

+MW deleted "AutoFormat function;" and changed "AutoCorrect function;"MW added "AutoComplete, see also..." +AutoCorrect +Sets the options for automatically replacing text as you type. +

@@ -59,22 +51,17 @@

-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 - AutoCorrect - While Typing. To apply the AutoCorrect settings to an entire text document, choose Format - AutoCorrect - Apply. -

+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 - AutoCorrect - While Typing. To apply the AutoCorrect settings to an entire text document, choose Format - AutoCorrect - Apply.

- AutoCorrect -

+AutoCorrect +

diff --git a/helpcontent2/source/text/shared/01/06140500.xhp b/helpcontent2/source/text/shared/01/06140500.xhp index 4d80ae6b95..db293f91ae 100644 --- a/helpcontent2/source/text/shared/01/06140500.xhp +++ b/helpcontent2/source/text/shared/01/06140500.xhp @@ -44,12 +44,22 @@ customizing; events events; customizing -Events -Assigns macros to program events. The assigned macro runs automatically every time the selected event occurs. + + +Events +Assigns macros to program events. The assigned macro runs automatically every time the selected event occurs.

+ + + +The dialog box has reduced functionality when called from the Edit-Sheet menu of a spreadsheet. + + + + Save In Select first where to save the event binding, in the current document or in %PRODUCTNAME. A macro that is saved with a document can only be run when that document is opened. diff --git a/helpcontent2/source/text/shared/01/extensionupdate.xhp b/helpcontent2/source/text/shared/01/extensionupdate.xhp index a50bf7c48e..9876e465b0 100644 --- a/helpcontent2/source/text/shared/01/extensionupdate.xhp +++ b/helpcontent2/source/text/shared/01/extensionupdate.xhp @@ -45,6 +45,10 @@

+ + +insert hidden text for Exclude from this update/from all updates/include again, see i115834 + When you click the Check for Updates button or choose the Update command, the Extension Update dialog is displayed and the check for availability of updates starts immediately. While checking for updates, you see a progress indicator. Wait for some messages to show up in the dialog, or click Cancel to abort the update check. diff --git a/helpcontent2/source/text/shared/01/grid.xhp b/helpcontent2/source/text/shared/01/grid.xhp index b584aea2b5..4fa1a318f1 100755 --- a/helpcontent2/source/text/shared/01/grid.xhp +++ b/helpcontent2/source/text/shared/01/grid.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ Display Grid Displays or hides grid lines that you can use to align objects such as graphics on a page. Snap to Grid -Automatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the Command keyCtrl key when you drag an object.UFI: copied from shared\optionen\01050100.xhpUFI removed GridFront help idGrid to Front +issue 112000 for new keyAutomatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the Option keyAlt key when you drag an object.UFI: copied from shared\optionen\01050100.xhpUFI removed GridFront help idGrid to Front Displays the grid lines in front of the objects on the slide or page.

Set the grid color on %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - Appearance. diff --git a/helpcontent2/source/text/shared/01/guides.xhp b/helpcontent2/source/text/shared/01/guides.xhp index cf22da3fab..f26ee296c2 100755 --- a/helpcontent2/source/text/shared/01/guides.xhp +++ b/helpcontent2/source/text/shared/01/guides.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ Display Guides Displays or hides guides that you can use to align objects on a page. Snap to Guides -Automatically aligns objects to vertical and horizontal guides. To override this feature, hold down the Command keyCtrl key when you drag an object.UFI: test it! copied from shared\01\grid.xhpUFI: removed double help idGuides to Front +changed in BetterDefaults_Gridhandling issue 112000Automatically aligns objects to vertical and horizontal guides. To override this feature, hold down the Option keyAlt key when you drag an object.UFI: test it! copied from shared\01\grid.xhpUFI: removed double help idGuides to Front Displays the guides in front of the objects on the slide or page. diff --git a/helpcontent2/source/text/shared/01/packagemanager.xhp b/helpcontent2/source/text/shared/01/packagemanager.xhp index 73482929ca..4de07e8fbc 100644 --- a/helpcontent2/source/text/shared/01/packagemanager.xhp +++ b/helpcontent2/source/text/shared/01/packagemanager.xhp @@ -1,11 +1,11 @@ - + - - + + Extension Manager @@ -122,6 +122,10 @@ An extension can show a license dialog. Read the license. Click the Scroll Down button to scroll down if necessary. Click Accept to continue the installation of the extension. + +insert hidden text for Show License + + Remove diff --git a/helpcontent2/source/text/shared/02/01171300.xhp b/helpcontent2/source/text/shared/02/01171300.xhp index c826b8ef13..bc7bdf2474 100644 --- a/helpcontent2/source/text/shared/02/01171300.xhp +++ b/helpcontent2/source/text/shared/02/01171300.xhp @@ -4,7 +4,7 @@ - + Snap to Grid /text/shared/02/01171300.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - Snap to Grid @@ -55,7 +51,6 @@

diff --git a/helpcontent2/source/text/shared/02/02170000.xhp b/helpcontent2/source/text/shared/02/02170000.xhp index 8daf23a791..50d05ba2b0 100644 --- a/helpcontent2/source/text/shared/02/02170000.xhp +++ b/helpcontent2/source/text/shared/02/02170000.xhp @@ -4,7 +4,7 @@ - + Background color/Paragraph background /text/shared/02/02170000.xhp - -Sun Microsystems, Inc. -UFI: fix to #112392# -dedr: reviewed -

- -Background color -Paragraph background -Click to open a toolbar where you can click a background color for a paragraph. The color is applied to the background of the current paragraph or the selected paragraphs. +Background Color +Click to open a toolbar where you can click a background color for a paragraph. The color is applied to the background of the current paragraph or the selected paragraphs.

- - @@ -65,39 +56,6 @@ dedr: reviewed

- - - - - - - -

Icon - - - -Paragraph Background, or Background Color when in a table in text, frames and inserted graphics - - -

- - - - - - - -

Icon - - - -Paragraph Background - - -

- - -

diff --git a/helpcontent2/source/text/shared/02/03140000.xhp b/helpcontent2/source/text/shared/02/03140000.xhp index 0fc83599e3..b90f76ebe0 100644 --- a/helpcontent2/source/text/shared/02/03140000.xhp +++ b/helpcontent2/source/text/shared/02/03140000.xhp @@ -4,7 +4,7 @@ - + Line Style /text/shared/02/03140000.xhp - -Sun Microsystems, Inc. -converted from old format - fpe -

- + Line Style Click this icon to open the Line Style toolbar, where you can modify the border line style. diff --git a/helpcontent2/source/text/shared/02/03150000.xhp b/helpcontent2/source/text/shared/02/03150000.xhp index 88415e63ee..01b4524c38 100644 --- a/helpcontent2/source/text/shared/02/03150000.xhp +++ b/helpcontent2/source/text/shared/02/03150000.xhp @@ -4,7 +4,7 @@ - + Border Color /text/shared/02/03150000.xhp - -Sun Microsystems, Inc. -converted from old format - fpe -

- Border Color Click the Line Color (of the border) icon to open the Border Color toolbar, which enables you to change the border color of an object. diff --git a/helpcontent2/source/text/shared/02/12100100.xhp b/helpcontent2/source/text/shared/02/12100100.xhp index fcbf09c56e..ac6f18b309 100644 --- a/helpcontent2/source/text/shared/02/12100100.xhp +++ b/helpcontent2/source/text/shared/02/12100100.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,6 @@ databases; sorting -

Sort Order diff --git a/helpcontent2/source/text/shared/guide/collab.xhp b/helpcontent2/source/text/shared/guide/collab.xhp index 3d0042b2b7..b7e4274410 100644 --- a/helpcontent2/source/text/shared/guide/collab.xhp +++ b/helpcontent2/source/text/shared/guide/collab.xhp @@ -1,9 +1,5 @@ - - - - - - - - + ************************************************************************ --> + Collaboration -/text/shared/guide/collab.xhp +text/shared/guide/collab.xhp -sharing documents + +sharing documents collaboration - - MW changed the index entries to one level entries. - Collaboration - - In %PRODUCTNAME Writer, Impress, and Draw, only one user at a time can open any document for writing. In Calc, many users can open the same spreadsheet for writing at the same time. - Tools - Share Document menu - +file locking with collaboration +locked documents +MW changed the index entries to one level entries.MW added two index entries with "lock" +Collaboration +In %PRODUCTNAME Writer, Impress, and Draw, only one user at a time can open any document for writing. In Calc, many users can open the same spreadsheet for writing at the same time.Tools - Share Document menu - Opens the Share Document dialog where you can enable or disable collaborative sharing of the document. - Share Document dialog - Share this spreadsheet with other users +Opens the Share Document dialog where you can enable or disable collaborative sharing of the document.Share Document dialog - Share this spreadsheet with other users - Enable to share the current document with other users. Disable to use the document unshared. This will invalidate the not yet saved edits that other users applied in the time since you last opened or saved this document. - Collaboration in Calc - In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - User Data tab page. - Some commands are not available (grayed out) when change tracking or document sharing is activated. For a new spreadsheet you cannot apply or insert the grayed out elements. Spec Doc owner told me that this is work in progress and may change any time - Creating a new spreadsheet - User A creates a new spreadsheet document. The following conditions can apply: - - - The user does not want to share the spreadsheet for collaboration. - User A opens, edits, and saves the document as described above for Writer, Impress, and Draw document. - - - The user wants to share the document for collaboration. - The user chooses Tools - Share Document to activate the collaboration features for this document. A dialog opens where the user can choose to enable or disable sharing. If the user enables sharing, the document will be saved in shared mode, which is also shown on the title bar. - - - The Tools - Share Document command can be used to switch the mode for the current document from unshared mode to shared mode. If you want to use a shared document in unshared mode, you would save the shared document using another name or path. This creates a copy of the spreadsheet that is not shared. - Opening a spreadsheet - User A opens a spreadsheet document. The following conditions can apply: - - - The spreadsheet document is not in shared mode. - The user can open, edit, and save the document as described above for Writer, Impress, and Draw documents. - - - The spreadsheet document is in shared mode. - The user sees a message that the document is in shared mode and that some features are not available in this mode. The user can disable this message for the future. After clicking OK, the document is opened in shared mode. - - - Resolve Conflicts dialog - +Enable to share the current document with other users. Disable to use the document unshared. This will invalidate the not yet saved edits that other users applied in the time since you last opened or saved this document. +Collaboration in Calc +In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the %PRODUCTNAME - Preferences +Tools - Options - %PRODUCTNAME - User Data tab page. +Some commands are not available (grayed out) when change tracking or document sharing is activated. For a new spreadsheet you cannot apply or insert the grayed out elements. Spec Doc owner told me that this is work in progress and may change any time +Creating a new spreadsheet +User A creates a new spreadsheet document. The following conditions can apply: + + +The user does not want to share the spreadsheet for collaboration. +User A opens, edits, and saves the document as described above for Writer, Impress, and Draw document. + + +The user wants to share the document for collaboration. +The user chooses Tools - Share Document to activate the collaboration features for this document. A dialog opens where the user can choose to enable or disable sharing. If the user enables sharing, the document will be saved in shared mode, which is also shown on the title bar. + +The Tools - Share Document command can be used to switch the mode for the current document from unshared mode to shared mode. If you want to use a shared document in unshared mode, you would save the shared document using another name or path. This creates a copy of the spreadsheet that is not shared. +Opening a spreadsheet +User A opens a spreadsheet document. The following conditions can apply: + + +The spreadsheet document is not in shared mode. +The user can open, edit, and save the document as described above for Writer, Impress, and Draw documents. + + +The spreadsheet document is in shared mode. +The user sees a message that the document is in shared mode and that some features are not available in this mode. The user can disable this message for the future. After clicking OK, the document is opened in shared mode. +Resolve Conflicts dialog - If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep. - Keep Mine - +If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep.Keep Mine - Keeps your change, voids the other change. - Keep Other - +Keeps your change, voids the other change.Keep Other - Keeps the change of the other user, voids your change. - Keep All Mine - +Keeps the change of the other user, voids your change.Keep All Mine - Keeps all your changes, voids all other changes. - Keep All Others - +Keeps all your changes, voids all other changes.Keep All Others - Keeps the changes of all other users, voids your changes. - Saving a shared spreadsheet document - User A saves a shared document. The following conditions can apply: - - - The document was not modified and saved by another user since user A opened the document. - The document is saved. - - - The document was modified and saved by another user since user A opened the document. - If the changes do not conflict, the document is saved. - If the changes conflict, the Resolve Conflicts dialog will be shown. User A must decide for the conflicts which version to keep, "Keep Mine" or "Keep Other". When all conflicts are resolved, the document is saved. While user A resolves the conflicts, no other user is able to save the shared document. - - - Another user tries to save the shared document and resolves conflicts in this moment. - User A sees a message that a merge-in is in progress. User A can choose to cancel the save command for now, or retry saving some time later. - - - When a user successfully saves a shared spreadsheet, the document will be reloaded after the save command, so that the spreadsheet shows the latest version of all changes that got saved by all users. A message shows that "foreign changes have been added" when another user did change some contents. - - Collaboration in Writer, Impress, and Draw - For all modules Writer, Impress, Draw, and for Calc when document sharing is not enabled, a file locking is possible. This file locking is available even when accessing the same document from different operating systems: - User A opens a document. The following conditions can apply: - - - The document is not locked by any other user. - This document will be opened for read and write access by user A. The document will be locked for other users until user A closes the document. - - - The document is marked as "read-only" by the file system. - This document will be opened in read-only mode. Editing is not allowed. User A can save the document using another document name or another path. User A can edit this copy. - - - The document is locked by another user. - User A sees a dialog that tells the user the document is locked. The dialog offers to open the document in read-only mode, or to open a copy for editing, or to cancel the Open command. - - - - User access permissions and sharing documents - Some conditions must be met on operating systems with a user permission management. - - - The shared file needs to reside in a location which is accessible by all collaborators. - - - The file permissions for both the document and the corresponding lock file need to be set so that all collaborators can create, delete, and change the files. - - - Write access also enables other users to (accidentally or deliberately) delete or change a file. - -

- - Save As - -

- - +Keeps the changes of all other users, voids your changes. +Saving a shared spreadsheet document +User A saves a shared document. The following conditions can apply: + + +The document was not modified and saved by another user since user A opened the document. +The document is saved. + + +The document was modified and saved by another user since user A opened the document. +If the changes do not conflict, the document is saved. +If the changes conflict, the Resolve Conflicts dialog will be shown. User A must decide for the conflicts which version to keep, "Keep Mine" or "Keep Other". When all conflicts are resolved, the document is saved. While user A resolves the conflicts, no other user is able to save the shared document. + + +Another user tries to save the shared document and resolves conflicts in this moment. +User A sees a message that a merge-in is in progress. User A can choose to cancel the save command for now, or retry saving some time later. + +When a user successfully saves a shared spreadsheet, the document will be reloaded after the save command, so that the spreadsheet shows the latest version of all changes that got saved by all users. A message shows that "foreign changes have been added" when another user did change some contents. +Collaboration in Writer, Impress, and Draw +For all modules Writer, Impress, Draw, and for Calc when document sharing is not enabled, a file locking is possible. This file locking is available even when accessing the same document from different operating systems: +User A opens a document. The following conditions can apply: + + +The document is not locked by any other user. +This document will be opened for read and write access by user A. The document will be locked for other users until user A closes the document. + + +The document is marked as "read-only" by the file system. +This document will be opened in read-only mode. Editing is not allowed. User A can save the document using another document name or another path. User A can edit this copy. + + +The document is locked by another user. +User A sees a dialog that tells the user the document is locked. The dialog offers to open the document in read-only mode, or to open a copy for editing, or to cancel the Open command. + +User access permissions and sharing documents +Some conditions must be met on operating systems with a user permission management. + + +The shared file needs to reside in a location which is accessible by all collaborators. + + +The file permissions for both the document and the corresponding lock file need to be set so that all collaborators can create, delete, and change the files. + +Write access also enables other users to (accidentally or deliberately) delete or change a file. +

+Save As +

+ + \ No newline at end of file diff --git a/helpcontent2/source/text/shared/guide/floating_toolbar.xhp b/helpcontent2/source/text/shared/guide/floating_toolbar.xhp index ced9492191..1c17e308b3 100644 --- a/helpcontent2/source/text/shared/guide/floating_toolbar.xhp +++ b/helpcontent2/source/text/shared/guide/floating_toolbar.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ To Close a Toolbar Temporarily Click the icon in the toolbar's title bar, or choose Close Toolbar from the context menu. The toolbar will be shown automatically again when the context becomes active again. To Close a Toolbar Permanently -Choose View - Toolbars and click the name of a toolbar to remove the check mark. +While the toolbar is visible, choose View - Toolbars and click the name of the toolbar to remove the check mark. To Show a Closed Toolbar diff --git a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp index 8a238e241b..ea1b4272b8 100644 --- a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp +++ b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp @@ -1,11 +1,11 @@ - + - - + + Editing Graphic Objects @@ -64,15 +64,15 @@ Choose View - Toolbars - Drawing to open the Drawing toolbar, if it is not already open. Drawing objects can be subsequently edited and modified. Drawing objects created in this way are vector graphics, which you can scale freely without any loss of quality. To create a rectangle, click the rectangle icon and move your cursor to the place in the document where you want one corner of the rectangle to be. Press the mouse button and hold it down while dragging to the opposite corner of the rectangle. When you release the mouse button, the rectangle is inserted in the document. It is selected, and you can edit its properties through the context menu. - + - To draw multiple objects of the same type, double-click the icon. -To draw multiple objects of the same type, double-click the icon. + To draw multiple objects of the same type, double-click the icon. +To draw multiple objects of the same type, double-click the icon. Draw multiple objects of the same type. Click the document without moving the mouse to stop drawing objects. - If you want to open up draw objects from the center instead of dragging from one corner to the other, hold down the Option -Alt key while dragging. With some window managers, you may need to hold down also the meta key. + If you want to open up draw objects from the center instead of dragging from one corner to the other, hold down the Option +Alt key while dragging. With some window managers, you may need to hold down also the meta key. @@ -82,19 +82,22 @@ To scale the objects, first select them by clicking on them with the selection tool. You then see eight handles around the object. When you drag one of the four corner handles, the opposite corner remains fixed while the other three corners move. When you drag one of the side handles, the opposite side remains fixed. - To scale a draw object using the keyboard, first select the object, then press Command -Ctrl+Tab repeatedly to highlight one of the handles. Then press an arrow key. To scale in smaller steps, hold down the Option + To scale a draw object using the keyboard, first select the object, then press Command +Ctrl+Tab repeatedly to highlight one of the handles. Then press an arrow key. To scale in smaller steps, hold down the Option Alt key while pressing an arrow key. Press Esc to leave the point edit mode. To move draw objects, first select them. To select more than one object, press the Shift key while clicking. Select text objects by clicking exactly on their edge. While holding down the mouse button, drag the objects to the new location. - To move a draw object using the keyboard, first select the object, then press an arrow key. To move in smaller steps, hold down the Option + To move a draw object using the keyboard, first select the object, then press an arrow key. To move in smaller steps, hold down the Option Alt key while pressing an arrow key. + + + To enter text to be a part of a graphics object, select the object and start typing your text. Click outside the object to end entering text. Double-click text inside an object to edit the text. - To revert to normal text mode after creating and editing draw objects, click in an area of the document containing no draw or other objects. If you see a drawing cursor, first exit this mode by clicking the Select icon. + To revert to normal mode after creating and editing draw objects, click in an area of the document containing no objects. If you see a drawing cursor, first exit this mode by clicking the Select icon.

Information about the individual icons diff --git a/helpcontent2/source/text/shared/guide/pasting.xhp b/helpcontent2/source/text/shared/guide/pasting.xhp index 10f7c8df53..11137148fc 100755 --- a/helpcontent2/source/text/shared/guide/pasting.xhp +++ b/helpcontent2/source/text/shared/guide/pasting.xhp @@ -5,7 +5,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ * ************************************************************************ --> - + @@ -52,6 +52,9 @@ Contents that are stored on the clipboard can be pasted into your document using different formats. In %PRODUCTNAME you can choose how to paste the contents using a dialog or a drop-down icon. The available options depend on the contents of the clipboard. + +In Writer text documents, you can press Command+OptionCtrl+Alt+Shift+V to paste the contents of the clipboard as unformatted text. + Pasting clipboard contents using an icon menu @@ -62,6 +65,7 @@ If you do not like the result, click the Undo icon and then paste again with another option. + Pasting clipboard contents using a dialog diff --git a/helpcontent2/source/text/shared/main0108.xhp b/helpcontent2/source/text/shared/main0108.xhp index 000b4ff973..1fddafc712 100644 --- a/helpcontent2/source/text/shared/main0108.xhp +++ b/helpcontent2/source/text/shared/main0108.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,12 +40,10 @@

- Help The Help menu allows you to start and control the $[officename] Help system.

- $[officename] Help Opens the main page of the $[officename] Help for the current application. You can scroll through the Help pages and you can search for index terms or any text.

@@ -63,14 +61,12 @@

- Support Shows information on how to get support.

Check for Updates Enable an Internet connection for %PRODUCTNAME. If you need a Proxy, check the %PRODUCTNAME Proxy settings in %PRODUCTNAME - PreferencesTools - Options - Internet. Then choose Check for Updates to check for the availability of a newer version of your office suite. This menu command is visible for the evaluation version of %PRODUCTNAME. Choose to open the Purchase %PRODUCTNAME Wizard.UFI: see spec doc "Unlocking_Evalversion_as_Fullversion.sxw" by BHremoved switch, changed to invisible help text - About $[officename] Displays general program information such as version number and copyrights.

diff --git a/helpcontent2/source/text/shared/main0204.xhp b/helpcontent2/source/text/shared/main0204.xhp new file mode 100755 index 0000000000..e34665eb53 --- /dev/null +++ b/helpcontent2/source/text/shared/main0204.xhp @@ -0,0 +1,84 @@ + + + + + + + + +Table Bar +/text/shared/main0204.xhp + + + +

+ +Table Bar +The Table Bar contains functions you need when working with tables. It appears when you move the cursor into a table. +

+Area Style / Filling +

+Merge Cells +

+Delete Row +

+Delete Column +

+following only optional, ext.help is available: Select Table Select Column Select Row +Table Design +Opens the Table Design. Double-click a preview to insert a new table.Impress: Table Design tab page in task pane. +Draw: Table Design dialog +Table Properties +

+ + + diff --git a/helpcontent2/source/text/shared/makefile.mk b/helpcontent2/source/text/shared/makefile.mk index 9996559021..72a35ef6fa 100644 --- a/helpcontent2/source/text/shared/makefile.mk +++ b/helpcontent2/source/text/shared/makefile.mk @@ -48,6 +48,7 @@ XHPFILES = \ fontwork_toolbar.xhp \ main0108.xhp \ main0201.xhp \ + main0204.xhp \ main0208.xhp \ main0209.xhp \ main0212.xhp \ diff --git a/helpcontent2/source/text/shared/optionen/01010200.xhp b/helpcontent2/source/text/shared/optionen/01010200.xhp index 20c1115709..c1de985ca9 100644 --- a/helpcontent2/source/text/shared/optionen/01010200.xhp +++ b/helpcontent2/source/text/shared/optionen/01010200.xhp @@ -46,7 +46,7 @@ absolute saving of URLs -General +General In the General section, you can select default settings for saving documents, and can select default file formats.

@@ -59,7 +59,7 @@ oldref="66">Load user-specific settings with the document Loads the user-specific settings saved in a document with the document. If Load user-specific settings with the document is not selected, the following user-specific settings still apply: - + Settings available in File - Print - Options, @@ -77,7 +77,7 @@ The following settings are always loaded with a document, whether or not this option is marked: - + Data source linked to the document and its view. diff --git a/helpcontent2/source/text/shared/optionen/01040200.xhp b/helpcontent2/source/text/shared/optionen/01040200.xhp index c7b09d903e..836859bcd9 100644 --- a/helpcontent2/source/text/shared/optionen/01040200.xhp +++ b/helpcontent2/source/text/shared/optionen/01040200.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,7 +104,6 @@ If the Graphics and objects option is not selected, no graphics will be loaded from the Internet. Graphics within a table and without an indication of their size can cause display problems when using an older HTML standard on the browsed page. Tables Displays the tables contained in your document. - To display the table boundaries, right-click any table and choose Table Boundaries, or choose Table - Table Boundaries in a Writer document. Drawings and controls Displays the drawings and controls contained in your document. diff --git a/helpcontent2/source/text/shared/optionen/01040400.xhp b/helpcontent2/source/text/shared/optionen/01040400.xhp index d28d0242a8..7f95106337 100644 --- a/helpcontent2/source/text/shared/optionen/01040400.xhp +++ b/helpcontent2/source/text/shared/optionen/01040400.xhp @@ -68,27 +68,27 @@ The print settings defined on this tab page apply to all subsequent print jobs, until you change the settings again. If you want to change the settings for the current print job only, use the File - Print dialog. Contents Specifies which document contents are to be printed. - + Graphics -Specifies whether the graphics of your text document are printed. - +Specifies whether the graphics of your text document are printed. + Tables -Specifies whether the tables of the text document are printed. - +Specifies whether the tables of the text document are printed. + Drawings (not for HTML documents) -Specifies whether graphics created with $[officename] drawing functions are printed. - +Specifies whether graphics created with $[officename] drawing functions are printed. + Controls - Specifies whether the form control fields of the text document are printed. + Specifies whether the form control fields of the text document are printed. Background Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document.UFI: fixes #i21977# - + Print black - Specifies whether to always print text in black. + Specifies whether to always print text in black. Hidden text @@ -98,18 +98,18 @@ Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.Text placeholders are fields. Pages Defines the print order for $[officename] Writer documents with multiple pages. - + Left pages (not for HTML documents) - Specifies whether to print all left (even numbered) pages of the document. - + Specifies whether to print all left (even numbered) pages of the document. + Right pages (not for HTML documents) - Specifies whether to print all right (odd numbered) pages of the document. - + Specifies whether to print all right (odd numbered) pages of the document. + Reversed - Specifies whether to reverse the printing order. The last page of the document will then be the first one printed. - + Specifies whether to reverse the printing order. The last page of the document will then be the first one printed. + Brochure - Select the Brochure option to print your document in brochure format. The brochure format is as follows in $[officename] Writer: + Select the Brochure option to print your document in brochure format. The brochure format is as follows in $[officename] Writer:

If you print a document in portrait on a landscape page, two opposing sides in a brochure will be printed next to each other. If you have a printer with double-sided printing capability, you can create an entire brochure from your document without having to collate the pages later. If you have a printer that only has single-sided printing capability, you can achieve this effect by first printing the front pages with the "Front sides / right pages /odd pages" option marked, then re-inserting the entire paper stack in your printer and printing all the back pages with the "Back pages / left pages / even pages" option marked.

@@ -125,12 +125,12 @@ Print automatically inserted blank pages If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not. - + Create single print jobs - Specifies that each new print job will begin on a new page even if you are using a duplex printer. If this field is not checked then it is possible that the first page of the second copy is printed on the reverse side of the last page of the first copy, especially if there are an odd number of pages. - + Specifies that each new print job will begin on a new page even if you are using a duplex printer. If this field is not checked then it is possible that the first page of the second copy is printed on the reverse side of the last page of the first copy, especially if there are an odd number of pages. + Paper tray from printer settings - For printers with multiple trays, the "Paper tray from printer settings" option specifies whether the paper tray used is specified by the system settings of the printer. + For printers with multiple trays, the "Paper tray from printer settings" option specifies whether the paper tray used is specified by the system settings of the printer. Fax If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine. diff --git a/helpcontent2/source/text/shared/optionen/01050100.xhp b/helpcontent2/source/text/shared/optionen/01050100.xhp index 6ddefb1561..e7d50d9423 100644 --- a/helpcontent2/source/text/shared/optionen/01050100.xhp +++ b/helpcontent2/source/text/shared/optionen/01050100.xhp @@ -1,11 +1,11 @@ - + - - + + Grid @@ -55,7 +55,7 @@ Snap to grid

- Specifies whether to move frames, drawing elements, and controls only between grid points. To change the status of the snap grip only for the current action, drag an object while holding down the Control key + Specifies whether to move frames, drawing elements, and controls only between grid points. To change the status of the snap grip only for the current action, drag an object while holding down the Control key Ctrl key.

@@ -64,10 +64,10 @@ Visible grid Specifies whether to display the grid. - It is also possible to toggle the visibility of the grid with the Grid - Visible Grid command in the context menu for the page. You can also select the Grid - Grid to Front submenu of this context menu to display the grid in front of objects. + It is also possible to toggle the visibility of the grid with the Grid - Visible Grid command in the context menu for the page. You can also select the Grid - Grid to Front submenu of this context menu to display the grid in front of objects. - It is also possible to toggle the visibility of the grid with the Grid - Visible Grid command in the context menu of the page. You can also select the Grid - Grid to Front submenu of this context menu to display the grid in front of objects. + It is also possible to toggle the visibility of the grid with the Grid - Visible Grid command in the context menu of the page. You can also select the Grid - Grid to Front submenu of this context menu to display the grid in front of objects.

@@ -86,36 +86,36 @@ Horizontal - Specify the number of intermediate points between grid points on the X-axis.UFI: see #i39831# + Specify the number of intermediate spaces between grid points on the X-axis.UFI: see #i39831#UFI: see #i112000 Vertical - Specify the number of intermediate points between grid points on the Y-axis. + Specify the number of intermediate spaces between grid points on the Y-axis. Synchronize axes Specifies whether to change the current grid settings symmetrically. The resolution and subdivision for the X and Y axes remain the same. - There are additional commands on the context menu of a page: -There are additional commands on the context menu of a page: + There are additional commands on the context menu of a page: +There are additional commands on the context menu of a page:

Grid to Front -Grid to Front + oldref="32">Grid to Front +Grid to Front - Sets the visible grid in front of all objects. -Sets the visible grid in front of all objects. + Sets the visible grid in front of all objects. +Sets the visible grid in front of all objects. Sets the visible grid in front of all objects. Snap Lines to Front -Snap Lines to Front + oldref="34">Snap Lines to Front +Snap Lines to Front - Sets the snap lines in front of all objects. -Sets the snap lines in front of all objects. + Sets the snap lines in front of all objects. +Sets the snap lines in front of all objects. Sets the snap lines in front of all objects.

diff --git a/helpcontent2/source/text/shared/optionen/01070300.xhp b/helpcontent2/source/text/shared/optionen/01070300.xhp index 68511dc868..1be580fcdb 100644 --- a/helpcontent2/source/text/shared/optionen/01070300.xhp +++ b/helpcontent2/source/text/shared/optionen/01070300.xhp @@ -1,11 +1,11 @@ - + - - + + Grid @@ -53,7 +53,6 @@ If you have activated the snap grid but wish to move or create individual objects without snap positions, keep the Shift key pressed to deactivate this function for as long as needed.

Snap - To snap lines @@ -62,38 +61,35 @@ You can also define this setting by using the Snap to Guides Snap to Guides Snap to Guides icon, which is available in the Options bar in a presentation or drawing document. - To the page margins Specifies whether to align the contour of the graphic object to the nearest page margin. - The cursor or a contour line of the graphics object must be in the snap range. + The cursor or a contour line of the graphics object must be in the snap range. In a presentation or drawing document, this function can also be accessed with the Snap to Page Margins Snap to Page Margins Snap to Page Margins icon in the Options bar. - To object frame Specifies whether to align the contour of the graphic object to the border of the nearest graphic object. - The cursor or a contour line of the graphics object must be in the snap range. + The cursor or a contour line of the graphics object must be in the snap range. In a presentation or drawing document, this function can also be accessed with the Snap to Object Border Snap to Object Border Snap to Object Border icon in the Options bar. - To object points Specifies whether to align the contour of the graphic object to the points of the nearest graphic object. - This only applies if the cursor or a contour line of the graphics object is in the snap range. + This only applies if the cursor or a contour line of the graphics object is in the snap range. In a presentation or drawing document, this function can also be accessed with the Snap to Object Points Snap to Object Points diff --git a/helpcontent2/source/text/shared/optionen/01070500.xhp b/helpcontent2/source/text/shared/optionen/01070500.xhp index eb5759d9fe..2240de3da7 100644 --- a/helpcontent2/source/text/shared/optionen/01070500.xhp +++ b/helpcontent2/source/text/shared/optionen/01070500.xhp @@ -1,11 +1,11 @@ - + - - + + General @@ -55,23 +55,21 @@

Text objects - Allow quick editing -Specifies whether to immediately switch to the text editing mode when clicking a text object. +If on, you can edit text immediately after clicking a text object. If off, you must double-click to edit text. -In a presentation or drawing document, you can also activate the text editing mode through the Allow Quick Editing icon in the Option bar. +In a presentation or drawing document, you can also activate the text editing mode through the Allow Quick Editing icon in the Option bar. - Only text area selectable Specifies whether to select a text frame by clicking the text. -In the area of the text frame that is not filled with text, an object behind the text frame can be selected. +In the area of the text frame that is not filled with text, an object behind the text frame can be selected. @@ -88,7 +86,7 @@ Specifies whether to use the cache for displaying objects on the master page. This speeds up the display. Unmark the Use background cache option if you want to display changing contents on the master page. Copy when moving -Specifies whether to automatically create a copy when you move an object while holding down the Ctrl key. The same will apply for rotating and resizing the object. The original object will remain in its current position and size. +If enabled, a copy is created when you move an object while holding down the Ctrl key (Mac: Command key). The same will apply for rotating and resizing the object. The original object will remain in its current position and size. Objects always moveable Specifies that you want to move an object with the Rotate tool enabled. If Object always moveable is not marked, the Rotate tool can only be used to rotate an object. diff --git a/helpcontent2/source/text/shared/optionen/improvement.xhp b/helpcontent2/source/text/shared/optionen/improvement.xhp index 2c72a97367..26fa2128bb 100644 --- a/helpcontent2/source/text/shared/optionen/improvement.xhp +++ b/helpcontent2/source/text/shared/optionen/improvement.xhp @@ -39,7 +39,7 @@

-improvement program + online feedback options options;improvement program improvement program -- cgit From f9068cb3bf53d52579a847b06bf73eaa2e14954a Mon Sep 17 00:00:00 2001 From: Uwe Fischer Date: Mon, 3 Jan 2011 09:32:27 +0100 Subject: hcshared29: fixed pasting.xhp error --- helpcontent2/source/text/shared/guide/pasting.xhp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'helpcontent2/source/text/shared') diff --git a/helpcontent2/source/text/shared/guide/pasting.xhp b/helpcontent2/source/text/shared/guide/pasting.xhp index 11137148fc..e8b8719002 100755 --- a/helpcontent2/source/text/shared/guide/pasting.xhp +++ b/helpcontent2/source/text/shared/guide/pasting.xhp @@ -36,10 +36,6 @@ Pasting Contents in Special Formats /text/shared/guide/pasting.xhp - -UFI: new guide requested by users -checked - yj - clipboard;pasting formatted/unformatted text @@ -53,7 +49,7 @@ Contents that are stored on the clipboard can be pasted into your document using different formats. In %PRODUCTNAME you can choose how to paste the contents using a dialog or a drop-down icon. The available options depend on the contents of the clipboard. -In Writer text documents, you can press Command+OptionCtrl+Alt+Shift+V to paste the contents of the clipboard as unformatted text. +In Writer text documents, you can press Command+OptionCtrl+Alt+Shift+V to paste the contents of the clipboard as unformatted text. Pasting clipboard contents using an icon menu -- cgit From 90b71fc068674f1a8fa7b960a7c9363cfc2e2722 Mon Sep 17 00:00:00 2001 From: Uwe Fischer Date: Wed, 19 Jan 2011 10:08:33 +0100 Subject: hcshared29: final --- helpcontent2/source/text/shared/00/00000200.xhp | 2 +- helpcontent2/source/text/shared/00/00000406.xhp | 2 +- helpcontent2/source/text/shared/01/01170000.xhp | 7 +- helpcontent2/source/text/shared/01/01190000.xhp | 10 +- helpcontent2/source/text/shared/01/02100000.xhp | 14 ++- helpcontent2/source/text/shared/01/06030000.xhp | 23 ++-- .../source/text/shared/01/extensionupdate.xhp | 83 +++++++------- .../source/text/shared/01/packagemanager.xhp | 122 +++++++++------------ helpcontent2/source/text/shared/02/07010000.xhp | 8 +- .../source/text/shared/optionen/01013000.xhp | 9 +- .../source/text/shared/optionen/01040400.xhp | 22 ++-- 11 files changed, 141 insertions(+), 161 deletions(-) (limited to 'helpcontent2/source/text/shared') diff --git a/helpcontent2/source/text/shared/00/00000200.xhp b/helpcontent2/source/text/shared/00/00000200.xhp index 4079f9f663..f4683c0b9c 100755 --- a/helpcontent2/source/text/shared/00/00000200.xhp +++ b/helpcontent2/source/text/shared/00/00000200.xhp @@ -94,7 +94,7 @@ For GIF files you can set the transparency and the interlaced mode. -Specifies whether to save the background of the picture as transparent. Only objects will be visible in the GIF image. Use the Eyedropper to set the transparent color in the picture. +Specifies whether to save the background of the picture as transparent. Only objects will be visible in the GIF image. Use the Color Replacer to set the transparent color in the picture. EPS controls For EPS files you can set the preview, the color format, the compression, and the version. diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp index d16dda5565..46e6d48b79 100644 --- a/helpcontent2/source/text/shared/00/00000406.xhp +++ b/helpcontent2/source/text/shared/00/00000406.xhp @@ -97,7 +97,7 @@ Ctrl+F7

- Choose Tools - Eyedropper ($[officename] Draw and $[officename] Impress) + Choose Tools - Color Replacer ($[officename] Draw and $[officename] Impress)

Choose Tools - Media Player diff --git a/helpcontent2/source/text/shared/01/01170000.xhp b/helpcontent2/source/text/shared/01/01170000.xhp index 3872acfeb2..63008c09b0 100644 --- a/helpcontent2/source/text/shared/01/01170000.xhp +++ b/helpcontent2/source/text/shared/01/01170000.xhp @@ -6,8 +6,8 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * Copyright 2000, 2011 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -43,9 +43,8 @@

exiting;$[officename] mw made "exiting..." a two level entry - Exit -Closes all $[officename] programs and prompts you to save your changes. +Closes all $[officename] programs and prompts you to save your changes. This command does not exist on Mac OS X systems.

diff --git a/helpcontent2/source/text/shared/01/01190000.xhp b/helpcontent2/source/text/shared/01/01190000.xhp index 840e9b5a4b..1d6fa87952 100644 --- a/helpcontent2/source/text/shared/01/01190000.xhp +++ b/helpcontent2/source/text/shared/01/01190000.xhp @@ -4,7 +4,7 @@ - + Versions /text/shared/01/01190000.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - versions;file saving as, restriction - Versions Saves and organizes multiple versions of the current document in the same file. You can also open, delete, and compare previous versions. @@ -64,6 +59,7 @@ Always save version when closing If you have made changes to your document, $[officename] automatically saves a new version when you close the document. +If you save the document manually, do not change the document after saving, and then close, no new version will be created.issue 12653 Existing versions Lists the existing versions of the current document, the date and the time they were created, the author and the associated comments. diff --git a/helpcontent2/source/text/shared/01/02100000.xhp b/helpcontent2/source/text/shared/01/02100000.xhp index c2c98db9bc..227fa3f74d 100644 --- a/helpcontent2/source/text/shared/01/02100000.xhp +++ b/helpcontent2/source/text/shared/01/02100000.xhp @@ -6,7 +6,7 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * Copyright 2000, 2011 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -61,7 +61,7 @@ Click to search the next occurrence in upward direction. - + Search For @@ -167,12 +167,16 @@ Ext help text not found within switches. Solution: Keep switched text for normal - + Find All -Finds and selects all instances of the text or the format that you are searching for in the document (only in Writer and Calc documents). +Finds and selects all instances of the text or the format that you are searching for in the document (only in Writer and Calc documents). - +copied text as hidden help, see issue 115137 + +Finds and selects all instances of the text or the format that you are searching for in the document (only in Writer and Calc documents). + + Find Finds and selects the next occurrence of the text or format that you searching for in the document. diff --git a/helpcontent2/source/text/shared/01/06030000.xhp b/helpcontent2/source/text/shared/01/06030000.xhp index 95b238d223..3e7ac6f694 100644 --- a/helpcontent2/source/text/shared/01/06030000.xhp +++ b/helpcontent2/source/text/shared/01/06030000.xhp @@ -4,7 +4,7 @@ - + -Eyedropper +Color Replacer /text/shared/01/06030000.xhp - -Sun Microsystems, Inc. -converted from old format - fpe -

- -Eyedropper -Opens the eyedropper dialog, where you can replace colors in bitmap and meta file graphics. +Color Replacer +Opens the Color Replacer dialog, where you can replace colors in bitmap and meta file graphics.

You can replace up to four different colors at one time.

@@ -64,7 +59,7 @@ -Eyedropper +Color Replacer @@ -72,8 +67,8 @@ Select one of the four source color boxes. Move the mouse pointer over the selected image, and then click the color that you want to replace. -Eyedropper color -Displays the color in the selected image that directly underlies the current mouse pointer position. This features only works if the eyedropper tool is selected. +Color Replacer color +Displays the color in the selected image that directly underlies the current mouse pointer position. This features only works if the Color Replacer tool is selected. Replace Replaces the selected source colors in the current image with the colors that you specify in the Replace with boxes. @@ -87,7 +82,7 @@ Select this checkbox to replace the current Source color with the color that you specify in the Replace with box. Source color -Displays the color in the selected image that you want to replace. To set the source color, click here, click the eyedropper, and then click a color in the selected image. +Displays the color in the selected image that you want to replace. To set the source color, click here, click the Color Replacer, and then click a color in the selected image. diff --git a/helpcontent2/source/text/shared/01/extensionupdate.xhp b/helpcontent2/source/text/shared/01/extensionupdate.xhp index 9876e465b0..4889648988 100644 --- a/helpcontent2/source/text/shared/01/extensionupdate.xhp +++ b/helpcontent2/source/text/shared/01/extensionupdate.xhp @@ -1,8 +1,5 @@ - - - - - + ************************************************************************ --> - - Extension Update - /text/shared/01/extensionupdate.xhp - - - + +Extension Update +shared/01/extensionupdate.xhp + + + -Extension Update - Click the Check for Updates button in the Extension Manager to check for online updates for all installed extensions. To check for online updates for only the selected extension, right-click to open the context menu, then choose Update. -

- - -insert hidden text for Exclude from this update/from all updates/include again, see i115834 - - When you click the Check for Updates button or choose the Update command, the Extension Update dialog is displayed and the check for availability of updates starts immediately. +Extension Update +Click the Check for Updates button in the Extension Manager to check for online updates for all installed extensions. To check for online updates for only the selected extension, right-click to open the context menu, then choose Update. +

insert hidden text for Exclude from this update/from all updates/include again, see i115834 - not needed because no Help ID assigned +When you click the Check for Updates button or choose the Update command, the Extension Update dialog is displayed and the check for availability of updates starts immediately. -While checking for updates, you see a progress indicator. Wait for some messages to show up in the dialog, or click Cancel to abort the update check. - If no updates are available, the message in the dialog tells you there are no updates. Close the dialog. - If updates are available, the updates can either be installed automatically, or you must respond with some action: - The Extension Update dialog may contain entries which are not selectable and hence no automatic update can be performed. - Dependencies are not fulfilled (the update needs some more or newer files to be installed). - Insufficient user rights (the Extension Manager was started from the menu, but shared extensions can only be modified when %PRODUCTNAME does not run, and only by a user with appropriate rights). See Extension Manager for details. - A manual update is necessary. +While checking for updates, you see a progress indicator. Wait for some messages to show up in the dialog, or click Cancel to abort the update check. +If no updates are available, the message in the dialog tells you there are no updates. Close the dialog. +If updates are available, the updates can either be installed automatically, or you must respond with some action: +The Extension Update dialog may contain entries which are not selectable and hence no automatic update can be performed. + + +Dependencies are not fulfilled (the update needs some more or newer files to be installed). + + +Insufficient user rights (the Extension Manager was started from the menu, but shared extensions can only be modified when %PRODUCTNAME does not run, and only by a user with appropriate rights). See Extension Manager for details. + + +A manual update is necessary. + -When you click the Install button the Download and Installation dialog is displayed. - All extensions which can be directly downloaded are downloaded now. The progress is shown in the Download and Installation dialog. If an extension cannot be downloaded, a message is displayed. The operation continues for the remaining extensions. - Some extensions may be marked with the phrase "browser based update". These extensions cannot be downloaded by the Extension Manager. A web browser must be opened to download the extension update from a particular web site. That site may require several more user interaction to download the extension. After downloading you must install the extension manually, for example by double-clicking the extension's icon in a file browser. - For extensions marked as "browser based update", the Extension Manager will open your web browser on the respective web site. This happens when you close the dialog, after downloading any other extension updates. If there are no extensions which can be directly downloaded then the web browser is started immediately. - After the last extension has been downloaded, the installation begins. First all installed extensions for which an update could be downloaded successfully, are removed. Then the updated extensions are installed. If an error occurs, a message that the installation failed is displayed, but the operation proceeds. - If all updates have been processed the Download and Installation dialog shows that it has finished. You can abort the download and installation process by clicking the Abort Update button. +When you click the Install button the Download and Installation dialog is displayed. +All extensions which can be directly downloaded are downloaded now. The progress is shown in the Download and Installation dialog. If an extension cannot be downloaded, a message is displayed. The operation continues for the remaining extensions. +Some extensions may be marked with the phrase "browser based update". These extensions cannot be downloaded by the Extension Manager. A web browser must be opened to download the extension update from a particular web site. That site may require several more user interaction to download the extension. After downloading you must install the extension manually, for example by double-clicking the extension's icon in a file browser. +For extensions marked as "browser based update", the Extension Manager will open your web browser on the respective web site. This happens when you close the dialog, after downloading any other extension updates. If there are no extensions which can be directly downloaded then the web browser is started immediately. +After the last extension has been downloaded, the installation begins. First all installed extensions for which an update could be downloaded successfully, are removed. Then the updated extensions are installed. If an error occurs, a message that the installation failed is displayed, but the operation proceeds. +If all updates have been processed the Download and Installation dialog shows that it has finished. You can abort the download and installation process by clicking the Abort Update button. -Show all Updates - By default, only the downloadable extensions are shown in the dialog. Mark Show all Updates to see also other extensions and error messages. -

- Extension Manager -

- +Show all Updates +By default, only the down-loadable extensions are shown in the dialog. Mark Show all Updates to see also other extensions and error messages. +

+Extension Manager +

+ \ No newline at end of file diff --git a/helpcontent2/source/text/shared/01/packagemanager.xhp b/helpcontent2/source/text/shared/01/packagemanager.xhp index 4de07e8fbc..e3db16ed62 100644 --- a/helpcontent2/source/text/shared/01/packagemanager.xhp +++ b/helpcontent2/source/text/shared/01/packagemanager.xhp @@ -1,8 +1,5 @@ - - - - - + ************************************************************************ --> -Extension Manager -/text/shared/01/packagemanager.xhp +Extension Manager +shared/01/packagemanager.xhp

-UNO components;Extension Manager + +UNO components;Extension Manager extensions;Extension Manager packages, see extensions MW corrected typos in "UNO components;...", made "Extension Manager" a two level entry and changed the "packages" reference -Extension Managerrenamed in i69568 -The Extension Manager adds, removes, disables, enables, and updates %PRODUCTNAME extensions. +Extension Managerrenamed in i69568 +The Extension Manager adds, removes, disables, enables, and updates %PRODUCTNAME extensions.

-The following are examples of %PRODUCTNAME extensions: +The following are examples of %PRODUCTNAME extensions: -UNO components (compiled software modules) +UNO components (compiled software modules) -Configuration data (for menu commands) +Configuration data (for menu commands) -%PRODUCTNAME Basic libraries +%PRODUCTNAME Basic libraries -%PRODUCTNAME dialog libraries +%PRODUCTNAME dialog libraries -Extension files (*.oxt files containing one or more extensions of the above listed types) +Extension files (*.oxt files containing one or more extensions of the above listed types) -Extension Scope -Users with administrator or root privileges will see a dialog where they can choose to install extensions "for all users" or "only for me". Normal users without those privileges can install, remove, or modify extensions only for their own use. +Extension Scope +Users with administrator or root privileges will see a dialog where they can choose to install extensions "for all users" or "only for me". Normal users without those privileges can install, remove, or modify extensions only for their own use. -A user with root or administrator privileges can install an extension as a shared extension that is available to all users. After selecting an extension, a dialog opens and asks whether to install for the current user or all users. +A user with root or administrator privileges can install an extension as a shared extension that is available to all users. After selecting an extension, a dialog opens and asks whether to install for the current user or all users. -A user without root privileges can only install an extension for own usage. This is called a user extension. +A user without root privileges can only install an extension for own usage. This is called a user extension. UFI: Extension Guide needed. Until we have that guide, I'll add some more info in this file. -To install an extension -An extension is available as a file with the file extension .oxt. -You can find a collection of extensions on the Web. Click the "Get more extensions here" link in the Extension Manager to open your Web browser and see the http://extensions.services.openoffice.org/ page.# i78606 -To install a user extension -Do any of the following: +To install an extension +An extension is available as a file with the file extension .oxt. +You can find a collection of extensions on the Web. Click the "Get more extensions here" link in the Extension Manager to open your Web browser and see the http://extensions.services.openoffice.org/ page.# i78606 +To install a user extension +Do any of the following: -Double-click the .oxt file in your system's file browser. +Double-click the .oxt file in your system's file browser. -On a web page, click a hyperlink to an *.oxt file (if your web browser can be configured to start the Extension Manager for this file type). +On a web page, click a hyperlink to an *.oxt file (if your web browser can be configured to start the Extension Manager for this file type). -Choose Tools - Extension Manager and click Add. +Choose Tools - Extension Manager and click Add. -To install a shared extension in text mode +To install a shared extension in text mode (for system administrators) -As an administrator, open a terminal or command shell. +As an administrator, open a terminal or command shell. -Change to the %PRODUCTNAME\ -/program folder. +Change to the \ +/program folder in your installation. -Enter the following command, using the path and file name of your extension: - -unopkg add --shared path_filename.oxt - +Enter the following command, using the path and file name of your extension: +unopkg add --shared path_filename.oxt -Select the extension that you want to remove, enable, or disable. For some extensions, you can also open an Options dialog. - - -Add -Click Add to add an extension. -A file dialog opens where you can select the extension that you want to add. To copy and to register the selected extension, click Open. +Select the extension that you want to remove, enable, or disable. For some extensions, you can also open an Options dialog. +Add +Click Add to add an extension. +A file dialog opens where you can select the extension that you want to add. To copy and to register the selected extension, click Open. -An extension can show a license dialog. Read the license. Click the Scroll Down button to scroll down if necessary. Click Accept to continue the installation of the extension. - -insert hidden text for Show License - - - +An extension can show a license dialog. Read the license. Click the Scroll Down button to scroll down if necessary. Click Accept to continue the installation of the extension.insert hidden text for Show License -Remove -Select the extension that you want to remove, and then click Remove. +Remove +Select the extension that you want to remove, and then click Remove. -Enable or disable the extension. - -Enable -Select the extension that you want to enable, and then click Enable. - -Disable -Select the extension that you want to disable, and then click Disable. - - -Update -Click to check for online updates of all installed extensions. To check for updates of the selected extension only, choose the Update command from the context menu. The check for availability of updates starts immediately. You will see the Extension Update dialog. - +Enable or disable the extension. +Enable +Select the extension that you want to enable, and then click Enable. +Disable +Select the extension that you want to disable, and then click Disable. +Update +Click to check for online updates of all installed extensions. To check for updates of the selected extension only, choose the Update command from the context menu. The check for availability of updates starts immediately. You will see the Extension Update dialog. -Options -Select an installed extension, then click to open the Options dialog for the extension. +Options +Select an installed extension, then click to open the Options dialog for the extension. +Some additional commands can appear in the context menu of an extension in the Extension Manager window, depending on the selected extension. You can choose to show the license text again. You can choose to exclude the extension from checking for updates or to include an excluded extension. - + \ No newline at end of file diff --git a/helpcontent2/source/text/shared/02/07010000.xhp b/helpcontent2/source/text/shared/02/07010000.xhp index 5e454f36a8..c4f41ce291 100644 --- a/helpcontent2/source/text/shared/02/07010000.xhp +++ b/helpcontent2/source/text/shared/02/07010000.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,9 +30,7 @@ * ************************************************************************ --> - - - + Load URL @@ -43,7 +41,7 @@

Load URL -Loads a document specified by an entered URL. You can type a new URL or select one from the list. %PRODUCTNAME automatically converts file paths into URL notation. +Loads a document specified by an entered URL. You can type a new URL, edit an URL, or select one from the list. Displays the full path of the current document. Enable Load URL with the Visible Buttons command (click the arrow at the end of the toolbar).i73505

diff --git a/helpcontent2/source/text/shared/optionen/01013000.xhp b/helpcontent2/source/text/shared/optionen/01013000.xhp index 56a2539d91..afaf6419c3 100755 --- a/helpcontent2/source/text/shared/optionen/01013000.xhp +++ b/helpcontent2/source/text/shared/optionen/01013000.xhp @@ -6,8 +6,8 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * Copyright 2000, 2011 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * @@ -64,8 +64,9 @@ Allows you to use assistive tools, such as external screen readers, Braille devices or speech recognition input devices. The Java Runtime Environment must be installed on your computer before you can enable assistive support. Use text selection cursor in read-only text document Displays cursor in read-only documents. -Use system font for user interface -Displays fonts in menus, dialogs, and other user interface elements using the system font settings. + +issue 103084 + Allow animated graphics Previews animated graphics, such as GIF images, in %PRODUCTNAME. Allow animated text diff --git a/helpcontent2/source/text/shared/optionen/01040400.xhp b/helpcontent2/source/text/shared/optionen/01040400.xhp index 7f95106337..5904822866 100644 --- a/helpcontent2/source/text/shared/optionen/01040400.xhp +++ b/helpcontent2/source/text/shared/optionen/01040400.xhp @@ -70,7 +70,7 @@ Specifies which document contents are to be printed. -Graphics +Pictures and objects Specifies whether the graphics of your text document are printed. Tables @@ -80,10 +80,11 @@ Specifies whether graphics created with $[officename] drawing functions are printed. -Controls +Form controls Specifies whether the form control fields of the text document are printed. -Background + +Page background Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document.UFI: fixes #i21977# @@ -94,6 +95,7 @@ Hidden text Enable this option to print text that is marked as hidden. The following hidden text is printed: text that is formatted as hidden by Format - Character - Font Effects - Hidden, and the text fields Hidden text and Hidden paragraphs.UFI: sorry, due to a bug no links allowed in extended help text + Text placeholder Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.Text placeholders are fields. Pages @@ -104,18 +106,22 @@ Right pages (not for HTML documents) Specifies whether to print all right (odd numbered) pages of the document. - + + Reversed Specifies whether to reverse the printing order. The last page of the document will then be the first one printed. - + + Brochure Select the Brochure option to print your document in brochure format. The brochure format is as follows in $[officename] Writer:

+ Right to left Check to print the pages of the brochure in the correct order for a right-to-left script. + Comments @@ -124,11 +130,13 @@ Print automatically inserted blank pages - If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not. +If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not. +issue 116009 Create single print jobs Specifies that each new print job will begin on a new page even if you are using a duplex printer. If this field is not checked then it is possible that the first page of the second copy is printed on the reverse side of the last page of the first copy, especially if there are an odd number of pages. - + + Paper tray from printer settings For printers with multiple trays, the "Paper tray from printer settings" option specifies whether the paper tray used is specified by the system settings of the printer. -- cgit