3D View

@@ -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 diff --git a/helpcontent2/source/text/simpress/02/10090000.xhp b/helpcontent2/source/text/simpress/02/10090000.xhp index bc012c6d98..e57521a780 100644 --- a/helpcontent2/source/text/simpress/02/10090000.xhp +++ b/helpcontent2/source/text/simpress/02/10090000.xhp @@ -4,7 +4,7 @@ - + 3D Objects /text/simpress/02/10090000.xhp - -Sun Microsystems, Inc. -converted from old format - fpe - toolbars;3D objects @@ -61,7 +57,7 @@ 3D Objects -Open the 3D Objects toolbar, where you can add 3D shapes to the current slide. +Opens the 3D Objects toolbar. The objects are three dimensional, with depth, illumination, and reflection. Each inserted object initially forms a 3D scene. You can press F3 to enter the scene. For these 3D objects, you can open the 3D Effects dialog to edit the properties.

diff --git a/helpcontent2/source/text/simpress/guide/3d_create.xhp b/helpcontent2/source/text/simpress/guide/3d_create.xhp index a04219d019..5866dd773e 100755 --- a/helpcontent2/source/text/simpress/guide/3d_create.xhp +++ b/helpcontent2/source/text/simpress/guide/3d_create.xhp @@ -4,7 +4,7 @@ - + Converting 2D Objects to Curves, Polygons, and 3D Objects /text/simpress/guide/3d_create.xhp - -Sun Microsystems, Inc. -FPE: Deleted screenshots - 3D rotation objects; generating 3D objects; generating +3D scenes; creating converting; to curves, polygons, 3D extrusion objects - +added 3D scenes, issue 109330 Converting 2D Objects to Curves, Polygons, and 3D Objects You can convert two dimensional (2D) objects to create different shapes. $[officename] can convert 2D objects to the following object types: @@ -65,6 +62,18 @@ 3D rotation object with shading and a light source + +Two types of 3D objects + + +The Status bar displays "3D scene selected". The 3D scenes are built from objects which have dimensions in x, y, and z coordinates. Examples are the objects inserted by the 3D Objects toolbar, and rectangles, ellipses, or text that got created by the Rectangle, Ellipse, or Text icons left on the Drawing toolbar, or any Custom Shapes, and that got converted to 3D by using the context menu "Convert - To 3D". These 3D scenes can be entered (for example, by pressing F3), and the objects can be rotated in 3D. Microsoft Office doesn't know these real 3D objects. When exporting these 3D scenes to Microsoft Office formats, a snapshot of the current view will be exported as a bitmap. 3D bars in charts are of this type, too. + + +The Status bar displays "Shape selected". The Custom Shapes can be viewed in a 2D mode or in a 3D mode. At any time, you can switch the view between the two modes. You use the Basic Shapes, Symbol Shapes, and the following icons on the Drawing toolbar to create Custom Shapes. The Custom Shapes can be changed using the 3D Settings toolbar. They do not form a 3D scene, they cannot be illuminated by more than one light source, they show no reflections, and there are some more limitations. You can convert them to a 3D scene, but then they are no longer Custom Shapes. Custom Shapes in 2D or 3D mode can be exported to and imported from Microsoft Office formats. + + + + To convert an object to a curved shape: @@ -74,7 +83,7 @@ Right-click the object and choose Convert - To Curve. -To modify the shape of the object, click the Points icon +To modify the shape of the object, click the Points icon

Icon on the Drawing toolbar, and drag the handles of the object. You can also drag the control points of a handle to modify the shape of the curve. To convert a 2D object to a polygon: @@ -87,7 +96,7 @@ -To modify the shape of the object, click the Points icon +To modify the shape of the object, click the Points icon

Icon on the Drawing toolbar, and drag the handles of the object. To convert a 2D object to a 3D object: @@ -96,13 +105,13 @@ Select a 2D object on the slide or page. -Click the Extrusion On/Off icon +Click the Extrusion On/Off icon

Icon on the Drawing bar, or right-click the object and choose Convert - To 3D. To edit the properties of the 3D object, use the Line and Filling toolbar and the 3D Settings toolbar. -To convert a text object to 3D, use the Fontwork icon +To convert a text object to 3D, use the Fontwork icon

Icon on the Drawing toolbar. To convert a 2D object to a 3D rotation object: diff --git a/helpcontent2/source/text/swriter/01/02110100.xhp b/helpcontent2/source/text/swriter/01/02110100.xhp index 1cb8aacc89..ca550bfdcf 100644 --- a/helpcontent2/source/text/swriter/01/02110100.xhp +++ b/helpcontent2/source/text/swriter/01/02110100.xhp @@ -4,7 +4,7 @@ - + @@ -59,7 +59,7 @@ Open the Navigation toolbar by clicking on its icon located in the vertical scrollbar. You can break the toolbar away from its place by dragging and arrange it on the screen. Click the icon for the type of objects you want to browse through. Then click one of the "Previous Object" or "Next Object" arrow buttons. The names of these buttons indicate the type of object you have selected. The text cursor is placed on whichever object you have selected. -You can configure $[officename] according to your specific preferences for navigating within a document. To do this, choose Tools - Configuration. The various tables for adapting menus, keyboard input or toolbars contain various functions for navigation within the document under the "Navigate" area. In this way you can jump to the index tags in the document with the "To Next/Previous Index Tag" functions. +You can configure $[officename] according to your specific preferences for navigating within a document. To do this, choose Tools - Customize. The various tables for adapting menus, keyboard input or toolbars contain various functions for navigation within the document under the "Navigate" area. In this way you can jump to the index tags in the document with the "To Next/Previous Index Tag" functions. searching; repeating a search Repeat Search diff --git a/helpcontent2/source/text/swriter/01/04090004.xhp b/helpcontent2/source/text/swriter/01/04090004.xhp index e8248bdeda..7e07cadcc1 100644 --- a/helpcontent2/source/text/swriter/01/04090004.xhp +++ b/helpcontent2/source/text/swriter/01/04090004.xhp @@ -1,11 +1,11 @@ - + - - + + DocInformation @@ -80,10 +80,10 @@ -Description +Comments -Inserts the comment as entered in the Description tab of the File Properties dialog. +Inserts the comments as entered in the Description tab page of the Properties dialog. diff --git a/helpcontent2/source/text/swriter/01/04120213.xhp b/helpcontent2/source/text/swriter/01/04120213.xhp index ca38e773a0..2c53bfa6ea 100755 --- a/helpcontent2/source/text/swriter/01/04120213.xhp +++ b/helpcontent2/source/text/swriter/01/04120213.xhp @@ -4,7 +4,7 @@ - + @@ -101,7 +101,7 @@ If you select "Caption Text", the punctuation and the space at the beginning of the caption does not appear in the index entry. -Object name +Object names Creates index entries from object names. You can view object names in the Navigator, for example, and change them in the context menu. diff --git a/helpcontent2/source/text/swriter/01/04120221.xhp b/helpcontent2/source/text/swriter/01/04120221.xhp index bcc1a7a4a4..a1e9647545 100755 --- a/helpcontent2/source/text/swriter/01/04120221.xhp +++ b/helpcontent2/source/text/swriter/01/04120221.xhp @@ -103,7 +103,7 @@ Select the tab leader that you want use. Tab stop position Enter the distance to leave between the left page margin and the tab stop. -To right margin +Align right Aligns the tab stop to the right page margin.

diff --git a/helpcontent2/source/text/swriter/01/04120227.xhp b/helpcontent2/source/text/swriter/01/04120227.xhp index 13f12083c2..0d4a544cfa 100755 --- a/helpcontent2/source/text/swriter/01/04120227.xhp +++ b/helpcontent2/source/text/swriter/01/04120227.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 @@ -44,12 +44,12 @@ Entries (bibliography) -Specify the format for bibliography entries. +Specify the format for bibliography entries.

+Type The types that are displayed depend on the different literature sources.

diff --git a/helpcontent2/source/text/swriter/01/05030800.xhp b/helpcontent2/source/text/swriter/01/05030800.xhp index 1be997e10e..0a62fbb405 100755 --- a/helpcontent2/source/text/swriter/01/05030800.xhp +++ b/helpcontent2/source/text/swriter/01/05030800.xhp @@ -1,11 +1,11 @@ - + - - + + Outline & Numbering @@ -61,11 +61,12 @@ Outline level Assigns an outline level from 1 to 10 to the selected paragraphs or Paragraph Style. Select Body text to reset the outline level.removed two old paras - + Numbering + Numbering Style Select the Numbering Style that you want to apply to the paragraph. These styles are also listed in the Styles and Formatting window if you click the Numbering Style icon. - Numbering + This section only appears when you edit the properties of the current paragraph by choosing Format - Paragraph. Restart at this paragraph diff --git a/helpcontent2/source/text/swriter/01/05040600.xhp b/helpcontent2/source/text/swriter/01/05040600.xhp index 30c269e70d..51d1c9f8b6 100644 --- a/helpcontent2/source/text/swriter/01/05040600.xhp +++ b/helpcontent2/source/text/swriter/01/05040600.xhp @@ -1,11 +1,11 @@ - + - - + + Footnote @@ -56,9 +56,8 @@ Automatically adjusts the height of the footnote area depending on the number of footnotes. Maximum Footnote Height - Sets a maximum height for the footnote area. Select this check box, and then enter the height. + Sets a maximum height for the footnote area. Enable this option, then enter the height. -Maximum Footnote Height Enter the maximum height for the footnote area. - + - - + + Convert Text to Table @@ -74,9 +74,11 @@ Equal width for all columns Creates columns of equal width, regardless of the position of the column marker. + -AutoCorrect -

+AutoFormat +Opens the AutoFormat dialog, where you can select a predefined layout for table. + Options Heading diff --git a/helpcontent2/source/text/swriter/main0210.xhp b/helpcontent2/source/text/swriter/main0210.xhp index 2fd571e078..ad442705d7 100755 --- a/helpcontent2/source/text/swriter/main0210.xhp +++ b/helpcontent2/source/text/swriter/main0210.xhp @@ -4,7 +4,7 @@ - + @@ -68,6 +68,6 @@

+ -- cgit