Page

@@ -78,7 +78,7 @@ Turns sound off and on. Volume slider Adjusts the volume. - Zoom + View Adjusts the size of the movie playback. Position slider Moves to a different position in the file. diff --git a/helpcontent2/source/text/shared/autopi/01130000.xhp b/helpcontent2/source/text/shared/autopi/01130000.xhp index 12227de0d4..76f8d0d9aa 100755 --- a/helpcontent2/source/text/shared/autopi/01130000.xhp +++ b/helpcontent2/source/text/shared/autopi/01130000.xhp @@ -1,11 +1,11 @@ - + - - + + Document Converter @@ -43,6 +43,7 @@ mw deleted all index entries because of guide import_ms.xhp + Document Converter Copies and converts documents into the OpenDocument XML format used by $[officename]. diff --git a/helpcontent2/source/text/shared/autopi/01150000.xhp b/helpcontent2/source/text/shared/autopi/01150000.xhp index 4e180daa23..e2735e910c 100644 --- a/helpcontent2/source/text/shared/autopi/01150000.xhp +++ b/helpcontent2/source/text/shared/autopi/01150000.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,8 +34,7 @@ ************************************************************************ --> - - + Euro Converter Wizard @@ -50,7 +49,9 @@ -Euro Converter Wizard + + +Euro Converter Wizard Converts the currency amounts found in $[officename] Calc documents and in fields and tables of $[officename] Writer documents into euros. Only closed files are converted. It is possible, however, to use the Euro Converter in an open $[officename] Calc document. In this case, a separate dialog opens. This dialog is described at the end of this section. diff --git a/helpcontent2/source/text/shared/autopi/01170000.xhp b/helpcontent2/source/text/shared/autopi/01170000.xhp index 7c28be8667..f1543fdf97 100755 --- a/helpcontent2/source/text/shared/autopi/01170000.xhp +++ b/helpcontent2/source/text/shared/autopi/01170000.xhp @@ -1,11 +1,11 @@ - + - - + + Address Data Source @@ -44,6 +44,7 @@

+ Address Data Source This wizard registers an existing address book as a data source in $[officename]. diff --git a/helpcontent2/source/text/shared/guide/collab.xhp b/helpcontent2/source/text/shared/guide/collab.xhp index 5611fbcb06..7527178451 100644 --- a/helpcontent2/source/text/shared/guide/collab.xhp +++ b/helpcontent2/source/text/shared/guide/collab.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,11 +47,11 @@ collaboration MW changed the index entries to one level entries. - Collaboration + 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 @@ -86,23 +86,23 @@ 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 - + Keeps your change, voids the other change. Keep Other - + 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 the changes of all other users, voids your changes. Saving a shared spreadsheet document @@ -123,6 +123,7 @@ 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: @@ -140,10 +141,23 @@ 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 - +

diff --git a/helpcontent2/source/text/shared/guide/fontwork.xhp b/helpcontent2/source/text/shared/guide/fontwork.xhp index 8dc43440c8..1dc6550687 100755 --- a/helpcontent2/source/text/shared/guide/fontwork.xhp +++ b/helpcontent2/source/text/shared/guide/fontwork.xhp @@ -70,10 +70,10 @@ -Select a Fontwork style and click OK to insert the Fontwork into your document. Double-click the Fontwork in your document to enter text edit mode and change the text. +Select a Fontwork style and click OK to insert the Fontwork into your document. Double-click or Ctrl+double-click the Fontwork in your document to enter text edit mode and change the text. In the Fontwork Gallery dialog, select a Fontwork style and click OK. - The Fontwork object is inserted into your document. + The Fontwork object is inserted into your document. Fontwork objects are Custom Shapes. Using the 3D Settings toolbar, you can switch the view at any time from 2D to 3D and back. Double-click the object to enter text edit mode. diff --git a/helpcontent2/source/text/shared/guide/import_ms.xhp b/helpcontent2/source/text/shared/guide/import_ms.xhp index 0618ec04d6..afca74c3b0 100755 --- a/helpcontent2/source/text/shared/guide/import_ms.xhp +++ b/helpcontent2/source/text/shared/guide/import_ms.xhp @@ -57,8 +57,9 @@ converters; XML Document Converter Wizard wizards; document converter + converters; document converter files, see also documents -MW inserted cross-reference "files, see also documents"MW changed "defaults;..." +MW inserted cross-reference "files, see also documents"MW changed "defaults;..."ufi added "converters;document converter" Opening documents saved in other formats You can open a document saved in another format by using the following procedure: diff --git a/helpcontent2/source/text/shared/optionen/01030500.xhp b/helpcontent2/source/text/shared/optionen/01030500.xhp index 24108d2ac2..2e626a0250 100644 --- a/helpcontent2/source/text/shared/optionen/01030500.xhp +++ b/helpcontent2/source/text/shared/optionen/01030500.xhp @@ -5,7 +5,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ * ************************************************************************ --> - + @@ -47,6 +47,7 @@

$[officename] Basic scripts in HTML documents +HTML;compatibility settings HTML compatibility -- cgit