diff options
Diffstat (limited to 'helpcontent2/source/text/shared/guide')
17 files changed, 344 insertions, 433 deletions
diff --git a/helpcontent2/source/text/shared/guide/activex.xhp b/helpcontent2/source/text/shared/guide/activex.xhp index 0617075b7f..2227463043 100755 --- a/helpcontent2/source/text/shared/guide/activex.xhp +++ b/helpcontent2/source/text/shared/guide/activex.xhp @@ -94,7 +94,8 @@ <paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Edit the copy of the document.</paragraph> </listitem> </list> -<section id="relatedtopics"><comment>replaced embedvar by embed. Embedvar doesnt work</comment><embed href="text/shared/optionen/01020400.xhp#mozilla"/> +<section id="relatedtopics"> +<embed href="text/shared/optionen/01020400.xhp#mozilla"/> <embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/> <embed href="text/shared/guide/doc_open.xhp#doc_open"/> <embed href="text/shared/guide/import_ms.xhp#import_ms"/> diff --git a/helpcontent2/source/text/shared/guide/border_table.xhp b/helpcontent2/source/text/shared/guide/border_table.xhp index ef89e4879c..4455968b8e 100755 --- a/helpcontent2/source/text/shared/guide/border_table.xhp +++ b/helpcontent2/source/text/shared/guide/border_table.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,9 +40,9 @@ </topic> </meta> <body> - - - + + + <bookmark xml-lang="en-US" branch="index" id="bm_id3155805"><bookmark_value>tables in text; defining borders</bookmark_value> <bookmark_value>tables in spreadsheets;defining borders</bookmark_value> <bookmark_value>borders; for tables</bookmark_value> @@ -50,7 +50,7 @@ <bookmark_value>defining;table borders</bookmark_value> </bookmark> <comment>mw deleted "adding;"</comment> - <paragraph xml-lang="en-US" id="hd_id3155805" role="heading" level="1" l10n="U" oldref="16"><variable id="border_table"><link href="text/shared/guide/border_table.xhp" name="Defining Borders for Tables and Table Cells">Defining Borders for Tables and Table Cells</link> + <paragraph xml-lang="en-US" id="hd_id3155805" role="heading" level="1" l10n="U" oldref="16"><variable id="border_table"><link href="text/shared/guide/border_table.xhp" name="Defining Borders for Tables and Table Cells">Defining Borders for Tables and Table Cells</link> </variable></paragraph> <paragraph xml-lang="en-US" id="hd_id3147008" role="heading" level="2" l10n="U" oldref="1">Setting a Predefined Border Style</paragraph> <list type="ordered"> @@ -76,6 +76,10 @@ <listitem> <paragraph xml-lang="en-US" id="par_id3159413" role="listitem" l10n="U" oldref="10">In the <emph>User-defined</emph> area select the edge(s) that you want to appear in a common layout. Click on an edge in the preview to toggle the selection of an edge.</paragraph> </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_id31594132" role="listitem" l10n="NEW">If you select more than one row or column, you can change the middle lines between rows or columns. Select the middle markers in the <emph>User-defined</emph> area.</paragraph> + </listitem> + <listitem> <paragraph xml-lang="en-US" id="par_id3153526" role="listitem" l10n="U" oldref="11">Select a line style and color for the selected border style in the <emph>Line</emph> area. These settings apply to all border lines that are included in the selected border style.</paragraph> </listitem> @@ -90,19 +94,19 @@ </listitem> </list> <section id="relatedtopics"> - - + + <switch select="appl"> - + <case select="WRITER"> <embed href="text/swriter/guide/border_object.xhp#border_object"/> <embed href="text/swriter/guide/border_page.xhp#border_page"/> - + </case> - + </switch> <embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/> - + </section> </body> </helpdocument> diff --git a/helpcontent2/source/text/shared/guide/collab.xhp b/helpcontent2/source/text/shared/guide/collab.xhp index bcc7c384ee..d0222dcbd6 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 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,11 +44,11 @@ <bookmark_value>collaboration</bookmark_value> </bookmark> <comment>MW changed the index entries to one level entries.</comment> - <paragraph xml-lang="en-US" id="hd_id130008" role="heading" level="1" l10n="NEW"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link> + <paragraph xml-lang="en-US" id="hd_id130008" role="heading" level="1" l10n="NEW"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link> </variable></paragraph> <paragraph xml-lang="en-US" id="par_id5821710" role="paragraph" l10n="NEW">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.</paragraph> <comment>Tools - Share Document menu</comment> - + <bookmark xml-lang="en-US" branch="hid/.uno:ShareDocument" id="bm_id8779564" localize="false"/> <paragraph xml-lang="en-US" id="par_id9590136" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Share Document dialog where you can enable or disable collaborative sharing of the document.</ahelp></paragraph> <comment>Share Document dialog - Share this spreadsheet with other users</comment> @@ -83,23 +83,23 @@ </listitem> </list> <comment>Resolve Conflicts dialog</comment> - + <bookmark xml-lang="en-US" branch="hid/HID_SCDLG_CONFLICTS" id="bm_id9671926" localize="false"/> <paragraph xml-lang="en-US" id="par_id5800653" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep.</ahelp></paragraph> <comment>Keep Mine</comment> - + <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPMINE" id="bm_id1640369" localize="false"/> <paragraph xml-lang="en-US" id="par_id6263924" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps your change, voids the other change.</ahelp></paragraph> <comment>Keep Other</comment> - + <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPOTHER" id="bm_id1640360" localize="false"/> <paragraph xml-lang="en-US" id="par_id3609118" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps the change of the other user, voids your change.</ahelp></paragraph> <comment>Keep All Mine</comment> - + <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLMINE" id="bm_id1640361" localize="false"/> <paragraph xml-lang="en-US" id="par_id7184057" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps all your changes, voids all other changes.</ahelp></paragraph> <comment>Keep All Others</comment> - + <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLOTHERS" id="bm_id1640363" localize="false"/> <paragraph xml-lang="en-US" id="par_id786767" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps the changes of all other users, voids your changes.</ahelp></paragraph> <paragraph xml-lang="en-US" id="hd_id2934965" role="heading" level="3" l10n="NEW">Saving a shared spreadsheet document</paragraph> @@ -120,6 +120,7 @@ </listitem> </list> <paragraph xml-lang="en-US" id="par_id7186498" role="paragraph" l10n="NEW">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.</paragraph> + <paragraph xml-lang="en-US" id="hd_id2871791" role="heading" level="2" l10n="NEW">Collaboration in Writer, Impress, and Draw</paragraph> <paragraph xml-lang="en-US" id="par_id2675862" role="paragraph" l10n="NEW">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:</paragraph> <paragraph xml-lang="en-US" id="par_id7333597" role="paragraph" l10n="NEW">User A opens a document. The following conditions can apply:</paragraph> @@ -137,10 +138,23 @@ <paragraph xml-lang="en-US" id="par_id206610" role="paragraph" l10n="NEW">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.</paragraph> </listitem> </list> + + <paragraph xml-lang="en-US" id="hd_id29349651" role="heading" level="2" l10n="NEW">User access permissions and sharing documents</paragraph> + <paragraph xml-lang="en-US" id="par_id11746571" role="paragraph" l10n="NEW">Some conditions must be met on operating systems with a user permission management.</paragraph> + <list type="unordered"> + <listitem> + <paragraph xml-lang="en-US" id="par_id25775931" role="paragraph" l10n="NEW">The shared file needs to reside in a location which is accessible by all collaborators.</paragraph> + </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_id90496531" role="paragraph" l10n="NEW">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.</paragraph> + </listitem> + </list> + <paragraph xml-lang="en-US" id="par_id71864981" role="warning" l10n="NEW">Write access also enables other users to (accidentally or deliberately) delete or change a file.</paragraph> + <section id="relatedtopics"> - + <paragraph xml-lang="en-US" id="par_id4263740" role="paragraph" l10n="NEW"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph> - + </section> </body> </helpdocument> diff --git a/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp b/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp index acce26b900..8d917da300 100644 --- a/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp +++ b/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp @@ -75,24 +75,24 @@ </list> <paragraph xml-lang="en-US" id="par_id3236182" role="paragraph" l10n="NEW">If there is a mismatch of the domain name given in the certificate and the domain name you entered in the file dialog, then you see a dialog that allows you to choose from any of the following options:</paragraph> -<bookmark xml-lang="en-US" branch="hid/1311773189" id="bm_id9141819" localize="false"/> +<!-- removed HID 1311773189 --> <paragraph xml-lang="en-US" id="par_id1251258" role="paragraph" l10n="NEW"> <emph>View Certificate</emph> - <ahelp hid=".">Opens the View Certificate dialog.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/1311773188" id="bm_id6354869" localize="false"/> +<!-- removed HID 1311773188 --> <paragraph xml-lang="en-US" id="par_id8111819" role="paragraph" l10n="NEW"> <emph>Continue</emph> - <ahelp hid=".">If you are sure both domains are the same, click the Continue button.</ahelp></paragraph> <paragraph xml-lang="en-US" id="par_id9116794" role="paragraph" l10n="NEW"> <emph>Cancel Connection</emph> - Cancels the connection.</paragraph> <paragraph xml-lang="en-US" id="par_id4381847" role="paragraph" l10n="NEW">If you click <emph>Continue</emph>, you may see a dialog that asks you to enter your user name and password.</paragraph> <comment>user name</comment> -<bookmark xml-lang="en-US" branch="hid/1311344666" id="bm_id2685323" localize="false"/> +<!-- removed HID 1311344666 --> <paragraph xml-lang="en-US" id="par_id1336710" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter your user name to log on to the WebDAV server.</ahelp></paragraph> <comment>password</comment> -<bookmark xml-lang="en-US" branch="hid/1311344669" id="bm_id6042664" localize="false"/> +<!-- removed HID 1311344669 --> <paragraph xml-lang="en-US" id="par_id1221655" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter your password.</ahelp></paragraph> <comment>remember password till end of session</comment> -<bookmark xml-lang="en-US" branch="hid/1311343648" id="bm_id7889950" localize="false"/> +<!-- removed HID 1311343648 --> <paragraph xml-lang="en-US" id="par_id3397320" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If you enable <emph>Remember password till end of session</emph>, your password will be remembered for subsequent WebDAV connections until you exit %PRODUCTNAME.</ahelp></paragraph> <section id="relatedtopics"> diff --git a/helpcontent2/source/text/shared/guide/digitalsign_send.xhp b/helpcontent2/source/text/shared/guide/digitalsign_send.xhp index e7aba52cc9..0aa75256bf 100644 --- a/helpcontent2/source/text/shared/guide/digitalsign_send.xhp +++ b/helpcontent2/source/text/shared/guide/digitalsign_send.xhp @@ -102,11 +102,11 @@ <paragraph xml-lang="en-US" id="par_idN106F5" role="paragraph" l10n="NEW">When you open the Basic IDE that contains signed macros, you see an icon <image id="img_id9252296" src="xmlsecurity/res/certificate_16.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id9252296">Icon</alt> </image> in the status bar. You can double-click the icon in the status bar to view the certificate.</paragraph><comment>WebDAV see issue 32935</comment><comment>main dialog IDs are here to lead the user initially to this help page</comment><comment>Examine certificate button</comment> -<bookmark xml-lang="en-US" branch="hid/1311740419" id="bm_id2454298" localize="false"/> +<!-- removed HID 1311740419 --> <paragraph xml-lang="en-US" id="par_id5734733" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to open the View Certificate dialog.</ahelp></paragraph><comment>Accept this certificate temporarily for this session radio button</comment> -<bookmark xml-lang="en-US" branch="hid/1311736321" id="bm_id2307199" localize="false"/> +<!-- removed HID 1311736321 --> <paragraph xml-lang="en-US" id="par_id561540" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to accept the certificate until you exit %PRODUCTNAME.</ahelp></paragraph><comment>Do not accept this certificate and do not connect to this Web site radio button</comment> -<bookmark xml-lang="en-US" branch="hid/1311736326" id="bm_id9983825" localize="false"/> +<!-- removed HID 1311736326 --> <paragraph xml-lang="en-US" id="par_id7705618" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to cancel the connection.</ahelp></paragraph> <section id="relatedtopics"> <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph> diff --git a/helpcontent2/source/text/shared/guide/fontwork.xhp b/helpcontent2/source/text/shared/guide/fontwork.xhp index cc28e6de8c..90247d93ce 100755 --- a/helpcontent2/source/text/shared/guide/fontwork.xhp +++ b/helpcontent2/source/text/shared/guide/fontwork.xhp @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <helpdocument version="1.0"> - + <!-- *********************************************************************** * * 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,8 +29,8 @@ * ************************************************************************ --> - - + + <meta> <topic id="textsharedguidefontworkxml" indexer="include" status="PUBLISH"> <title xml-lang="en-US" id="tit">Fontwork For Graphical Text Art</title> @@ -42,7 +42,7 @@ <bookmark_value>designing; fonts</bookmark_value> <bookmark_value>TextArt, see Fontwork</bookmark_value> <bookmark_value>WordArt, see Fontwork</bookmark_value> - <bookmark_value>Fontwork icons</bookmark_value> + <bookmark_value>Fontwork</bookmark_value> <bookmark_value>text effects</bookmark_value> <bookmark_value>effects; Fontwork icons</bookmark_value> <bookmark_value>text; Fontwork icons</bookmark_value> @@ -60,13 +60,17 @@ <paragraph xml-lang="en-US" id="par_id0202200911373965" role="paragraph" l10n="NEW">If you don't see the Drawing toolbar or the Fontwork toolbar, choose <item type="menuitem">View - Toolbars</item> to enable the toolbar.</paragraph> </listitem> <listitem> - <paragraph xml-lang="en-US" id="par_idN1069C" role="paragraph" l10n="CHG">On the <emph>Drawing</emph> toolbar or on the <emph>Fontwork</emph> toolbar, click the <emph>Fontwork Gallery</emph> icon. + <paragraph xml-lang="en-US" id="par_idN1069C" role="paragraph" l10n="CHG">On the <emph>Drawing</emph> toolbar or on the <emph>Fontwork</emph> toolbar, click the <emph>Fontwork Gallery</emph> icon. <image id="img_id7040009" src="res/commandimagelist/sc_fontworkgalleryfloater.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id7040009">Icon</alt> </image></paragraph> </listitem> <listitem> + + <bookmark xml-lang="en-US" branch="hid/HID_CTL_FONTWORK_FAVORITES" id="bm_id3156415" localize="false"/> +<paragraph role="paragraph" id="par_id3149761" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="." visibility="hidden">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.</ahelp></paragraph> + <paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">In the <emph>Fontwork Gallery</emph> dialog, select a Fontwork style and click OK.</paragraph> - <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">The Fontwork object is inserted into your document.</paragraph> + <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">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.</paragraph> </listitem> <listitem> <paragraph xml-lang="en-US" id="par_idN106A4" role="paragraph" l10n="NEW">Double-click the object to enter text edit mode.</paragraph> @@ -117,7 +121,7 @@ </list> <section id="relatedtopics"> <paragraph xml-lang="en-US" id="par_idN108E7" role="paragraph" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork toolbar</link></paragraph> - <embed href="text/shared/01/05280000.xhp#hd_id3146959"/> + <embed href="text/shared/01/05280000.xhp#fntwrk"/> </section> </body> </helpdocument>
\ No newline at end of file diff --git a/helpcontent2/source/text/shared/guide/formfields.xhp b/helpcontent2/source/text/shared/guide/formfields.xhp index 241854b9e5..0dec8b59a3 100755 --- a/helpcontent2/source/text/shared/guide/formfields.xhp +++ b/helpcontent2/source/text/shared/guide/formfields.xhp @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> - - +<helpdocument version="1.0"> <!-- - *********************************************************************** +*********************************************************************** * * 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 @@ -32,79 +31,66 @@ --> - <helpdocument version="1.0"> <meta> -<topic id="textsharedguideformfieldsxml" indexer="include" status="PUBLISH"> -<title xml-lang="en-US" id="tit">Inserting and Editing Buttons</title> -<filename>/text/shared/guide/formfields.xhp</filename> -</topic> -</meta> -<body> - - - + <topic id="textsharedguideformfieldsxml" indexer="include" status="PUBLISH"> + <title xml-lang="en-US" id="tit">Inserting and Editing Buttons</title> + <filename>/text/shared/guide/formfields.xhp</filename> + </topic> + </meta> + <body> <bookmark xml-lang="en-US" branch="index" id="bm_id3149798"><bookmark_value>command buttons, see push buttons</bookmark_value> -<bookmark_value>controls;adding to documents</bookmark_value> -<bookmark_value>inserting;push buttons</bookmark_value> -<bookmark_value>keys;adding push buttons</bookmark_value> -<bookmark_value>buttons;adding push buttons</bookmark_value> -<bookmark_value>press buttons, see push buttons</bookmark_value> -<bookmark_value>push buttons;adding to documents</bookmark_value> -</bookmark> - <comment>MW changed "adding;" to "inserting;"</comment> - <paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U" oldref="5"><variable id="formfields"><link href="text/shared/guide/formfields.xhp" name="Inserting and Editing Buttons">Adding a Command Button to a Document</link> + <bookmark_value>controls;adding to documents</bookmark_value> + <bookmark_value>inserting;push buttons</bookmark_value> + <bookmark_value>keys;adding push buttons</bookmark_value> + <bookmark_value>buttons;adding push buttons</bookmark_value> + <bookmark_value>press buttons, see push buttons</bookmark_value> + <bookmark_value>push buttons;adding to documents</bookmark_value> +</bookmark><comment>MW changed "adding;" to "inserting;"</comment> +<paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U" oldref="5"><variable id="formfields"><link href="text/shared/guide/formfields.xhp" name="Inserting and Editing Buttons">Adding a Command Button to a Document</link> </variable></paragraph> - <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="CHG">You can use the Form Controls toolbar to add checkboxes, buttons, tables showing data records, and other controls to a document.</paragraph> - <paragraph xml-lang="en-US" id="par_idN1077F" role="heading" level="2" l10n="NEW">To Add a Button to a Document </paragraph> - <list type="ordered"> - <listitem> - <paragraph xml-lang="en-US" id="par_id3154751" role="listitem" l10n="CHG" oldref="6">Choose <item type="menuitem">View - Toolbars - Form Controls</item>.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id3145345" role="listitem" l10n="CHG" oldref="7">On the Form Controls toolbar, click the <emph>Push Button</emph> icon.</paragraph> - <paragraph xml-lang="en-US" id="par_idN107A4" role="listitem" l10n="NEW">The mouse pointer changes to a cross-hair.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id3159233" role="listitem" l10n="U" oldref="8">In the document, drag to draw the button.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_idN107B2" role="listitem" l10n="NEW">Right-click the button and choose <emph>Control</emph>.</paragraph> - </listitem> - </list> - <list type="ordered" startwith="2"> - <listitem> - <paragraph xml-lang="en-US" id="par_idN107CD" role="listitem" l10n="NEW">Specify the properties of the button.</paragraph> - </listitem> - </list> - <list type="unordered"> - <listitem> - <paragraph xml-lang="en-US" id="par_id3154923" role="listitem" l10n="CHG" oldref="11">To change the button label, click the <emph>General</emph> tab, and edit the text in the <emph>Label</emph> box.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id3147303" role="listitem" l10n="U" oldref="12">To attach a macro to the button, click the <emph>Events</emph> tab, and click the <emph>... </emph>button beside the button action that you want to run the macro. In the <emph>Assign Macro</emph> dialog, locate the macro that you want to use, and then click <emph>OK</emph>.<comment>UFI: see #i34509#</comment></paragraph> - </listitem> - </list> - <list type="ordered" startwith="3"> - <listitem> - <paragraph xml-lang="en-US" id="par_idN10814" role="listitem" l10n="NEW">Close the <emph>Properties</emph> dialog.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id3147350" role="listitem" l10n="CHG" oldref="76">(Optional) Specify the properties of the form that the button belongs to.</paragraph> - </listitem> - </list> - <list type="unordered"> - <listitem> - <paragraph xml-lang="en-US" id="par_idN10828" role="listitem" l10n="NEW">Right-click the button and choose <emph>Form</emph>.</paragraph> - <paragraph xml-lang="en-US" id="par_idN1082F" role="listitem" l10n="NEW">The <emph>Form Properties</emph> dialog opens.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_idN10837" role="listitem" l10n="NEW">Specify the properties for the form and then close the dialog.</paragraph> - </listitem> - </list> - <section id="relatedtopics"> - - <embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/> - - </section> - </body> -</helpdocument> + <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="CHG">You can use the Form Controls toolbar to add checkboxes, buttons, tables showing data records, and other controls to a document.</paragraph> + <paragraph xml-lang="en-US" id="par_idN1077F" role="heading" level="2" l10n="NEW">To Add a Button to a Document </paragraph> + <list type="ordered"> + <listitem> + <paragraph xml-lang="en-US" id="par_id3154751" role="listitem" l10n="CHG" oldref="6">Choose <item type="menuitem">View - Toolbars - Form Controls</item>.</paragraph> + </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_id3145345" role="listitem" l10n="CHG" oldref="7">On the Form Controls toolbar, click the <emph>Push Button</emph> icon.</paragraph> + <paragraph xml-lang="en-US" id="par_idN107A4" role="listitem" l10n="NEW">The mouse pointer changes to a cross-hair.</paragraph> + </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_id3159233" role="listitem" l10n="U" oldref="8">In the document, drag to draw the button.</paragraph> + </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_idN107B2" role="listitem" l10n="NEW">Right-click the button and choose <emph>Control</emph>.</paragraph> + </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_idN107CD" role="listitem" l10n="NEW">Specify the properties of the button.</paragraph> + </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_id3154923" role="listitem" l10n="CHG" oldref="11">To change the button label, click the <emph>General</emph> tab, and edit the text in the <emph>Label</emph> box.</paragraph> + </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_id3147303" role="listitem" l10n="U" oldref="12">To attach a macro to the button, click the <emph>Events</emph> tab, and click the <emph>... </emph>button beside the button action that you want to run the macro. In the <emph>Assign Macro</emph> dialog, locate the macro that you want to use, and then click <emph>OK</emph>.<comment>UFI: see #i34509#</comment></paragraph> + </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_idN10814" role="listitem" l10n="NEW">Close the <emph>Properties</emph> dialog.</paragraph> + </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_id3147350" role="listitem" l10n="CHG" oldref="76">(Optional) Specify the properties of the form that the button belongs to.</paragraph> + </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_idN10828" role="listitem" l10n="NEW">Right-click the button and choose <emph>Form</emph>.</paragraph> + </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_idN1082F" role="listitem" l10n="NEW">The <emph>Form Properties</emph> dialog opens.</paragraph> + </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_idN10837" role="listitem" l10n="NEW">Specify the properties for the form and then close the dialog.</paragraph> + </listitem> + </list> + <section id="relatedtopics"> + <embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/> + </section> + </body> +</helpdocument>
\ No newline at end of file diff --git a/helpcontent2/source/text/shared/guide/imagemap.xhp b/helpcontent2/source/text/shared/guide/imagemap.xhp index 3ba1da7082..b4a3f896e1 100755 --- a/helpcontent2/source/text/shared/guide/imagemap.xhp +++ b/helpcontent2/source/text/shared/guide/imagemap.xhp @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> - - +<helpdocument version="1.0"> <!-- - *********************************************************************** +*********************************************************************** * * 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 @@ -32,26 +31,21 @@ --> - <helpdocument version="1.0"> <meta> -<topic id="textsharedguideimagemapxhp" indexer="include" status="PUBLISH"> -<title xml-lang="en-US" id="tit">Adding Clickable Hotspots to Images</title> -<filename>/text/shared/guide/imagemap.xhp</filename> -</topic> -</meta> -<body> - - - + <topic id="textsharedguideimagemapxhp" indexer="include" status="PUBLISH"> + <title xml-lang="en-US" id="tit">Adding Clickable Hotspots to Images</title> + <filename>/text/shared/guide/imagemap.xhp</filename> + </topic> + </meta> + <body> <bookmark xml-lang="en-US" branch="index" id="bm_id3150502"><bookmark_value>ImageMap; editor</bookmark_value> -<bookmark_value>editors; ImageMap editor</bookmark_value> -<bookmark_value>images; ImageMap</bookmark_value> -<bookmark_value>pictures; ImageMap</bookmark_value> -<bookmark_value>hotspots</bookmark_value> -<bookmark_value>URL;in pictures</bookmark_value> -</bookmark> - <comment>mw added 2 index entries</comment> - <paragraph xml-lang="en-US" id="par_idN10631" role="heading" level="1" l10n="NEW"><variable id="imagemap"><link href="text/shared/guide/imagemap.xhp">Adding Clickable Hotspots to Images</link> + <bookmark_value>editors; ImageMap editor</bookmark_value> + <bookmark_value>images; ImageMap</bookmark_value> + <bookmark_value>pictures; ImageMap</bookmark_value> + <bookmark_value>hotspots;adding to images</bookmark_value> + <bookmark_value>URL;in pictures</bookmark_value> +</bookmark><comment>mw added 2 index entries</comment><comment>MW made "hotspots" a two level entry</comment> +<paragraph xml-lang="en-US" id="par_idN10631" role="heading" level="1" l10n="NEW"><variable id="imagemap"><link href="text/shared/guide/imagemap.xhp">Adding Clickable Hotspots to Images</link> </variable></paragraph> <paragraph xml-lang="en-US" id="par_idN1064F" role="paragraph" l10n="NEW">An ImageMap allows you to attach URLs to specific areas, called hotspots, on a picture in your document. An image map is a group of one or more hotspots.</paragraph> <paragraph xml-lang="en-US" id="par_idN1066C" role="paragraph" l10n="NEW">You can draw three types of hotspots: rectangles, ellipses, and polygons. When you click a hotspot, the URL is opened in the browser window or frame that you specify. You can also specify the text that appears when your mouse rests on the hotspot.</paragraph> diff --git a/helpcontent2/source/text/shared/guide/import_ms.xhp b/helpcontent2/source/text/shared/guide/import_ms.xhp index 456bb95d0e..ae56c248b3 100755 --- a/helpcontent2/source/text/shared/guide/import_ms.xhp +++ b/helpcontent2/source/text/shared/guide/import_ms.xhp @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> - - +<helpdocument version="1.0"> <!-- - *********************************************************************** +*********************************************************************** * * 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 @@ -32,31 +31,33 @@ --> - <helpdocument version="1.0"> <meta> -<topic id="textsharedguideimport_msxml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Opening documents saved in other formats</title> -<filename>/text/shared/guide/import_ms.xhp</filename> -</topic> -</meta> -<body> -<section id="chapter_all"> + <topic id="textsharedguideimport_msxml" indexer="include" status="PUBLISH"> + <title xml-lang="en-US" id="tit">Opening documents saved in other formats</title> + <filename>/text/shared/guide/import_ms.xhp</filename> + </topic> + </meta> + <body> + <section id="chapter_all"> <bookmark xml-lang="en-US" branch="index" id="bm_id3153988"><bookmark_value>Microsoft Office;opening Microsoft documents</bookmark_value> -<bookmark_value>documents; importing</bookmark_value> -<bookmark_value>importing; documents in other formats</bookmark_value> -<bookmark_value>opening; documents from other formats</bookmark_value> -<bookmark_value>loading; documents from other formats</bookmark_value> -<bookmark_value>converting;Microsoft documents</bookmark_value> -<bookmark_value>saving; default file formats</bookmark_value> -<bookmark_value>defaults; file formats in file dialogs</bookmark_value> -<bookmark_value>file formats; saving always in other formats</bookmark_value> -<bookmark_value>Microsoft Office; as default file format</bookmark_value> -<bookmark_value>files;importing</bookmark_value> -<bookmark_value>XML converters</bookmark_value> -<bookmark_value>converters; XML</bookmark_value> -<bookmark_value>Document Converter Wizard</bookmark_value> -<bookmark_value>wizards; document converter</bookmark_value> -</bookmark><comment>MW made file import a two level entry ("files;importing")</comment><paragraph role="heading" id="hd_id3145313" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="import_ms"><link href="text/shared/guide/import_ms.xhp" name="Opening documents saved in other formats">Opening documents saved in other formats</link> + <bookmark_value>documents; importing</bookmark_value> + <bookmark_value>importing; documents in other formats</bookmark_value> + <bookmark_value>opening; documents from other formats</bookmark_value> + <bookmark_value>loading; documents from other formats</bookmark_value> + <bookmark_value>converting;Microsoft documents</bookmark_value> + <bookmark_value>saving; default file formats</bookmark_value> + <bookmark_value>defaults;document formats in file dialogs</bookmark_value> + <bookmark_value>file formats; saving always in other formats</bookmark_value> + <bookmark_value>Microsoft Office; as default file format</bookmark_value> + <bookmark_value>files;importing</bookmark_value> + <bookmark_value>XML converters</bookmark_value> + <bookmark_value>converters; XML</bookmark_value> + <bookmark_value>Document Converter Wizard</bookmark_value> + <bookmark_value>wizards; document converter</bookmark_value> + <bookmark_value>converters; document converter</bookmark_value> + <bookmark_value>files, see also documents</bookmark_value> +</bookmark><comment>MW inserted cross-reference "files, see also documents"</comment><comment>MW changed "defaults;..."</comment><comment>ufi added "converters;document converter"</comment> +<paragraph xml-lang="en-US" id="hd_id3145313" role="heading" level="1" l10n="U" oldref="2"><variable id="import_ms"><link href="text/shared/guide/import_ms.xhp" name="Opening documents saved in other formats">Opening documents saved in other formats</link> </variable></paragraph> <paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="3">You can open a document saved in another format by using the following procedure:</paragraph> <list type="ordered"> @@ -79,27 +80,29 @@ </listitem> </list> <switch select="appl"> -<case select="WRITER"><paragraph role="heading" id="hd_id4563127" xml-lang="en-US" level="2" l10n="NEW">Opening HTML files in Writer</paragraph> -<list type="unordered"> -<listitem> -<paragraph role="listitem" id="par_id9207434" xml-lang="en-US" l10n="NEW">Choose the file type "HTML Document" to open in <item type="productname">%PRODUCTNAME</item> Writer/Web. This is the default for HTML documents in <item type="productname">%PRODUCTNAME</item>.</paragraph> -<paragraph role="listitem" id="par_id7215491" xml-lang="en-US" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer/Web are now available to you, such as <emph>Show HTML source</emph>.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id2299874" xml-lang="en-US" l10n="NEW">Choose "HTML Document (<item type="productname">%PRODUCTNAME</item> Writer)" to open in <item type="productname">%PRODUCTNAME</item> Writer.</paragraph> -<paragraph role="listitem" id="par_id1727347" xml-lang="en-US" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer are now available to you. Not all options that <item type="productname">%PRODUCTNAME</item> Writer offers for editing of documents can be saved in HTML format.</paragraph> -</listitem> -</list> +<case select="WRITER"> +<paragraph xml-lang="en-US" id="hd_id4563127" role="heading" level="2" l10n="NEW">Opening HTML files in Writer</paragraph> + <list type="unordered"> + <listitem> + <paragraph xml-lang="en-US" id="par_id9207434" role="listitem" l10n="NEW">Choose the file type "HTML Document" to open in <item type="productname">%PRODUCTNAME</item> Writer/Web. This is the default for HTML documents in <item type="productname">%PRODUCTNAME</item>.</paragraph> + <paragraph xml-lang="en-US" id="par_id7215491" role="listitem" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer/Web are now available to you, such as <emph>Show HTML source</emph>.</paragraph> + </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_id2299874" role="listitem" l10n="NEW">Choose "HTML Document (<item type="productname">%PRODUCTNAME</item> Writer)" to open in <item type="productname">%PRODUCTNAME</item> Writer.</paragraph> + <paragraph xml-lang="en-US" id="par_id1727347" role="listitem" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer are now available to you. Not all options that <item type="productname">%PRODUCTNAME</item> Writer offers for editing of documents can be saved in HTML format.</paragraph> + </listitem> + </list> </case> -</switch></section> -<section id="relatedtopics"> -<embed href="text/shared/00/00000021.xhp#xmlformat"/> -<embed href="text/shared/guide/export_ms.xhp#export_ms"/> -<embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/> -<embed href="text/shared/guide/ms_user.xhp#ms_user"/> -<paragraph role="paragraph" id="par_id3148944" xml-lang="en-US" l10n="U" oldref="12"><link href="text/shared/optionen/01130100.xhp" name="Working with VBA code">Working with VBA code</link></paragraph> -<paragraph role="paragraph" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="13"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph> -<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/> +</switch> </section> -</body> -</helpdocument> + <section id="relatedtopics"> + <embed href="text/shared/00/00000021.xhp#xmlformat"/> + <embed href="text/shared/guide/export_ms.xhp#export_ms"/> + <embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/> + <embed href="text/shared/guide/ms_user.xhp#ms_user"/> + <paragraph xml-lang="en-US" id="par_id3148944" role="paragraph" l10n="U" oldref="12"><link href="text/shared/optionen/01130100.xhp" name="Working with VBA code">Working with VBA code</link></paragraph> + <paragraph xml-lang="en-US" id="par_id3147264" role="paragraph" l10n="U" oldref="13"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph> + <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/> + </section> + </body> +</helpdocument>
\ No newline at end of file diff --git a/helpcontent2/source/text/shared/guide/keyboard.xhp b/helpcontent2/source/text/shared/guide/keyboard.xhp index df3a201593..a578bc236b 100644 --- a/helpcontent2/source/text/shared/guide/keyboard.xhp +++ b/helpcontent2/source/text/shared/guide/keyboard.xhp @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <helpdocument version="1.0"> - + <!-- *********************************************************************** * * 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,8 +29,8 @@ * ************************************************************************ --> - - + + <meta> <topic id="textsharedguidekeyboardxml" indexer="include" status="PUBLISH"> <title xml-lang="en-US" id="tit">Shortcuts (%PRODUCTNAME Accessibility)</title> @@ -66,12 +66,8 @@ <listitem> <paragraph xml-lang="en-US" id="par_id3154514" role="listitem" l10n="U" oldref="34">document</paragraph> </listitem> - </list> - <paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="33">If the focus is on a menu bar or a toolbar, and you press <switchinline select="sys"><caseinline select="MAC">Command -</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab, you switch through the previously mentioned objects just as with F6, but without switching through to the document. <switchinline select="sys"><caseinline select="UNIX">Some X Window Managers evaluate this shortcut themselves, in which case you cannot use the shortcut for <item type="productname">%PRODUCTNAME</item>. -</caseinline></switchinline></paragraph> - <paragraph xml-lang="en-US" id="par_id3153252" role="paragraph" l10n="U" oldref="32">Press Shift+F6 or Shift+<switchinline select="sys"><caseinline select="MAC">Command -</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to switch through objects in the opposite direction.</paragraph> + </list><comment>removed para about Ctrl+Tab</comment> +<paragraph xml-lang="en-US" id="par_id3153252" role="paragraph" l10n="U" oldref="32">Press Shift+F6 to switch through objects in the opposite direction.</paragraph> <paragraph xml-lang="en-US" id="par_id3152473" role="paragraph" l10n="U" oldref="31">Press <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to switch to the document.</paragraph> <paragraph xml-lang="en-US" id="par_id3152360" role="paragraph" l10n="U" oldref="30">Press F10 to switch to the menu bar and back.</paragraph> @@ -176,7 +172,7 @@ </list> <paragraph xml-lang="en-US" id="hd_id3154479" role="heading" level="3" l10n="U" oldref="148">Selecting objects</paragraph> - <paragraph xml-lang="en-US" id="par_id3148993" role="paragraph" l10n="CHG" oldref="149">Press <item type="keycode">Shift+F4</item> to select the first object in the current document. When an object is selected, press <item type="keycode">Tab</item> to select the next object, or press <item type="keycode">Esc</item> to go back to the text.</paragraph> + <paragraph xml-lang="en-US" id="par_id3148993" role="paragraph" l10n="CHG" oldref="149">Press Shift+F4 to select the first object in the current document. When an object is selected, press Tab to select the next object, or press Esc to go back to the text.</paragraph> <paragraph xml-lang="en-US" id="hd_id3152962" role="heading" level="3" l10n="U" oldref="54">Edit Objects</paragraph> <paragraph xml-lang="en-US" id="par_id3156379" role="paragraph" l10n="U" oldref="53">A selected OLE object can be activated with the Enter key.</paragraph> @@ -214,7 +210,7 @@ <listitem> <paragraph xml-lang="en-US" id="par_id3150940" role="listitem" l10n="U" oldref="65">The upper left handle starts blinking. Press <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab several times, until no handle blinks. This signals that now the anchor of the object is activated. <switchinline select="appl"><caseinline select="WRITER">In text documents you can press Shift+<switchinline select="sys"><caseinline select="MAC">Command -</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A to activate the anchor directly. +</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A to activate the anchor directly. </caseinline></switchinline></paragraph> </listitem> <listitem> diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp index f3cf20add9..7acfd8101a 100755 --- a/helpcontent2/source/text/shared/guide/paintbrush.xhp +++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <helpdocument version="1.0"> - + <!-- *********************************************************************** * * 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,8 +29,8 @@ * ************************************************************************ --> - - + + <meta> <topic id="textsharedguidepaintbrushxml" indexer="include"> <title xml-lang="en-US" id="tit">Copying Attributes With the Format Paintbrush</title> @@ -42,7 +42,8 @@ <bookmark xml-lang="en-US" branch="index" id="bm_id380260"><bookmark_value>Format Paintbrush</bookmark_value> <bookmark_value>formatting;copying</bookmark_value> <bookmark_value>copying;formatting</bookmark_value> -</bookmark> + <bookmark_value>Paintbrush</bookmark_value> +</bookmark><comment>MW added "Paintbrush"</comment> <paragraph xml-lang="en-US" id="par_idN1053A" role="heading" level="1" l10n="NEW"><variable id="formatpaintbrush"><link href="text/shared/guide/paintbrush.xhp">Copying Formatting With the Format Paintbrush</link> </variable></paragraph> </section> @@ -57,7 +58,7 @@ <listitem> <paragraph xml-lang="en-US" id="par_idN10667" role="paragraph" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph> <paragraph xml-lang="en-US" id="par_idN10660" role="paragraph" l10n="NEW">The cursor changes to a paint bucket.</paragraph> - <paragraph xml-lang="en-US" id="par_idN10663" role="tip" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon + <paragraph xml-lang="en-US" id="par_idN10663" role="tip" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon <image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id209967">Icon</alt> </image>. After you apply all the formatting, click the icon again.</paragraph> </listitem> @@ -120,10 +121,10 @@ </tablerow> <tablerow> <tablecell> - <paragraph xml-lang="en-US" id="par_idN106DF" role="tablecontent" l10n="NEW">Text within drawing object is selected</paragraph> + <paragraph xml-lang="en-US" id="par_idN106DF" role="tablecontent" l10n="NEW">Drawing object is selected</paragraph> </tablecell> <tablecell> - <paragraph xml-lang="en-US" id="par_idN106E5" role="tablecontent" l10n="NEW">In Impress and Draw, paragraph and character formatting can be copied from and to text selections. Not Supported in Calc and Writer</paragraph> + <paragraph xml-lang="en-US" id="par_idN106E5" role="tablecontent" l10n="NEW">Copies all formatting attributes. In Impress and Draw, the text contents of the object is also copied.</paragraph> </tablecell> </tablerow> <tablerow> diff --git a/helpcontent2/source/text/shared/guide/redlining.xhp b/helpcontent2/source/text/shared/guide/redlining.xhp index dc49552777..eef290f303 100755 --- a/helpcontent2/source/text/shared/guide/redlining.xhp +++ b/helpcontent2/source/text/shared/guide/redlining.xhp @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> +<helpdocument version="1.0"> - -<!--*********************************************************************** +<!-- +*********************************************************************** * * 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 @@ -26,39 +27,37 @@ * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. * - ************************************************************************--> + ************************************************************************ + --> + - -<helpdocument version="1.0"> <meta> -<topic id="textsharedguideredliningxml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Recording and Displaying Changes</title> -<filename>/text/shared/guide/redlining.xhp</filename> -</topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2006-02-13T15:41:19">converted from old format - fpe</lastedited> -</history> -</meta> -<body> + <topic id="textsharedguideredliningxml" indexer="include" status="PUBLISH"> + <title xml-lang="en-US" id="tit">Recording and Displaying Changes</title> + <filename>/text/shared/guide/redlining.xhp</filename> + </topic> + </meta> + <body> <bookmark xml-lang="en-US" branch="index" id="bm_id3150499"><bookmark_value>marking changes</bookmark_value> -<bookmark_value>changes; review function</bookmark_value> -<bookmark_value>review function; recording changes example</bookmark_value> -</bookmark> -<paragraph role="heading" id="hd_id3150499" xml-lang="en-US" level="1" l10n="U" oldref="7"><variable id="redlining"><link href="text/shared/guide/redlining.xhp" name="Recording and Displaying Changes">Recording and Displaying Changes</link> + <bookmark_value>highlighting changes</bookmark_value> + <bookmark_value>changes; review function</bookmark_value> + <bookmark_value>review function; recording changes example</bookmark_value> + <bookmark_value>Track Changes, see review function</bookmark_value> +</bookmark><comment>MW addes a cross-reference</comment><comment>MW added "highlighting changes"</comment> +<paragraph xml-lang="en-US" id="hd_id3150499" role="heading" level="1" l10n="U" oldref="7"><variable id="redlining"><link href="text/shared/guide/redlining.xhp" name="Recording and Displaying Changes">Recording and Displaying Changes</link> </variable></paragraph> -<paragraph role="note" id="par_id4013794" xml-lang="en-US" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph> -<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="2">When several authors are working on the same text or spreadsheet, the review function records and displays who made the various changes. On the final edit of the document, it is then possible to look at each individual change and decide whether it should be accepted or rejected.</paragraph> -<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="3">For example: You are an editor and are delivering your latest report. But before publication the report must be read by the senior editor and the proofreader, and both will add their changes. The senior editor writes "clarify" after one paragraph and crosses out another entirely. The proofreader corrects the spelling of your document.</paragraph> -<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="4">The edited document comes back to you, and you can incorporate or ignore the suggestions of the two reviewers.</paragraph> -<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="5">Let's say you also e-mailed a copy of the report to a good friend and colleague who has done research on a similar topic in the past. You asked for a few suggestions, and the document is now returned by e-mail with your colleague's suggestions.</paragraph> -<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="6">As all your colleagues and the managers in your company work with $[officename], you can produce a final version of the document from the results you get back.</paragraph> -<embed href="text/shared/00/00000004.xhp#related"/> -<embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/> -<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/> -<embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/> -<embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/> -<embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/> -<embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/> -</body> -</helpdocument> + <paragraph xml-lang="en-US" id="par_id4013794" role="note" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph> + <paragraph xml-lang="en-US" id="par_id3153681" role="paragraph" l10n="U" oldref="2">When several authors are working on the same text or spreadsheet, the review function records and displays who made the various changes. On the final edit of the document, it is then possible to look at each individual change and decide whether it should be accepted or rejected.</paragraph> + <paragraph xml-lang="en-US" id="par_id3147008" role="paragraph" l10n="U" oldref="3">For example: You are an editor and are delivering your latest report. But before publication the report must be read by the senior editor and the proofreader, and both will add their changes. The senior editor writes "clarify" after one paragraph and crosses out another entirely. The proofreader corrects the spelling of your document.</paragraph> + <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="4">The edited document comes back to you, and you can incorporate or ignore the suggestions of the two reviewers.</paragraph> + <paragraph xml-lang="en-US" id="par_id3146957" role="paragraph" l10n="U" oldref="5">Let's say you also e-mailed a copy of the report to a good friend and colleague who has done research on a similar topic in the past. You asked for a few suggestions, and the document is now returned by e-mail with your colleague's suggestions.</paragraph> + <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="6">As all your colleagues and the managers in your company work with $[officename], you can produce a final version of the document from the results you get back.</paragraph> + <embed href="text/shared/00/00000004.xhp#related"/> + <embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/> + <embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/> + <embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/> + <embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/> + <embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/> + <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/> + </body> +</helpdocument>
\ No newline at end of file diff --git a/helpcontent2/source/text/shared/guide/redlining_enter.xhp b/helpcontent2/source/text/shared/guide/redlining_enter.xhp index b762de0da5..112094d568 100755 --- a/helpcontent2/source/text/shared/guide/redlining_enter.xhp +++ b/helpcontent2/source/text/shared/guide/redlining_enter.xhp @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> - +<helpdocument version="1.0"> <!-- - *********************************************************************** +*********************************************************************** * * 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,54 +29,50 @@ * ************************************************************************ --> - -<helpdocument version="1.0"> + + <meta> -<topic id="textsharedguideredlining_enterxml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Recording Changes</title> -<filename>/text/shared/guide/redlining_enter.xhp</filename> -</topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2006-02-24T12:53:47">converted from old format - fpe</lastedited> -</history> -</meta> -<body> + <topic id="textsharedguideredlining_enterxml" indexer="include" status="PUBLISH"> + <title xml-lang="en-US" id="tit">Recording Changes</title> + <filename>/text/shared/guide/redlining_enter.xhp</filename> + </topic> + </meta> + <body> <bookmark xml-lang="en-US" branch="index" id="bm_id3155364"><bookmark_value>changes; recording</bookmark_value> -<bookmark_value>recording; changes</bookmark_value> -<bookmark_value>comments; on changes</bookmark_value> -<bookmark_value>settings;tracking changes</bookmark_value> -</bookmark><comment>UFI: deleted index review function;recording changes</comment> -<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="7"><variable id="redlining_enter"><link href="text/shared/guide/redlining_enter.xhp" name="Recording Changes">Recording Changes</link> + <bookmark_value>recording; changes</bookmark_value> + <bookmark_value>comments; on changes</bookmark_value> + <bookmark_value>review function;tracking changes</bookmark_value> +</bookmark><comment>UFI: deleted index review function;recording changes</comment><comment>MW changed "settings;tracking changes" </comment> +<paragraph xml-lang="en-US" id="hd_id3155364" role="heading" level="1" l10n="U" oldref="7"><variable id="redlining_enter"><link href="text/shared/guide/redlining_enter.xhp" name="Recording Changes">Recording Changes</link> </variable></paragraph> -<paragraph role="note" id="par_id7271645" xml-lang="en-US" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph> -<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="CHG" oldref="8">Not all changes are recorded. For example, the changing of a tab stop from align left to align right is not recorded. However, all usual changes made by a proofreader are recorded, such as additions, deletions, text alterations, and usual formatting.</paragraph> -<table id="tbl_id3147399"> -<tablerow> -<tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="17">1.</paragraph> -</tablecell> -<tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="9">To start recording changes, open the document to be edited and choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes</emph></link> and then choose <emph>Record</emph>.</paragraph> -</tablecell> -</tablerow> -<tablerow> -<tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="18">2.</paragraph> -</tablecell> -<tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3163802" xml-lang="en-US" l10n="U" oldref="10">Now start making your changes. You will note that all new text passages that you enter are underlined in color, while all text that you delete remains visible but is crossed out and shown in color.</paragraph> -</tablecell> -</tablerow> -<tablerow> -<tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="19">3.</paragraph> -</tablecell> -<tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="CHG" oldref="11">If you move to a marked change with the mouse pointer, you will see a reference to the type of change, the author, date and time of day for the change in the Help Tip. If the Extended Tips are also enabled, you will also see any available comments on this change.</paragraph> -</tablecell> -</tablerow> -</table> + <paragraph xml-lang="en-US" id="par_id7271645" role="note" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph> + <paragraph xml-lang="en-US" id="par_id3145669" role="paragraph" l10n="CHG" oldref="8">Not all changes are recorded. For example, the changing of a tab stop from align left to align right is not recorded. However, all usual changes made by a proofreader are recorded, such as additions, deletions, text alterations, and usual formatting.</paragraph> + <table id="tbl_id3147399"> + <tablerow> + <tablecell> + <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="17">1.</paragraph> + </tablecell> + <tablecell> + <paragraph xml-lang="en-US" id="par_id3149095" role="paragraph" l10n="U" oldref="9">To start recording changes, open the document to be edited and choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes</emph></link> and then choose <emph>Record</emph>.</paragraph> + </tablecell> + </tablerow> + <tablerow> + <tablecell> + <paragraph xml-lang="en-US" id="par_id3154749" role="paragraph" l10n="U" oldref="18">2.</paragraph> + </tablecell> + <tablecell> + <paragraph xml-lang="en-US" id="par_id3163802" role="paragraph" l10n="U" oldref="10">Now start making your changes. You will note that all new text passages that you enter are underlined in color, while all text that you delete remains visible but is crossed out and shown in color.</paragraph> + </tablecell> + </tablerow> + <tablerow> + <tablecell> + <paragraph xml-lang="en-US" id="par_id3152349" role="paragraph" l10n="U" oldref="19">3.</paragraph> + </tablecell> + <tablecell> + <paragraph xml-lang="en-US" id="par_id3149578" role="paragraph" l10n="CHG" oldref="11">If you move to a marked change with the mouse pointer, you will see a reference to the type of change, the author, date and time of day for the change in the Help Tip. If the Extended Tips are also enabled, you will also see any available comments on this change.</paragraph> + </tablecell> + </tablerow> + </table> <paragraph role="paragraph" id="par_id3156119" xml-lang="en-US" l10n="U" oldref="12">Changes in a spreadsheet document are highlighted by a border around the cells; when you point to the cell you can see more detailed information on this change in the Help Tip.</paragraph> <paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="13">You can enter a comment on each recorded change by placing the cursor in the area of the change and then choosing <emph>Edit - Changes - Comment</emph>. In addition to Extended Tips, the comment is also displayed in the list in the <link href="text/shared/01/02230400.xhp" name="Accept or Reject Changes"><emph>Accept or Reject Changes</emph></link> dialog.</paragraph> diff --git a/helpcontent2/source/text/shared/guide/spadmin.xhp b/helpcontent2/source/text/shared/guide/spadmin.xhp index 2a994c5411..79f667244f 100755 --- a/helpcontent2/source/text/shared/guide/spadmin.xhp +++ b/helpcontent2/source/text/shared/guide/spadmin.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 @@ -33,7 +33,7 @@ <helpdocument version="1.0"> <meta> <topic id="textsharedguidespadminxml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Setting up Printer, Fax and Fonts Under UNIX Based Platforms</title> +<title id="tit" xml-lang="en-US">Setting up Printer and Fax Under UNIX Based Platforms</title> <filename>/text/shared/guide/spadmin.xhp</filename> </topic> </meta> @@ -48,14 +48,12 @@ <bookmark_value>PostScript; PDF converter, UNIX</bookmark_value> <bookmark_value>converters; PostScript, UNIX</bookmark_value> <bookmark_value>PDF; PostScript to PDF converter, UNIX</bookmark_value> -<bookmark_value>fonts; adding under UNIX</bookmark_value> -<bookmark_value>typefaces; adding under UNIX</bookmark_value> </bookmark><comment>mw deleted "printer programs under UNIX", "fax programs under UNIX" and "font programs under UNIX" and changed "faxes;..."</comment> <paragraph role="paragraph" id="par_id3154422" xml-lang="en-US" l10n="E" oldref="341" localize="false"/> <paragraph role="heading" id="hd_id3147834" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="spadmin"><link href="text/shared/guide/spadmin.xhp" name="Setting up Printer, Fax and Fonts Under UNIX Based Platforms">Setting up Printer, Fax and Fonts Under UNIX Based Platforms</link> </variable></paragraph> <section id="chapter_body"> -<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="2">Under UNIX based platforms, the printer administration program <emph>spadmin</emph> is provided to help you set up printers, faxes and fonts for use with the $[officename] software.</paragraph> +<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="2">Under UNIX based platforms, the printer administration program <emph>spadmin</emph> is provided to help you set up printers and faxes for use with the $[officename] software.</paragraph> <paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="117">Call the printer administration program <emph>spadmin</emph> as follows:</paragraph> <list type="unordered"> <listitem> @@ -67,7 +65,7 @@ </list> <paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="14">After it starts, the window of the printer administration program <emph>spadmin</emph> appears.</paragraph> <paragraph role="paragraph" id="par_id3149580" xml-lang="en-US" l10n="U" oldref="10">Following a server installation, the system administrator first logs on as with root privileges, and starts the printer administration program <emph>spadmin</emph>. The administrator then creates a general printer configuration file called {install_path}/share/psprint/psprint.conf for all users. All changes are immediately available to all users.</paragraph> -<paragraph role="paragraph" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="285">The system administrator can also add fonts for all users in the server installation. However, these fonts are available only after restarting the $[officename] software.</paragraph> + <paragraph role="heading" id="hd_id3159177" xml-lang="en-US" level="2" l10n="U" oldref="121">Setting up Printers</paragraph> <paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="122">Under UNIX based platforms, the $[officename] software only offers direct support for printers using the PostScript technology. Other printers must be set up as described in the section <emph>Printer Drivers in the $[officename] Software</emph>. The $[officename] software automatically provides a printer with the default driver for each system queue. You can add additional printers as needed.</paragraph> <paragraph role="heading" id="hd_id3148564" xml-lang="en-US" level="3" l10n="U" oldref="286">Adding a Printer</paragraph> @@ -223,88 +221,6 @@ </list> <paragraph role="paragraph" id="par_id3153064" xml-lang="en-US" l10n="U" oldref="313">You can now create PDF documents by printing to the converter that has just been created.</paragraph> <paragraph role="paragraph" id="par_id3159222" xml-lang="en-US" l10n="E" oldref="345" localize="false"/> -<paragraph role="heading" id="hd_id3156195" xml-lang="en-US" level="2" l10n="U" oldref="143">Installing Fonts</paragraph> -<paragraph role="paragraph" id="par_id3153914" xml-lang="en-US" l10n="U" oldref="144">When you are working with the $[officename] software you might notice that a different number of fonts is provided depending on the document type being used. This is because not all of the fonts can be used in every case.</paragraph> -<list type="unordered"> -<listitem> -<paragraph role="listitem" id="par_id3152382" xml-lang="en-US" l10n="U" oldref="145">Therefore, only those fonts will be shown in the font selection box when working with a text document which can also be printed, as it is assumed that you will only want to use those fonts that you can actually have printed on paper.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3157982" xml-lang="en-US" l10n="CHG" oldref="146">In an HTML document or in Web layout, only fonts that are available on screen are offered.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3149590" xml-lang="en-US" l10n="U" oldref="147">On the other hand, when working with spreadsheets and drawings you will be able to use all of the fonts that can be either printed or shown on the screen.</paragraph> -</listitem> -</list> -<paragraph role="paragraph" id="par_id3159093" xml-lang="en-US" l10n="U" oldref="148">The $[officename] software tries to match the display on screen to the printout (WYSIWYG = what you see is what you get). Possible problems are shown in the bottom of the dialog <emph>Format - Character</emph>.</paragraph> -<paragraph role="heading" id="hd_id3156353" xml-lang="en-US" level="3" l10n="U" oldref="314">Adding Fonts</paragraph> -<paragraph role="paragraph" id="par_id3144503" xml-lang="en-US" l10n="U" oldref="315">You can integrate additional fonts in the $[officename] software. Fonts which you integrate are available exclusively to the $[officename] software and can be used with various Xservers without your having to install them there. To make the fonts available to other programs as well, proceed as usual by adding the fonts to your Xserver. The $[officename] software can display and print out PostScript Type1 fonts as well as TrueType fonts (including TrueType Collections).</paragraph> -<paragraph role="paragraph" id="par_id3156174" xml-lang="en-US" l10n="U" oldref="316">To integrate additional fonts in the $[officename] software, proceed as follows:</paragraph> -<list type="ordered"> -<listitem> -<paragraph role="listitem" id="par_id3154825" xml-lang="en-US" l10n="U" oldref="357">Go to the {install_path}/program directory.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3151127" xml-lang="en-US" l10n="U" oldref="317">Enter: ./spadmin</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3149072" xml-lang="en-US" l10n="U" oldref="318">Click <emph>Fonts</emph>.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3156341" xml-lang="en-US" l10n="U" oldref="319">The dialog lists all fonts added for the $[officename] software. You can select and remove fonts using the <emph>Remove</emph> button or add new fonts with the <emph>Add</emph> button.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3155118" xml-lang="en-US" l10n="U" oldref="320">Click <emph>Add</emph>. The <emph>Add Fonts</emph> dialog appears.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3149126" xml-lang="en-US" l10n="U" oldref="321">Enter the directory from which you want to add the fonts. Press the <emph>...</emph> button and select the directory from the path selection dialog or enter the directory directly.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3154266" xml-lang="en-US" l10n="U" oldref="322">A list of the fonts from this directory appears. Select the fonts you want to add. To add all the fonts, click <emph>Select All</emph>.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3154060" xml-lang="en-US" l10n="U" oldref="323">With the <emph>Create soft links only</emph> check box you can determine whether the fonts are to be copied into the $[officename] directory or only symbolic links are to be created there. If the fonts to be added are on a data medium that is not always available (such as a CD-ROM), you must copy the fonts.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3155539" xml-lang="en-US" l10n="U" oldref="324">Click OK. The fonts will now be added.</paragraph> -</listitem> -</list> -<paragraph role="paragraph" id="par_id3146776" xml-lang="en-US" l10n="U" oldref="325">In the case of a server installation, the fonts are installed in that installation if possible. If the user has no write access rights, the fonts will be installed in the corresponding user installation so that only the user who installed them can access them.</paragraph> -<paragraph role="heading" id="hd_id3152869" xml-lang="en-US" level="3" l10n="U" oldref="326">Deleting Fonts</paragraph> -<paragraph role="paragraph" id="par_id3151302" xml-lang="en-US" l10n="U" oldref="327">To delete fonts, proceed as follows:</paragraph> -<list type="ordered"> -<listitem> -<paragraph role="listitem" id="par_id3150213" xml-lang="en-US" l10n="U" oldref="328">Start spadmin.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3154608" xml-lang="en-US" l10n="U" oldref="329">Click <emph>Fonts</emph>.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3145195" xml-lang="en-US" l10n="U" oldref="330">All fonts added to the $[officename] software are listed in the dialog that now appears. Select the fonts you want to delete and click <emph>Delete</emph>.</paragraph> -</listitem> -</list> -<paragraph role="paragraph" id="par_id3153242" xml-lang="en-US" l10n="U" oldref="331">You can delete only the fonts that have been added for the $[officename] software.</paragraph> -<paragraph role="heading" id="hd_id3147487" xml-lang="en-US" level="3" l10n="U" oldref="332">Renaming Fonts</paragraph> -<paragraph role="paragraph" id="par_id3148899" xml-lang="en-US" l10n="U" oldref="333">You can also rename fonts added for the $[officename] software. This is especially useful for fonts that contain several localized names.</paragraph> -<list type="ordered"> -<listitem> -<paragraph role="listitem" id="par_id3154766" xml-lang="en-US" l10n="U" oldref="334">Start spadmin.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3151009" xml-lang="en-US" l10n="U" oldref="335">Click <emph>Fonts</emph>.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3151120" xml-lang="en-US" l10n="U" oldref="336">Select the fonts you want to rename and click <emph>Rename</emph>.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3153008" xml-lang="en-US" l10n="U" oldref="337">Enter a new name in the dialog that appears. If the font contains several names, these names will serve as suggestions in the combo box where you enter the new name.</paragraph> -</listitem> -<listitem> -<paragraph role="listitem" id="par_id3155521" xml-lang="en-US" l10n="U" oldref="338">Click OK.</paragraph> -</listitem> -</list> -<paragraph role="paragraph" id="par_id3149802" xml-lang="en-US" l10n="U" oldref="339">If you select several fonts to rename, one dialog appears for each selected font.</paragraph> -<paragraph role="paragraph" id="par_id3153487" xml-lang="en-US" l10n="U" oldref="340">If you have selected a TrueType Collection (TTC), one dialog appears for each of the fonts contained in it.</paragraph> </section> </section> </body> diff --git a/helpcontent2/source/text/shared/guide/start_parameters.xhp b/helpcontent2/source/text/shared/guide/start_parameters.xhp index a7ab87e70a..f419787800 100644 --- a/helpcontent2/source/text/shared/guide/start_parameters.xhp +++ b/helpcontent2/source/text/shared/guide/start_parameters.xhp @@ -36,10 +36,6 @@ <title id="tit" xml-lang="en-US">Starting the $[officename] Software With Parameters</title> <filename>/text/shared/guide/start_parameters.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2007-01-25T12:22:48">converted from old format - fpe</lastedited> -</history> </meta> <body> <section id="start_parameters"> @@ -51,7 +47,6 @@ <paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="1" l10n="U" oldref="52">Starting the $[officename] Software With Parameters</paragraph> <paragraph role="paragraph" id="par_id3147009" xml-lang="en-US" l10n="U" oldref="1">By starting the $[officename] software from the command line you can assign various parameters, with which you can influence the performance. The use of command line parameters is only recommended for experienced users.</paragraph> <paragraph role="note" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="2">For normal handling, the use of command line parameters is not necessary. A few of the parameters require a deeper knowledge of the technical background of the $[officename] software technology.</paragraph> -<paragraph role="note" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="3">More information on this topic can be found at <link href="http://www.openoffice.org" name="www.openoffice.org">www.openoffice.org</link>.</paragraph> <paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="4">Starting the $[officename] Software From the Command Line</paragraph> <list type="ordered"> <listitem> diff --git a/helpcontent2/source/text/shared/guide/startcenter.xhp b/helpcontent2/source/text/shared/guide/startcenter.xhp index 1b928a5c08..ebecbb15c6 100644 --- a/helpcontent2/source/text/shared/guide/startcenter.xhp +++ b/helpcontent2/source/text/shared/guide/startcenter.xhp @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <helpdocument version="1.0"> - + <!-- *********************************************************************** * * 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,8 +29,8 @@ * ************************************************************************ --> - - + + <meta> <topic id="textsharedguidestartcenterxhp" indexer="include"> <title xml-lang="en-US" id="tit">Start Center</title> @@ -45,7 +45,7 @@ <paragraph xml-lang="en-US" id="hd_id0820200802524447" role="heading" level="1" l10n="NEW"><variable id="startcenter"><link href="text/shared/guide/startcenter.xhp">Start Center</link> </variable></paragraph> <paragraph xml-lang="en-US" id="par_id0820200803204063" role="paragraph" l10n="NEW">Welcome to %PRODUCTNAME. Thank you for using the %PRODUCTNAME <link href="text/shared/05/00000110.xhp">application help</link>. Press F1 whenever you need help using the %PRODUCTNAME software.</paragraph> - <paragraph xml-lang="en-US" id="par_id0820200802524413" role="paragraph" l10n="NEW">You see the Start Center when no document is open in %PRODUCTNAME. <ahelp hid=".">Click an icon to open a new document, to open a file dialog, or to browse to a featured web page.</ahelp></paragraph> + <paragraph xml-lang="en-US" id="par_id0820200802524413" role="paragraph" l10n="NEW">You see the Start Center when no document is open in %PRODUCTNAME. <ahelp hid=".">Click an icon to open a new document or a file dialog.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:WriterButton" id="bm_id1022200910564632" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:CalcButton" id="bm_id1022200910570124" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:DrawButton" id="bm_id1022200910571273" localize="false"/> @@ -85,6 +85,6 @@ <bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:OpenButton" id="bm_id1022200910595546" localize="false"/> <paragraph xml-lang="en-US" id="par_id1022200911011975" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The Open a Document icon presents a file open dialog.</ahelp></paragraph> <paragraph xml-lang="en-US" id="par_id082020080310500" role="paragraph" l10n="NEW">The <emph>Open a document</emph> icon presents a <link href="text/shared/guide/doc_open.xhp">file open</link> dialog.</paragraph><comment>the four icons show a short explanation already</comment> -<paragraph xml-lang="en-US" id="par_id0820200803105158" role="paragraph" l10n="NEW">The remaining icons open your system default browser to show different web pages related to %PRODUCTNAME.</paragraph> + </body> </helpdocument>
\ No newline at end of file diff --git a/helpcontent2/source/text/shared/guide/text_color.xhp b/helpcontent2/source/text/shared/guide/text_color.xhp index aafd82c985..4ed5b1354f 100644 --- a/helpcontent2/source/text/shared/guide/text_color.xhp +++ b/helpcontent2/source/text/shared/guide/text_color.xhp @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> - - +<helpdocument version="1.0"> <!-- - *********************************************************************** +*********************************************************************** * * 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 @@ -32,50 +31,53 @@ --> - <helpdocument version="1.0"> <meta> -<topic id="textsharedguidetext_colorxml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Changing the Color of Text</title> -<filename>/text/shared/guide/text_color.xhp</filename> -</topic> -</meta> -<body> -<bookmark xml-lang="en-US" branch="index" id="bm_id3156014"><bookmark_value>colors; fill format</bookmark_value> -<bookmark_value>text; coloring</bookmark_value> -<bookmark_value>characters; coloring</bookmark_value> -</bookmark> -<paragraph role="heading" id="hd_id3156014" xml-lang="en-US" level="1" l10n="U" oldref="42"><variable id="text_color"><link href="text/shared/guide/text_color.xhp" name="Changing the Color of Text">Changing the Color of Text</link> + <topic id="textsharedguidetext_colorxml" indexer="include" status="PUBLISH"> + <title xml-lang="en-US" id="tit">Changing the Color of Text</title> + <filename>/text/shared/guide/text_color.xhp</filename> + </topic> + </meta> + <body> +<bookmark xml-lang="en-US" branch="index" id="bm_id3156014"><bookmark_value>text; coloring</bookmark_value> + <bookmark_value>characters; coloring</bookmark_value> + <bookmark_value>colors; fonts</bookmark_value> + <bookmark_value>fonts;colors</bookmark_value> +</bookmark><comment>MW added two entries from text/shared/01/05020200.xhp and deleted "colors;fill format"</comment> +<paragraph xml-lang="en-US" id="hd_id3156014" role="heading" level="1" l10n="U" + oldref="42"><variable id="text_color"><link href="text/shared/guide/text_color.xhp" name="Changing the Color of Text">Changing the Color of Text</link> </variable></paragraph> -<paragraph role="paragraph" id="par_id3150040" xml-lang="en-US" l10n="CHG" oldref="40">Click the arrow next to the <emph>Font Color</emph> icon to activate a <link href="text/shared/00/00000001.xhp#abreissleiste" name="toolbar">toolbar</link> from which you can choose from a range of colors.</paragraph> -<table id="tbl_id3152801"> -<tablerow> -<tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="E"> -<image id="img_id3159233" src="res/commandimagelist/sc_color.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159233" xml-lang="en-US">Icon</alt> + <paragraph xml-lang="en-US" id="par_id3150040" role="paragraph" l10n="CHG" oldref="40">Click the arrow next to the <emph>Font Color</emph> icon to activate a <link href="text/shared/00/00000001.xhp#abreissleiste" name="toolbar">toolbar</link> from which you can choose from a range of colors.</paragraph> + <table id="tbl_id3152801"> + <tablerow> + <tablecell> + <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="E"> +<image id="img_id3159233" src="res/commandimagelist/sc_color.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3159233">Icon</alt> </image></paragraph> -</tablecell> -<tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3152781" xml-lang="en-US" l10n="U" oldref="45">Font Color</paragraph> -</tablecell> -</tablerow> -</table> -<table id="tbl_id3146797"> -<tablerow> -<tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="E"> -<image id="img_id3150503" src="res/commandimagelist/sc_fillstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150503" xml-lang="en-US">Icon</alt> + </tablecell> + <tablecell> + <paragraph xml-lang="en-US" id="par_id3152781" role="paragraph" l10n="U" oldref="45">Font Color</paragraph> + </tablecell> + </tablerow> + </table> + + <table id="tbl_id3146797"> + <tablerow> + <tablecell> + <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="E"> +<image id="img_id3150503" src="res/commandimagelist/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150503">Icon</alt> </image></paragraph> -</tablecell> -<tablecell colspan="" rowspan=""> + </tablecell> + <tablecell> <bookmark xml-lang="en-US" branch="index" id="bm_id3149795"><bookmark_value>paint can symbol</bookmark_value> </bookmark> -<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="41">The following only applies to <item type="productname">%PRODUCTNAME</item> Writer: If you click the icon with a short-click while no text is selected, then the mouse pointer changes its appearance and is displayed as a paint can. Use this paint can symbol with the mouse key pressed to drag across a text area. This text area takes the selected color. The function remains active for as long as the icon is pressed, or until you click without dragging, or until you press the Escape key.</paragraph> -</tablecell> -</tablerow> -</table> -<paragraph role="paragraph" id="par_id3145120" xml-lang="en-US" l10n="U" oldref="46">The following applies to all modules (<item type="productname">%PRODUCTNAME</item> Writer, Calc, Draw, Impress): Select the text that is to take another color, then click the color you want on the toolbar.</paragraph> -<embed href="text/shared/00/00000004.xhp#related"/> -<embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/> -<paragraph role="paragraph" id="par_id3154285" xml-lang="en-US" l10n="U" oldref="43"><link href="text/shared/01/05020100.xhp" name="Font color">Font color</link></paragraph> -</body> -</helpdocument> +<paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="41">The following only applies to <item type="productname">%PRODUCTNAME</item> Writer: If you click the icon with a short-click while no text is selected, then the mouse pointer changes its appearance and is displayed as a paint can. Use this paint can symbol with the mouse key pressed to drag across a text area. This text area takes the selected color. The function remains active for as long as the icon is pressed, or until you click without dragging, or until you press the Escape key.</paragraph> + </tablecell> + </tablerow> + </table> + + <paragraph xml-lang="en-US" id="par_id3145120" role="paragraph" l10n="U" oldref="46">The following applies to all modules (<item type="productname">%PRODUCTNAME</item> Writer, Calc, Draw, Impress): Select the text that is to take another color, then click the color you want on the toolbar.</paragraph> + <embed href="text/shared/00/00000004.xhp#related"/> + <embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/> + <paragraph xml-lang="en-US" id="par_id3154285" role="paragraph" l10n="U" oldref="43"><link href="text/shared/01/05020100.xhp" name="Font color">Font color</link></paragraph> + </body> +</helpdocument>
\ No newline at end of file |