$[officename]

From 8aaa14a95b40109cdbfe00e63f5eab32d7c450f0 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 26 Aug 2009 08:17:39 +0000 Subject: CWS-TOOLING: integrate CWS hcshared22 2009-07-21 13:08:41 +0200 ufi r274186 : hidlst 2009-07-21 12:34:16 +0200 ufi r274179 : makefiles 2009-07-21 12:33:01 +0200 ufi r274177 : fixes 2009-07-21 12:22:32 +0200 ufi r274175 : hidlst 2009-07-21 10:20:12 +0200 ufi r274167 : bugfixes 2009-07-21 10:19:42 +0200 ufi r274166 : bugfixes 2009-07-21 10:07:53 +0200 ufi r274165 : errorfix 2009-07-21 09:56:18 +0200 ufi r274162 : vor build 2009-07-13 11:49:18 +0200 ufi r273923 : CWS-TOOLING: rebase CWS hcshared22 to trunk@273858 (milestone: DEV300:m52) 2009-07-10 12:29:33 +0200 ufi r273885 : makefiles 2009-07-10 09:48:46 +0200 ufi r273875 : vor rebase 2009-07-10 09:48:19 +0200 ufi r273874 : vor rebase 2009-07-10 09:47:23 +0200 ufi r273873 : vor rebase --- .../source/text/shared/optionen/01010000.xhp | 71 +++++------ .../source/text/shared/optionen/01010800.xhp | 58 ++++----- .../source/text/shared/optionen/01020400.xhp | 77 +++++------ .../source/text/shared/optionen/01030000.xhp | 61 +++++---- .../source/text/shared/optionen/01030300.xhp | 2 +- .../source/text/shared/optionen/01030500.xhp | 1 - .../source/text/shared/optionen/01040700.xhp | 89 ++++++------- .../source/text/shared/optionen/01050100.xhp | 136 +++++++++++--------- .../source/text/shared/optionen/01070300.xhp | 141 +++++++++++---------- .../source/text/shared/optionen/improvement.xhp | 120 ++++++++++++++++++ .../source/text/shared/optionen/makefile.mk | 1 + 11 files changed, 454 insertions(+), 303 deletions(-) create mode 100644 helpcontent2/source/text/shared/optionen/improvement.xhp (limited to 'helpcontent2/source/text/shared/optionen') diff --git a/helpcontent2/source/text/shared/optionen/01010000.xhp b/helpcontent2/source/text/shared/optionen/01010000.xhp index 3e30f0d373..22e7a8741c 100755 --- a/helpcontent2/source/text/shared/optionen/01010000.xhp +++ b/helpcontent2/source/text/shared/optionen/01010000.xhp @@ -1,8 +1,8 @@ - - + + + - - -$[officename] -/text/shared/optionen/01010000.xhp - - -Sun Microsystems, Inc. -converted from old format - fpe - - - + + $[officename] + /text/shared/optionen/01010000.xhp + + + -$[officename] -Use this dialog to create general settings for working with $[officename]. The information covers topics such as user data, saving, printing, paths to important files and directories, and color defaults. +$[officename] + Use this dialog to create general settings for working with $[officename]. The information covers topics such as user data, saving, printing, paths to important files and directories, and color defaults. These settings are saved automatically. -

- - +

+ + \ No newline at end of file diff --git a/helpcontent2/source/text/shared/optionen/01010800.xhp b/helpcontent2/source/text/shared/optionen/01010800.xhp index 7b18072d5d..d584516981 100644 --- a/helpcontent2/source/text/shared/optionen/01010800.xhp +++ b/helpcontent2/source/text/shared/optionen/01010800.xhp @@ -2,38 +2,33 @@ @@ -75,13 +70,16 @@ The Scaling setting does not affect the font size of text in a document. + Icon size and style Specifies the display size of toolbar icons.The Automatic option uses the font size settings of your operating system for menus. + Select the icon style for icons in toolbars and dialogs. + Use system font for user interface Specifies to use the system font to display all menus and dialogs. Else another installed font is used. @@ -96,9 +94,10 @@ Menu -Show icons in menus - Displays icons next to the corresponding menu items. + +Icons in menus + Displays icons next to the corresponding menu items. Select from "Automatic", "Hide" and "Show". "Automatic" displays icons according to system settings and themes. - Pasting into another - document + Pasting into another document diff --git a/helpcontent2/source/text/shared/optionen/01020400.xhp b/helpcontent2/source/text/shared/optionen/01020400.xhp index 23d72c8c4d..87fc84fa69 100644 --- a/helpcontent2/source/text/shared/optionen/01020400.xhp +++ b/helpcontent2/source/text/shared/optionen/01020400.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - -Mozilla Plug-in -/text/shared/optionen/01020400.xhp - - - -

-Mozilla/Netscape Plug-in -

-Specifies to use the Mozilla plug-in to show %PRODUCTNAME documents. -When you click any %PRODUCTNAME document hyperlink in your Mozilla or Netscape browser, one of the following can happen: - - -The browser asks you whether you want to save the document on your disk, or whether you want to use an application to open the document. This request dialog appears by default when you click any %PRODUCTNAME document hyperlink the first time and you did not enable the Mozilla plug-in. - - -The browser downloads the document to a temporary folder, then tells your system to run %PRODUCTNAME and open the document in %PRODUCTNAME. This is the default when you did not enable the Mozilla plug-in and chose to open the document with %PRODUCTNAME when you were first asked. - - -The browser opens a new browser window that shows some of the %PRODUCTNAME icons, and displays the document in the browser window. This is the default when you enable the Mozilla plug-in. When you click the Edit File icon, a copy of the document is downloaded to a temporary folder on your disk, then %PRODUCTNAME starts and loads the copy for editing. - - -Viewing of %PRODUCTNAME and MS Office documents in Mozilla/Netscape enabled -Enables the Mozilla plug-in to show %PRODUCTNAME documents in a browser window. Select, click OK, then restart your browser. Then, in the browser window, click any %PRODUCTNAME document hyperlink. -The plug-in needs a version of Mozilla 1.x, Netscape 6.x, or Netscape 7.x installed on your system. + + Browser Plug-in + /text/shared/optionen/01020400.xhp + + + +

+ Browser Plug-in +

+ Specifies to use the Mozilla plug-in to show %PRODUCTNAME documents. + When you click any %PRODUCTNAME document hyperlink in your Mozilla or Netscape browser, one of the following can happen: + + + The browser asks you whether you want to save the document on your disk, or whether you want to use an application to open the document. This request dialog appears by default when you click any %PRODUCTNAME document hyperlink the first time and you did not enable the Browser Plug-in. + + + The browser downloads the document to a temporary folder, then tells your system to run %PRODUCTNAME and open the document in %PRODUCTNAME. This is the default when you did not enable the Browser Plug-in and chose to open the document with %PRODUCTNAME when you were first asked. + + + The browser opens a new browser window that shows some of the %PRODUCTNAME icons, and displays the document in the browser window. This is the default when you enable the Browser Plug-in. When you click the Edit File icon, a copy of the document is downloaded to a temporary folder on your disk, then %PRODUCTNAME starts and loads the copy for editing. + + + +Display documents in browser + Enables the Browser Plug-in to show %PRODUCTNAME documents in a browser window. Select, click OK, then restart your browser. Then, in the browser window, click any %PRODUCTNAME document hyperlink. + The plug-in needs a version of Mozilla, Netscape, or Firefox installed on your system. -

+ +

- - + + + \ No newline at end of file diff --git a/helpcontent2/source/text/shared/optionen/01030000.xhp b/helpcontent2/source/text/shared/optionen/01030000.xhp index 672fe43cfe..c727e0e01d 100755 --- a/helpcontent2/source/text/shared/optionen/01030000.xhp +++ b/helpcontent2/source/text/shared/optionen/01030000.xhp @@ -1,7 +1,8 @@ - - - + ************************************************************************ + --> + - - -Internet options -/text/shared/optionen/01030000.xhp - - -Sun Microsystems, Inc. -converted from old format - fpe - - - -Internet options -Specifies Internet settings. + + Internet options + /text/shared/optionen/01030000.xhp + + + + Internet options + Specifies Internet settings. -

+ -

- - + + + +

+ +

+ + \ No newline at end of file diff --git a/helpcontent2/source/text/shared/optionen/01030300.xhp b/helpcontent2/source/text/shared/optionen/01030300.xhp index 105bfe0fb8..2adcb3770f 100755 --- a/helpcontent2/source/text/shared/optionen/01030300.xhp +++ b/helpcontent2/source/text/shared/optionen/01030300.xhp @@ -75,7 +75,7 @@ Select to see a warning dialog when you try to export a document to PDF format that displays recorded changes in Writer, or that displays notes. Remove personal information on saving -Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the Delete button on File - Properties - General. +Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the Reset button on File - Properties - General. Recommend password protection on saving Select to always enable the Save with password option in the file save dialogs. Deselect the option to save files by default without password. diff --git a/helpcontent2/source/text/shared/optionen/01030500.xhp b/helpcontent2/source/text/shared/optionen/01030500.xhp index ba421fb4e6..376a79adfa 100644 --- a/helpcontent2/source/text/shared/optionen/01030500.xhp +++ b/helpcontent2/source/text/shared/optionen/01030500.xhp @@ -95,7 +95,6 @@ $[officename] Basic Mark this check box to include the $[officename] Basic instructions when exporting to HTML format. You must activate this option before you create the $[officename] Basic Script, since otherwise it will not be inserted. $[officename] Basic Scripts must be located in the header of the HTML document. Once you have created the macro in the $[officename] Basic IDE, it appears in the source text of the HTML document in the header. -If you want the macro to run automatically when the HTML document is opened, choose Tools - Customize - Events. Select the "Document" check box and "Open Document" in the Events list. In Macros select your document, its standard library, module1 and the macro and click Assign. Display warning diff --git a/helpcontent2/source/text/shared/optionen/01040700.xhp b/helpcontent2/source/text/shared/optionen/01040700.xhp index 3d06e10947..bb06c81c69 100755 --- a/helpcontent2/source/text/shared/optionen/01040700.xhp +++ b/helpcontent2/source/text/shared/optionen/01040700.xhp @@ -1,8 +1,8 @@ - - + + + - - -Changes -/text/shared/optionen/01040700.xhp - - -Sun Microsystems, Inc. -converted from old format - fpe - - - -

+ + Changes + /text/shared/optionen/01040700.xhp + + + +

-Changes -Defines the appearance of changes in the document. -

-To record or show changes, with the text or spreadsheet document open, choose Edit - Changes. -

-Text display -Defines the settings for displaying recorded changes. Select the type of change with the radio buttons, and the corresponding display attribute and color. The preview field shows the effect of the selected display options. +Changes + Defines the appearance of changes in the document. +

+ To record or show changes in your text or spreadsheet document, choose Edit - Changes - Record or Edit - Changes - Show. +

+ Text display + Defines the settings for displaying recorded changes. Select the type of change and the corresponding display attribute and color. The preview field shows the effect of the selected display options. -Insertions / Attributes -Specifies how changes in the document are displayed when text is inserted. +Insertions / Attributes + Specifies how changes in the document are displayed when text is inserted. -Deletions / Attributes -Specifies how changes in the document are displayed when text is deleted. If you record text deletions, the text is displayed with the selected attribute (for example, strikethrough) and is not deleted. +Deletions / Attributes + Specifies how changes in the document are displayed when text is deleted. If you record text deletions, the text is displayed with the selected attribute (for example, strikethrough) and is not deleted. -Changed attributes / Attributes -Defines how changes to text attributes are displayed in the document. These changes affect attributes such as bold, italic or underline. +Changed attributes / Attributes + Defines how changes to text attributes are displayed in the document. These changes affect attributes such as bold, italic or underline. -Color -You can also choose a color to display each type of recorded change. When you choose the condition "By author" in the list, the color is automatically determined by $[officename], then modified to match to the author of each change. -Lines changed -To indicate which lines of the text have been changed, you can define a mark that appears in the left or right page margin. +Color + You can also choose a color to display each type of recorded change. When you choose the condition "By author" in the list, the color is automatically determined by $[officename], then modified to match to the author of each change. + Lines changed + To indicate which lines of the text have been changed, you can define a mark that appears in the left or right page margin. -Mark -Defines if and where changed lines in the document are marked. You can set the markings so that they always appear on the left or right page margin, or on even or uneven pages. +Mark + Defines if and where changed lines in the document are marked. You can set the markings so that they always appear on the left or right page margin, or on the outer or inner margin. -Color -Specifies the color for highlighting the changed lines in the text. -

- - +Color + Specifies the color for highlighting the changed lines in the text. +

+ + \ No newline at end of file diff --git a/helpcontent2/source/text/shared/optionen/01050100.xhp b/helpcontent2/source/text/shared/optionen/01050100.xhp index 06f8cf0662..80c291b827 100644 --- a/helpcontent2/source/text/shared/optionen/01050100.xhp +++ b/helpcontent2/source/text/shared/optionen/01050100.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - -Grid -/text/shared/optionen/01050100.xhp - - - -

+ + Grid + /text/shared/optionen/01050100.xhp + + + +

grids; defaults (Writer/Calc) -defaults; grids (Writer/Calc) -snap grid defaults (Writer/Calc) + defaults; grids (Writer/Calc) + snap grid defaults (Writer/Calc) -Grid -Specifies the settings for the configurable grid on your document pages. This grid helps you determine the exact position of your objects. You can also set this grid in line with the "magnetic" snap grid. -

-Grid -Specifies the subdivision of the grid. You have the option of using different units of measure. -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 + +Grid + Specifies the settings for the configurable grid on your document pages. This grid helps you determine the exact position of your objects. You can also set this grid in line with the "magnetic" snap grid. +

+ Grid + +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 Ctrl key. -

-Visible grid -Specifies whether to display the grid. + +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. -

-Resolution -Horizontal -Defines the unit of measure for the spacing between grid points on the X-axis. -Vertical -Defines the grid points spacing in the desired unit of measurement on the Y-axis. -Subdivision -Horizontal -Specify the number of intermediate points between grid points on the X-axis.UFI: see #i39831# -Vertical -Specify the number of intermediate points 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: +

+ Resolution + +Horizontal + Defines the unit of measure for the spacing between grid points on the X-axis. + +Vertical + Defines the grid points spacing in the desired unit of measurement on the Y-axis. + Subdivision + +Horizontal + Specify the number of intermediate points between grid points on the X-axis.UFI: see #i39831# + +Vertical + Specify the number of intermediate points 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: -

-Grid to Front + +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 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. -

-Set the grid color on Tools - Options - %PRODUCTNAME - Appearance. -

- - + Sets the snap lines in front of all objects. +

+ Set the grid color on Tools - Options - %PRODUCTNAME - Appearance. +

+ + \ No newline at end of file diff --git a/helpcontent2/source/text/shared/optionen/01070300.xhp b/helpcontent2/source/text/shared/optionen/01070300.xhp index 1478f6666d..3878013072 100644 --- a/helpcontent2/source/text/shared/optionen/01070300.xhp +++ b/helpcontent2/source/text/shared/optionen/01070300.xhp @@ -1,9 +1,8 @@ - - - + + - - - + + - -Grid -/text/shared/optionen/01070300.xhp - - - -

+ + Grid + /text/shared/optionen/01070300.xhp + + + +

snapping in presentations and drawings -points;reducing editing points when snapping (Impress/Draw) + points;reducing editing points when snapping (Impress/Draw) -Grid -Defines the grid settings for creating and moving objects. -

-If you have activated the snap grid but wish to move or create individual objects without snap positions, keep the Command -Ctrl key pressed to deactivate this function for as long as needed. -

-Snap + +Grid + Defines the grid settings for creating and moving objects. +

+ 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 -Snaps the edge of a dragged object to the nearest snap line when you release the mouse. + +To snap lines + Snaps the edge of a dragged object to the nearest snap line when you release the mouse. -You can also define this setting by using the Snap to Guides + 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. +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. + +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 + 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. +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. + +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 + 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. +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. + +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 + In a presentation or drawing document, this function can also be accessed with the Snap to Object Points Snap to Object Points - -Snap to Object Points icon in the Options bar. -Snap range -Defines the snap distance between the mouse pointer and the object contour. $[officename] Impress snaps to a snap point if the mouse pointer is nearer than the distance selected in the Snap range control. -Snap position -When creating or moving objects -Specifies that graphic objects are restricted vertically, horizontally or diagonally (45°) when creating or moving them. You can temporarily deactivate this setting by pressing the Shift key. -Extend edges -Specifies that a square is created based on the longer side of a rectangle when the Shift key is pressed before you release the mouse button. This also applies to an ellipse (a circle will be created based on the longest diameter of the ellipse). When the Extend edges box is not marked, a square or a circle will be created based on the shorter side or diameter. +Snap to Object Points icon in the Options bar. + +Snap range + Defines the snap distance between the mouse pointer and the object contour. $[officename] Impress snaps to a snap point if the mouse pointer is nearer than the distance selected in the Snap range control. + Snap position + +When creating or moving objects + Specifies that graphic objects are restricted vertically, horizontally or diagonally (45°) when creating or moving them. You can temporarily deactivate this setting by pressing the Shift key. + +Extend edges + Specifies that a square is created based on the longer side of a rectangle when the Shift key is pressed before you release the mouse button. This also applies to an ellipse (a circle will be created based on the longest diameter of the ellipse). When the Extend edges box is not marked, a square or a circle will be created based on the shorter side or diameter. -When rotating -Specifies that graphic objects can only be rotated within the rotation angle that you selected in the When rotating control. If you want to rotate an object outside the defined angle, press the Command -Ctrl key when rotating. Release the key when the desired rotation angle is reached. -Point reduction -Defines the angle for point reduction. When working with polygons, you might find it useful to reduce their editing points. - - + +When rotating + Specifies that graphic objects can only be rotated within the rotation angle that you selected in the When rotating control. If you want to rotate an object outside the defined angle, press the Shift key when rotating. Release the key when the desired rotation angle is reached. + +Point reduction + Defines the angle for point reduction. When working with polygons, you might find it useful to reduce their editing points. + + \ No newline at end of file diff --git a/helpcontent2/source/text/shared/optionen/improvement.xhp b/helpcontent2/source/text/shared/optionen/improvement.xhp new file mode 100644 index 0000000000..286224a9ff --- /dev/null +++ b/helpcontent2/source/text/shared/optionen/improvement.xhp @@ -0,0 +1,120 @@ + + + + + + + + + Improvement Program + + + + +

+improvement program + online feedback options + options;improvement program + feedback;automatically + user feedback;automatically + +Improvement Program + The Improvement Program records some user interactions and sends them to the User Experience project. +

+ The Improvement Program was initiated by the User Experience project to improve the usability of %PRODUCTNAME. The User Experience project can be found at the OpenOffice.org web site: http://ux.openoffice.org/. + The second time you start your new %PRODUCTNAME software, you see a window that gives information about the Improvement Program. + At this time you can choose to accept or deny your participation. + + + If you accept, data recording starts immediately. When you start a new session of %PRODUCTNAME, the collected data will be sent. + + + If you deny to participate, no data will be sent and recording of data stops immediately. + + + At any time, you can enable or disable the recording of user interaction data and the sending of these data. Choose Tools - Options - %PRODUCTNAME - Improvement Program. Click the Info icon to browse to a web page with more information. + +Click Yes, I am willing to participate … to enable the automatic feedback. + +Click No, I do not wish to participate to disable the automatic feedback. + Tracked data + The following data will be recorded and sent: + + + Clicks on toolbar buttons, including extension toolbars + + + Execution of menu commands, including extension menus + + + Clicks on context menu commands + + + Fonts applied by using the menu + + + Font sizes applied by using the menu + + + Buttons, like OK, Cancel, etc. + + + Document language and paragraph language applied by using the menu or status bar + + + Each recorded item also includes a time stamp and the module (Writer, Calc, Impress, …) where it has been called + + + The following data will not be recorded and sent: + + + User names and passwords + + + Any type of document content + + + Paths, filenames + + + User's source code + + + Show Data + +Click the button to show the currently collected data. This data will be sent next time, plus any data that gets collected until you end the current session. + + \ No newline at end of file diff --git a/helpcontent2/source/text/shared/optionen/makefile.mk b/helpcontent2/source/text/shared/optionen/makefile.mk index 4226bd978d..9cb1349a02 100644 --- a/helpcontent2/source/text/shared/optionen/makefile.mk +++ b/helpcontent2/source/text/shared/optionen/makefile.mk @@ -117,6 +117,7 @@ XHPFILES = \ 01160100.xhp \ 01160200.xhp \ 01160201.xhp \ + improvement.xhp \ java.xhp \ javaclasspath.xhp \ javaparameters.xhp \ -- cgit