diff options
| author | Uwe Fischer <ufi@openoffice.org> | 2010-12-17 09:46:32 +0100 |
|---|---|---|
| committer | Uwe Fischer <ufi@openoffice.org> | 2010-12-17 09:46:32 +0100 |
| commit | bda0aa1095c27a5a24e596d910082a8ebcc2124d (patch) | |
| tree | 599543fb4e2eb16e028a59c942b920691c0eadb1 | |
| parent | ec2479e6193f9760937e3fbe0b3bcdc953bd8f21 (diff) | |
hcshared29: end-of-year commitment
66 files changed, 603 insertions, 673 deletions
diff --git a/helpcontent2/source/text/scalc/01/02200000.xhp b/helpcontent2/source/text/scalc/01/02200000.xhp index a57f8b1bcb..a33e5cdab1 100755 --- a/helpcontent2/source/text/scalc/01/02200000.xhp +++ b/helpcontent2/source/text/scalc/01/02200000.xhp @@ -4,7 +4,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 @@ -27,17 +27,13 @@ * for a copy of the LGPLv3 License. * ************************************************************************--> - + <helpdocument version="1.0"> <meta> <topic id="textscalc0102200000xml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Sheet</title> <filename>/text/scalc/01/02200000.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2004-12-17T13:37:12">converted from old format - fpe</lastedited> -</history> </meta> <body> <section id="tabellen"> @@ -51,5 +47,7 @@ <embed href="text/scalc/01/02210000.xhp#tabellenauswaehlen"/> <paragraph role="heading" id="hd_id3163708" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/scalc/01/02170000.xhp" name="Delete">Delete</link></paragraph> <embed href="text/scalc/01/02170000.xhp#tabelleloeschentext"/> +<paragraph role="heading" id="hd_id3163733308" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/06140500.xhp" name="Events">Events</link></paragraph> +<embed href="text/shared/01/06140500.xhp#assignaction"/> </body> </helpdocument> diff --git a/helpcontent2/source/text/schart/01/03010000.xhp b/helpcontent2/source/text/schart/01/03010000.xhp index 4dbab4c7c8..f329660a9d 100644 --- a/helpcontent2/source/text/schart/01/03010000.xhp +++ b/helpcontent2/source/text/schart/01/03010000.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 @@ -87,6 +87,7 @@ <bookmark xml-lang="en-US" branch="hid/CHART2_HID_SCH_TBI_DATA_DELETE_COL" id="bm_id3153959" localize="false"/><comment>delete series</comment><paragraph role="paragraph" id="par_id3153336" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="." visibility="hidden">Deletes the current series or text column. It is not possible to delete the first text column.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/CHART2_HID_SCH_TBI_DATA_SWAP_COL" id="bm_id8501846" localize="false"/><comment>move series right</comment><paragraph role="paragraph" id="par_id4089175" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Switches the current column with its neighbor at the right.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/CHART2_HID_SCH_TBI_DATA_SWAP_ROW" id="bm_id4469130" localize="false"/><comment>move row down</comment><paragraph role="paragraph" id="par_id3949095" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Switches the current row with its neighbor below.</ahelp></paragraph><comment>edit fields, see i72361</comment> +<bookmark xml-lang="en-US" branch="hid/CHART2_HID_SCH_TBI_DATA_TOGGLE_DATE_CATEGORIES" id="bm_id990469130" localize="false"/><comment>Categories: Date/Text</comment><paragraph role="paragraph" id="par_id990949095" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For a category axis that might be a date axis, you can change the formatting of the data from Date to Text.</ahelp></paragraph><comment>see i115840</comment> <bookmark xml-lang="en-US" branch="hid/CHART2_HID_SCH_DATA_SERIES_LABEL" id="bm_id3522446" localize="false"/><paragraph role="paragraph" id="par_id6697286" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter names for the data series.</ahelp></paragraph> </body> </helpdocument> diff --git a/helpcontent2/source/text/schart/01/04050100.xhp b/helpcontent2/source/text/schart/01/04050100.xhp index 6637b9a28a..e22c1fad51 100644 --- a/helpcontent2/source/text/schart/01/04050100.xhp +++ b/helpcontent2/source/text/schart/01/04050100.xhp @@ -43,10 +43,11 @@ <bookmark_value>trend lines in charts</bookmark_value> <bookmark_value>mean value lines in charts</bookmark_value> </bookmark> +<comment>only use trend line, not regression curve: i89823</comment> <bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuTrendlines" id="bm_id2001709" localize="false"/> <paragraph xml-lang="en-US" id="hd_id5409405" role="heading" level="1" l10n="CHG"><variable id="regression"><link href="text/schart/01/04050100.xhp">Trend Lines</link> </variable></paragraph> - <paragraph xml-lang="en-US" id="par_id7272255" role="paragraph" l10n="CHG"><variable id="trendlinestext"><ahelp hid=".">Regression curves, also known as trend lines, can be added to all 2D chart types except for Pie and Stock charts.</ahelp> + <paragraph xml-lang="en-US" id="par_id7272255" role="paragraph" l10n="CHG"><variable id="trendlinestext"><ahelp hid=".">Trend lines can be added to all 2D chart types except for Pie and Stock charts.</ahelp> </variable></paragraph> <embed href="text/schart/01/04030000.xhp#context"/> <section id="howtoget"> @@ -89,10 +90,10 @@ <bookmark xml-lang="en-US" branch="hid/.uno:InsertTrendlineEquation" id="bm_id2754600" localize="false"/> <paragraph xml-lang="en-US" id="par_id846888" role="paragraph" l10n="NEW"><ahelp hid=".">To show the trend line equation, select the trend line in the chart, right-click to open the context menu, and choose <emph>Insert Trend Line Equation</emph>.</ahelp></paragraph> <paragraph xml-lang="en-US" id="par_id8962065" role="paragraph" l10n="CHG">When the chart is in edit mode, %PRODUCTNAME gives you the equation of the trend line and the coefficient of determination R². Click on the trend line to see the information in the status bar.</paragraph> - <paragraph xml-lang="en-US" id="par_id1328470" role="note" l10n="NEW">For a category chart (for example a line chart), the regression information is calculated using numbers 1, 2, 3, … as x-values. This is also true if your data series uses other numbers as names for the x-values. For such charts the XY chart type might be more suitable.</paragraph> - <paragraph xml-lang="en-US" id="par_id8092593" role="paragraph" l10n="CHG">To show the equation and the coefficient of determination, select the regression curve and choose <item type="menuitem">Format - Format Selection - Equation</item>.</paragraph> -<paragraph xml-lang="en-US" id="par_id7971434" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable Show equation to see the equation of the regression curve.</ahelp></paragraph><comment>hid</comment> -<paragraph xml-lang="en-US" id="par_id558793" role="paragraph" l10n="CHG"><ahelp hid="." visibility="hidden">Enable Show Coefficient of Determination to see the determination coefficient of the regression curve.</ahelp></paragraph> + <paragraph xml-lang="en-US" id="par_id1328470" role="note" l10n="CHG">For a category chart (for example a line chart), the trend line information is calculated using numbers 1, 2, 3, … as x-values. This is also true if your data series uses other numbers as names for the x-values. For such charts the XY chart type might be more suitable.</paragraph> + <paragraph xml-lang="en-US" id="par_id8092593" role="paragraph" l10n="CHG">To show the equation and the coefficient of determination, select the trend line and choose <item type="menuitem">Format - Format Selection - Equation</item>.</paragraph> +<paragraph xml-lang="en-US" id="par_id7971434" role="paragraph" l10n="CHG"><ahelp hid="." visibility="hidden">Enable Show equation to see the equation of the trend line.</ahelp></paragraph><comment>hid</comment> +<paragraph xml-lang="en-US" id="par_id558793" role="paragraph" l10n="CHG"><ahelp hid="." visibility="hidden">Enable Show Coefficient of Determination to see the determination coefficient of the trend line.</ahelp></paragraph> <paragraph xml-lang="en-US" id="par_id7735221" role="paragraph" l10n="NEW">You can also calculate the parameters using Calc functions as follows.</paragraph> <paragraph xml-lang="en-US" id="hd_id5744193" role="heading" level="2" l10n="NEW">The linear regression equation</paragraph> <paragraph xml-lang="en-US" id="par_id9251991" role="paragraph" l10n="NEW">The <emph>linear regression</emph> follows the equation <item type="literal">y=m*x+b</item>.</paragraph> @@ -107,7 +108,7 @@ <paragraph xml-lang="en-US" id="par_id5946531" role="code" l10n="NEW">b = INTERCEPT(Data_Y ;LN(Data_X)) </paragraph> <paragraph xml-lang="en-US" id="par_id5649281" role="code" l10n="NEW">r² = RSQ(Data_Y;LN(Data_X)) </paragraph> <paragraph xml-lang="en-US" id="hd_id7874080" role="heading" level="2" l10n="NEW">The exponential regression equation</paragraph> - <paragraph xml-lang="en-US" id="par_id4679097" role="paragraph" l10n="NEW"> For exponential regression curves a transformation to a linear model takes place. The optimal curve fitting is related to the linear model and the results are interpreted accordingly. </paragraph> + <paragraph xml-lang="en-US" id="par_id4679097" role="paragraph" l10n="CHG"> For exponential trend lines a transformation to a linear model takes place. The optimal curve fitting is related to the linear model and the results are interpreted accordingly. </paragraph> <paragraph xml-lang="en-US" id="par_id9112216" role="paragraph" l10n="NEW">The exponential regression follows the equation <item type="literal">y=b*exp(a*x)</item> or <item type="literal">y=b*m^x</item>, which is transformed to <item type="literal">ln(y)=ln(b)+a*x</item> or <item type="literal">ln(y)=ln(b)+ln(m)*x</item> respectively.</paragraph> <paragraph xml-lang="en-US" id="par_id4416638" role="code" l10n="NEW">a = SLOPE(LN(Data_Y);Data_X) </paragraph> <paragraph xml-lang="en-US" id="par_id1039155" role="paragraph" l10n="CHG">The variables for the second variation are calculated as follows:</paragraph> diff --git a/helpcontent2/source/text/schart/01/05040201.xhp b/helpcontent2/source/text/schart/01/05040201.xhp index aa195e17f5..d11dad84d4 100644 --- a/helpcontent2/source/text/schart/01/05040201.xhp +++ b/helpcontent2/source/text/schart/01/05040201.xhp @@ -46,12 +46,12 @@ <bookmark_value>Y axes; scaling</bookmark_value> </bookmark><comment>mw changed "axes;scaling" to "Y axes, scaling"</comment> <paragraph role="heading" id="hd_id3150868" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/schart/01/05040201.xhp" name="Scale">Scale</link></paragraph> -<paragraph role="paragraph" id="par_id3154013" xml-lang="en-US" l10n="U" oldref="2">Controls the scaling of the Y axis. The X axis can also be scaled here for X-Y charts.</paragraph> +<paragraph role="paragraph" id="par_id3154013" xml-lang="en-US" l10n="CHG" oldref="2">Controls the scaling of the X or Y axis.</paragraph> </section> <section id="howtoget"> <embed href="text/schart/00/00000004.xhp#frtysk"/> </section> -<paragraph role="paragraph" id="par_id3148576" xml-lang="en-US" l10n="U" oldref="79">The Y axis is automatically scaled by $[officename] so that all values are optimally displayed.</paragraph> +<paragraph role="paragraph" id="par_id3148576" xml-lang="en-US" l10n="CHG" oldref="79">The axes are automatically scaled by $[officename] so that all values are optimally displayed.</paragraph> <paragraph role="paragraph" id="par_id3149379" xml-lang="en-US" l10n="U" oldref="3">To achieve specific results, you can manually change the axis scaling. For example, you can display only the top areas of the columns by shifting the zero line upwards.</paragraph> <paragraph role="heading" id="hd_id3154730" xml-lang="en-US" level="2" l10n="U" oldref="4">Scale</paragraph> <paragraph role="paragraph" id="par_id3149400" xml-lang="en-US" l10n="CHG" oldref="5">You can enter values for subdividing axes in this area. You can automatically set the properties <emph>Minimum, Maximum, Major interval, Minor interval count</emph> and <emph>Reference value</emph>.</paragraph> @@ -90,6 +90,7 @@ <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN" id="bm_id6670125" localize="false"/> <bookmark xml-lang="en-US" branch="hid/CHART2_CHECKBOX_TP_SCALE_CBX_AUTO_ORIGIN" id="bm_id1006200803192265" localize="false"/> <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN" id="bm_id1006200805190759" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_AUTO_TIME_RESOLUTION" id="bm_id10087605190759" localize="false"/> <paragraph role="heading" id="hd_id3166432" xml-lang="en-US" level="3" l10n="U" oldref="62">Automatic</paragraph> <paragraph role="paragraph" id="par_id3145389" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SCH:CHECKBOX:TP_SCALE:CBX_AUTO_ORIGIN">You must first deselect the <emph>Automatic</emph> option in order to modify the values.</ahelp></paragraph> <paragraph role="note" id="par_id3149129" xml-lang="en-US" l10n="U" oldref="64">Disable this feature if you are working with "fixed" values, as it does not permit automatic scaling.</paragraph> @@ -98,9 +99,25 @@ <paragraph role="heading" id="hd_id3159206" xml-lang="en-US" level="3" l10n="U" oldref="16">Logarithmic scale</paragraph> <paragraph role="paragraph" id="par_id3145360" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="SCH:CHECKBOX:TP_SCALE:CBX_LOGARITHM">Specifies that you want the axis to be subdivided logarithmically.</ahelp></paragraph> <paragraph role="note" id="par_id3153956" xml-lang="en-US" l10n="U" oldref="61">Use this feature if you are working with values that differ sharply from each other. You can use logarithmic scaling to make the grid lines of the axis equidistant but have values that may increase or decrease.</paragraph> -<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_REVERSE" id="bm_id4007080" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_REVERSE" id="bm_id1024200803164240" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_REVERSE:Category" id="bm_id4007080" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_REVERSE:ValueAxis" id="bm_id1024200803164240" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_REVERSE_MayBeDateAxis" id="bm_id109575190759" localize="false"/> + <paragraph role="heading" id="hd_id9941404" xml-lang="en-US" level="3" l10n="NEW">Reverse direction</paragraph> <paragraph role="paragraph" id="par_id5581835" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Defines where the lower and where the higher values are displayed at the axis. The unchecked state is the mathematical direction.</ahelp> That means for Cartesian coordinate systems that the x-axis shows the lower values on the left and the y-axis shows the lower values at the bottom. For polar coordinate systems the mathematical angle axis direction is counterclockwise and the radial axis is from inner to outer.</paragraph> + +<bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_SCALE:LB_AXIS_TYPE" id="bm_id10022759" localize="false"/> +<paragraph role="heading" id="hd_id922204" xml-lang="en-US" level="3" l10n="NEW">Type</paragraph> +<paragraph role="paragraph" id="par_id59225" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For some types of axes, you can select to format an axis as text or date, or to detect the type automatically.</ahelp> For the axis type "Date" you can set the following options.</paragraph> +<paragraph role="paragraph" id="par_id1159225" xml-lang="en-US" l10n="NEW">Minimum and maximum value to be shown on the ends of the scale.</paragraph> +<bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_SCALE:LB_TIME_RESOLUTION" id="bm_id1344759" localize="false"/> +<paragraph role="paragraph" id="par_id2259225" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Resolution can be set to show days, months, or years as interval steps.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_SCALE:MT_MAIN_DATE_STEP" id="bm_id2210022759" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_SCALE:LB_MAIN_TIME_UNIT" id="bm_id1033022759" localize="false"/> +<paragraph role="paragraph" id="par_id3359225" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Major interval can be set to show a certain number of days, months, or years.</ahelp></paragraph> + +<bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_SCALE:LB_HELP_TIME_UNIT" id="bm_id1472759" localize="false"/> +<paragraph role="paragraph" id="par_id4459225" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Minor interval can be set to show a certain number of days, months, or years.</ahelp></paragraph> + </body> </helpdocument> diff --git a/helpcontent2/source/text/sdraw/main0200.xhp b/helpcontent2/source/text/sdraw/main0200.xhp index 6eeb7c129c..cb4c7c3445 100755 --- a/helpcontent2/source/text/sdraw/main0200.xhp +++ b/helpcontent2/source/text/sdraw/main0200.xhp @@ -5,7 +5,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,17 +29,13 @@ * ************************************************************************ --> - + <helpdocument version="1.0"> <meta> <topic id="textsdrawmain0200xml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Toolbars</title> <filename>/text/sdraw/main0200.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2007-01-18T10:16:47">converted from old format - fpe</lastedited> -</history> </meta> <body> <section id="symbolleisten"> @@ -58,6 +54,9 @@ <section id="Section3"> <embed href="text/sdraw/main0202.xhp#objektleisteznh"/> </section> +<section id="SectionSW6"> +<embed href="text/shared/main0204.xhp#tablebar"/> +</section> <section id="Section4"> <embed href="text/simpress/main0203.xhp#objektleistetext"/> </section> diff --git a/helpcontent2/source/text/shared/00/00000404.xhp b/helpcontent2/source/text/shared/00/00000404.xhp index 58da4f2d66..780ddb884d 100644 --- a/helpcontent2/source/text/shared/00/00000404.xhp +++ b/helpcontent2/source/text/shared/00/00000404.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 @@ -41,7 +41,7 @@ </meta> <body> <paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Menu</paragraph> -<paragraph role="paragraph" id="par_id3153808" xml-lang="en-US" l10n="CHG" oldref="28"><variable id="notiz">Choose <emph>Insert - Comment</emph> (in Writer or Calc) +<paragraph role="paragraph" id="par_id3153808" xml-lang="en-US" l10n="CHG" oldref="28"><variable id="notiz">Choose <emph>Insert - Comment</emph> </variable></paragraph> <section id="scannen"> <paragraph role="paragraph" id="par_id3155619" xml-lang="en-US" l10n="CHG" oldref="71">Choose <emph>Insert - Picture - Scan</emph> @@ -58,9 +58,9 @@ <section id="sonder"> <paragraph role="paragraph" id="par_id3143281" xml-lang="en-US" l10n="U" oldref="34">Choose <emph>Insert - Special Character</emph> </paragraph> -<paragraph role="paragraph" id="par_id3149525" xml-lang="en-US" l10n="U" oldref="35"><switchinline select="appl"><caseinline select="DRAW">Choose <emph>Format - Bullets and Numbering - Customize - Character</emph> button +<paragraph role="paragraph" id="par_id3149525" xml-lang="en-US" l10n="U" oldref="35"><switchinline select="appl"><caseinline select="DRAW">Choose <emph>Format - Bullets and Numbering - Customize - Character</emph> button </caseinline></switchinline></paragraph> -<paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="IMPRESS">Choose <emph>Format - Bullets and Numbering - Customize - Character</emph> button +<paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="IMPRESS">Choose <emph>Format - Bullets and Numbering - Customize - Character</emph> button </caseinline></switchinline></paragraph> <paragraph role="paragraph" id="par_id3156560" xml-lang="en-US" l10n="CHG" oldref="36">Open the <emph>Insert</emph> toolbar, click</paragraph> <section id="sysonder"> @@ -236,7 +236,7 @@ </table> </section> </section> -<paragraph role="paragraph" id="par_id3150396" xml-lang="en-US" l10n="CHG" oldref="47"><variable id="filterauswahl">Open a file of a type that is unknown to %PRODUCTNAME and that is no text file +<paragraph role="paragraph" id="par_id3150396" xml-lang="en-US" l10n="CHG" oldref="47"><variable id="filterauswahl">Open a file of a type that is unknown to %PRODUCTNAME and that is no text file </variable></paragraph> <section id="hyper"> <paragraph role="paragraph" id="par_id3150571" xml-lang="en-US" l10n="U" oldref="2">Choose <emph>View - Toolbars - Hyperlink Bar</emph> diff --git a/helpcontent2/source/text/shared/00/00000450.xhp b/helpcontent2/source/text/shared/00/00000450.xhp index 6f828ec3fc..3d812364fe 100644 --- a/helpcontent2/source/text/shared/00/00000450.xhp +++ b/helpcontent2/source/text/shared/00/00000450.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,15 +45,15 @@ </variable></paragraph> <paragraph role="paragraph" id="par_id3153244" xml-lang="en-US" l10n="CHG" oldref="57"><variable id="DBAbfragen"><emph>View - Database Objects - Queries</emph> </variable></paragraph> -<paragraph role="paragraph" id="par_id3147294" xml-lang="en-US" l10n="CHG" oldref="4"><variable id="Typ">In a database file window, choose <emph>Edit - Database - Properties - Advanced Settings</emph> tab +<paragraph role="paragraph" id="par_id3147294" xml-lang="en-US" l10n="CHG" oldref="4"><variable id="Typ">In a database file window, choose <emph>Edit - Database - Properties - Advanced Settings</emph> tab </variable></paragraph> -<paragraph role="paragraph" id="par_id3159411" xml-lang="en-US" l10n="CHG" oldref="5"><variable id="Datenquelle">In a database file window of type ODBC or Address book, choose Edit - Database - Connection Type +<paragraph role="paragraph" id="par_id3159411" xml-lang="en-US" l10n="CHG" oldref="5"><variable id="Datenquelle">In a database file window of type ODBC or Address book, choose Edit - Database - Connection Type </variable></paragraph> <paragraph role="paragraph" id="par_id3149119" xml-lang="en-US" l10n="U" oldref="6"><variable id="Verzeichnis">Path selection button in various Wizards / <emph>Edit</emph> Buttons for some entries in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph> </variable></paragraph> -<paragraph role="paragraph" id="par_id3154497" xml-lang="en-US" l10n="CHG" oldref="8"><variable id="ODBC">In a database file window of type ODBC, choose Edit - Database - Connection Type +<paragraph role="paragraph" id="par_id3154497" xml-lang="en-US" l10n="CHG" oldref="8"><variable id="ODBC">In a database file window of type ODBC, choose Edit - Database - Connection Type </variable><comment>see #i56356</comment></paragraph> -<paragraph role="paragraph" id="par_id3149355" xml-lang="en-US" l10n="CHG" oldref="61"><variable id="ldap">In a database file window of type Address book - LDAP, choose Edit - Database - Properties +<paragraph role="paragraph" id="par_id3149355" xml-lang="en-US" l10n="CHG" oldref="61"><variable id="ldap">In a database file window of type Address book - LDAP, choose Edit - Database - Properties </variable></paragraph> <paragraph role="paragraph" id="par_id3157896" xml-lang="en-US" l10n="CHG" oldref="9"><variable id="JDBC">In a database file window of type JDBC, choose <emph>Edit - Database - Properties</emph> </variable></paragraph> @@ -69,9 +69,9 @@ </variable></paragraph> <paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="CHG" oldref="21"><variable id="SQLStatement">In a database file window, choose <emph>Tools - SQL</emph> </variable></paragraph> -<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="CHG" oldref="22"><variable id="Abfragen">In a database file window, click the <emph>Queries</emph> icon +<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="CHG" oldref="22"><variable id="Abfragen">In a database file window, click the <emph>Queries</emph> icon </variable></paragraph> -<paragraph role="paragraph" id="par_id3153880" xml-lang="en-US" l10n="CHG" oldref="62"><variable id="Tabellen">In a database file window, click the <emph>Tables</emph> icon +<paragraph role="paragraph" id="par_id3153880" xml-lang="en-US" l10n="CHG" oldref="62"><variable id="Tabellen">In a database file window, click the <emph>Tables</emph> icon </variable></paragraph> <section id="tabellehinzu"> <paragraph role="paragraph" id="par_id3153760" xml-lang="en-US" l10n="CHG" oldref="64"><variable id="tabellenentwurf">In a database file window, click the Tables icon. Choose Insert -<emph> Table Design</emph> or <emph>Edit - Edit</emph> @@ -84,9 +84,9 @@ </variable></paragraph> <paragraph role="paragraph" id="par_id3149579" xml-lang="en-US" l10n="CHG" oldref="24"><variable id="entwab">In a database file window, click the <emph>Queries</emph> icon, then choose <emph>Edit - Edit</emph> </variable></paragraph> -<paragraph role="paragraph" id="par_id3149902" xml-lang="en-US" l10n="CHG" oldref="25"><variable id="FehlendesElement">In a database file window, click the <emph>Queries</emph> icon, then choose <emph>Edit - Edit</emph>. When referenced fields no longer exist, you see this dialog +<paragraph role="paragraph" id="par_id3149902" xml-lang="en-US" l10n="CHG" oldref="25"><variable id="FehlendesElement">In a database file window, click the <emph>Queries</emph> icon, then choose <emph>Edit - Edit</emph>. When referenced fields no longer exist, you see this dialog </variable></paragraph> -<paragraph role="paragraph" id="par_id3159166" xml-lang="en-US" l10n="U" oldref="26"><variable id="Joins">Open query design and choose <emph>Insert - New Relation</emph>, or double-click on a connection line between two tables. +<paragraph role="paragraph" id="par_id3159166" xml-lang="en-US" l10n="U" oldref="26"><variable id="Joins">Open query design and choose <emph>Insert - New Relation</emph>, or double-click on a connection line between two tables. </variable></paragraph> <section id="sytabelle"> <table id="tbl_id3156192"> @@ -142,7 +142,7 @@ <tablerow> <tablecell colspan="" rowspan=""> <paragraph role="paragraph" id="par_id3150393" xml-lang="en-US" l10n="E"> -<image id="img_id3145606" src="res/sc10714.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145606" xml-lang="en-US">Icon</alt> +<image id="img_id3145606" src="res/commandimagelist/sc_tablesort.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145606" xml-lang="en-US">Icon</alt> </image></paragraph> </tablecell> <tablecell colspan="" rowspan=""> @@ -154,7 +154,7 @@ </section> <paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="CHG" oldref="55"><variable id="allgemein">In a database file window, choose <emph>Edit - Database - Properties</emph> </variable></paragraph> -<paragraph role="paragraph" id="par_id3159252" xml-lang="en-US" l10n="CHG" oldref="63"><variable id="tabellecopy">Drag and drop a table or a query into the table part of another database file window +<paragraph role="paragraph" id="par_id3159252" xml-lang="en-US" l10n="CHG" oldref="63"><variable id="tabellecopy">Drag and drop a table or a query into the table part of another database file window </variable></paragraph> <paragraph role="paragraph" id="par_id3148560" xml-lang="en-US" l10n="CHG" oldref="66"><variable id="formularneu">In a database file window, choose<emph> Insert - Form</emph> </variable></paragraph> diff --git a/helpcontent2/source/text/shared/01/04050000.xhp b/helpcontent2/source/text/shared/01/04050000.xhp index e2e426d7f6..1407612e52 100644 --- a/helpcontent2/source/text/shared/01/04050000.xhp +++ b/helpcontent2/source/text/shared/01/04050000.xhp @@ -57,8 +57,8 @@ <embed href="text/shared/00/00000404.xhp#notiz"/> </section> <paragraph xml-lang="en-US" id="hd_id9851680" role="heading" level="2" l10n="NEW">Inserting comments</paragraph> - <paragraph xml-lang="en-US" id="par_id1830500" role="paragraph" l10n="NEW">In Writer, the command <item type="menuitem">Insert - Comment</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option -</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+N key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box.</paragraph> +<comment>issue 113019 112000</comment><paragraph xml-lang="en-US" id="par_id1830500" role="paragraph" l10n="CHG">In Writer, the command <item type="menuitem">Insert - Comment</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option +</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+C key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box.</paragraph> <paragraph xml-lang="en-US" id="par_id0915200910571516" role="paragraph" l10n="NEW">In Calc, Draw, and Impress, the command <item type="menuitem">Insert - Comment</item> inserts a comment.</paragraph> <paragraph xml-lang="en-US" id="par_id1831" role="paragraph" l10n="NEW">The author name and the date and time of creating this comment is shown at the bottom of the comment box.</paragraph> <paragraph xml-lang="en-US" id="par_id6718649" role="paragraph" l10n="NEW">The comments by different authors get different colors. Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the comment author.</paragraph> diff --git a/helpcontent2/source/text/shared/01/05100500.xhp b/helpcontent2/source/text/shared/01/05100500.xhp index 78a5cf1e95..9456055700 100644 --- a/helpcontent2/source/text/shared/01/05100500.xhp +++ b/helpcontent2/source/text/shared/01/05100500.xhp @@ -1,11 +1,11 @@ <?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="textshared0105100500xml" indexer="include"> <title id="tit" xml-lang="en-US">Top</title> @@ -39,7 +39,6 @@ </meta> <body> <section id="oben"> -<bookmark xml-lang="en-US" branch="hid/.uno:CellVertTop" id="bm_id5466554" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:CellVertTop" id="bm_id3149048" localize="false"/> <paragraph role="heading" id="hd_id3154765" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100500.xhp" name="Top">Top</link></paragraph> <paragraph role="paragraph" id="par_id3151390" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CellVertTop">Aligns the contents of the cell to the top edge of the cell.</ahelp></paragraph> diff --git a/helpcontent2/source/text/shared/01/05100600.xhp b/helpcontent2/source/text/shared/01/05100600.xhp index c40caeca85..793e026763 100644 --- a/helpcontent2/source/text/shared/01/05100600.xhp +++ b/helpcontent2/source/text/shared/01/05100600.xhp @@ -1,11 +1,11 @@ <?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,20 +29,19 @@ * ************************************************************************ --> - - + + <meta> <topic id="textshared0105100600xml" indexer="include"> -<title id="tit" xml-lang="en-US">Middle</title> +<title id="tit" xml-lang="en-US">Center (vertical)</title> <filename>/text/shared/01/05100600.xhp</filename> </topic> </meta> <body> <section id="mitte"> -<bookmark xml-lang="en-US" branch="hid/.uno:CellVertCenter" id="bm_id4218858" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:CellVertCenter" id="bm_id3154766" localize="false"/> -<paragraph role="heading" id="hd_id3149874" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100600.xhp" name="Middle">Middle</link></paragraph> -<paragraph role="paragraph" id="par_id3149048" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CellVertCenter">Centers the contents of the cell horizontally in the cell.</ahelp></paragraph> +<paragraph role="heading" id="hd_id3149874" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05100600.xhp" name="Center (vertical)">Center (vertival)</link></paragraph> +<paragraph role="paragraph" id="par_id3149048" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Centers the contents of the cell between top and bottom of the cell.</ahelp></paragraph> </section> <section id="howtoget"> <paragraph role="paragraph" id="par_id3149525" xml-lang="en-US" l10n="U" oldref="121"><variable id="zellemitte">In the context menu of a cell, choose <emph>Cell - Center</emph> diff --git a/helpcontent2/source/text/shared/01/05100700.xhp b/helpcontent2/source/text/shared/01/05100700.xhp index 7bd233e7ca..e4c728b855 100644 --- a/helpcontent2/source/text/shared/01/05100700.xhp +++ b/helpcontent2/source/text/shared/01/05100700.xhp @@ -1,11 +1,11 @@ <?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="textshared0105100700xml" indexer="include"> <title id="tit" xml-lang="en-US">Bottom</title> @@ -39,7 +39,6 @@ </meta> <body> <section id="unten"> -<bookmark xml-lang="en-US" branch="hid/.uno:CellVertBottom" id="bm_id3581992" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:CellVertBottom" id="bm_id3151244" localize="false"/> <paragraph role="heading" id="hd_id3150249" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100700.xhp" name="Bottom">Bottom</link></paragraph> <paragraph role="paragraph" id="par_id3154764" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CellVertBottom">Aligns the contents of the cell to the bottom edge of the cell.</ahelp></paragraph> diff --git a/helpcontent2/source/text/shared/01/05210100.xhp b/helpcontent2/source/text/shared/01/05210100.xhp index bc7e23a3df..f380fbe686 100644 --- a/helpcontent2/source/text/shared/01/05210100.xhp +++ b/helpcontent2/source/text/shared/01/05210100.xhp @@ -4,7 +4,7 @@ <!--*********************************************************************** * * 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,17 +29,13 @@ ************************************************************************--> - + <helpdocument version="1.0"> <meta> <topic id="textshared0105210100xml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Area</title> <filename>/text/shared/01/05210100.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2005-12-05T13:20:17">converted from old format - fpe</lastedited> -</history> </meta> <body> <section id="flaeche"> @@ -57,7 +53,7 @@ <embed href="text/shared/00/00040502.xhp#flaeche2"/> </section> <paragraph role="heading" id="hd_id3149999" xml-lang="en-US" level="2" l10n="U" oldref="3">Fill</paragraph> -<bookmark xml-lang="en-US" branch="hid/.uno:FillStyle" id="bm_id9074448" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/.uno:FillStyle" id="bm_id3154186" localize="false"/> <paragraph role="paragraph" id="par_id3154673" xml-lang="en-US" l10n="U" oldref="4"><variable id="sytext"><ahelp hid=".uno:FillStyle">Select the type of fill that you want to apply to the selected drawing object.</ahelp> </variable></paragraph> diff --git a/helpcontent2/source/text/shared/01/05220000.xhp b/helpcontent2/source/text/shared/01/05220000.xhp index ce53f48269..3f29b1b585 100644 --- a/helpcontent2/source/text/shared/01/05220000.xhp +++ b/helpcontent2/source/text/shared/01/05220000.xhp @@ -1,11 +1,11 @@ <?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="textshared0105220000xml" indexer="include" status="PUBLISH"> <title xml-lang="en-US" id="tit">Text</title> @@ -103,6 +103,6 @@ <bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH" id="bm_id3149763" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3155323" role="heading" level="3" l10n="U" oldref="27">Full width</paragraph> - <paragraph xml-lang="en-US" id="par_id3150244" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_FULL_WIDTH">Anchors the text to the full width of the drawing or text object.</ahelp></paragraph> + <paragraph xml-lang="en-US" id="par_id3150244" role="paragraph" l10n="CHG" oldref="28"><ahelp hid=".">Anchors the text to the full width of the drawing object or text object.</ahelp></paragraph> </body> </helpdocument>
\ No newline at end of file diff --git a/helpcontent2/source/text/shared/01/06040000.xhp b/helpcontent2/source/text/shared/01/06040000.xhp index 4bfd6502b3..fc890d13f7 100644 --- a/helpcontent2/source/text/shared/01/06040000.xhp +++ b/helpcontent2/source/text/shared/01/06040000.xhp @@ -1,17 +1,11 @@ -<?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - -<!-- -*********************************************************************** +<?xml version="1.0" encoding="UTF-8"?><helpdocument version="1.0"> +<!--*********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. * - * OpenOffice.org - a multi-platform office productivity suite + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: soffice2xmlhelp.xsl,v $ - * $Revision: 1.12 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * @@ -30,27 +24,25 @@ * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. * - ************************************************************************ - --> + ************************************************************************ --> - <meta> - <topic id="textshared0106040000xml" indexer="include"> - <title xml-lang="en-US" id="tit">AutoCorrect</title> - <filename>/text/shared/01/06040000.xhp</filename> - </topic> - </meta> - <body> -<bookmark xml-lang="en-US" branch="index" id="bm_id3153391"><bookmark_value>AutoCorrect function;switching on and off</bookmark_value> +<topic id="textshared0106040000xml" indexer="include"> +<title xml-lang="en-US" id="tit">AutoCorrect</title> +<filename>text/shared/01/06040000.xhp</filename> +</topic> +</meta> +<body> +<bookmark xml-lang="en-US" branch="index" id="bm_id3153391"> +<bookmark_value>AutoCorrect function;switching on and off</bookmark_value> +<bookmark_value>AutoComplete, see also AutoCorrect/AutoInput</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/.uno:AutoCorrectDlg" id="bm_id1521736" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/.uno:AutoCorrectDlg" id="bm_id3147543" localize="false"/><comment>MW deleted "AutoFormat function;" and changed "AutoCorrect function;"</comment> -<paragraph xml-lang="en-US" id="hd_id3153391" role="heading" level="1" l10n="U" oldref="1">AutoCorrect</paragraph> - <paragraph xml-lang="en-US" id="par_id3150838" role="paragraph" l10n="CHG" oldref="2"><variable id="autoko"><ahelp hid=".uno:AutoCorrectDlg">Sets the options for automatically replacing text as you type.</ahelp> -</variable></paragraph> - <section id="howtoget"> - <embed href="text/shared/00/00000406.xhp#autokorr"/> - </section> +<bookmark xml-lang="en-US" branch="hid/.uno:AutoCorrectDlg" id="bm_id3147543" localize="false"/><comment>MW deleted "AutoFormat function;" and changed "AutoCorrect function;"</comment><comment>MW added "AutoComplete, see also..."</comment> +<paragraph id="hd_id3153391" role="heading" xml-lang="en-US" level="1">AutoCorrect</paragraph> +<paragraph id="par_id3150838" role="paragraph" xml-lang="en-US"><variable id="autoko"><ahelp hid=".uno:AutoCorrectDlg">Sets the options for automatically replacing text as you type.</ahelp></variable></paragraph> +<section id="howtoget"><embed href="text/shared/00/00000406.xhp#autokorr"/> +</section> <switch select="appl"> <case select="WRITER"><embed href="text/swriter/guide/auto_off.xhp#auto_off"/> </case> @@ -59,22 +51,17 @@ <case select="CALC"><embed href="text/scalc/guide/auto_off.xhp#auto_off"/> </case> </switch> -<paragraph xml-lang="en-US" id="par_id3147261" role="paragraph" l10n="U" oldref="3">The AutoCorrect settings are applied when you press the Spacebar after you enter a word.</paragraph> - <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="4">To turn on or to turn off the AutoCorrect feature, in $[officename] Calc choose <emph>Tools - Cell Contents - AutoInput</emph>, and in $[officename] Writer choose <emph>Format - AutoCorrect - While Typing</emph>. To apply the AutoCorrect settings to an entire text document, choose <emph>Format - AutoCorrect - Apply</emph>.</paragraph> - <embed href="text/shared/01/06040200.xhp#ersetzung"/> - <embed href="text/shared/01/06040300.xhp#ausnahmen"/> - <embed href="text/shared/01/06040100.xhp#optionen"/> - <embed href="text/shared/01/06040400.xhp#typanf"/> +<paragraph id="par_id3147261" role="paragraph" xml-lang="en-US">The AutoCorrect settings are applied when you press the Spacebar after you enter a word.</paragraph> +<paragraph id="par_id3153394" role="paragraph" xml-lang="en-US">To turn on or to turn off the AutoCorrect feature, in $[officename] Calc choose <emph>Tools - Cell Contents - AutoInput</emph>, and in $[officename] Writer choose <emph>Format - AutoCorrect - While Typing</emph>. To apply the AutoCorrect settings to an entire text document, choose <emph>Format - AutoCorrect - Apply</emph>.</paragraph><embed href="text/shared/01/06040200.xhp#ersetzung"/><embed href="text/shared/01/06040300.xhp#ausnahmen"/><embed href="text/shared/01/06040100.xhp#optionen"/><embed href="text/shared/01/06040400.xhp#typanf"/> <switch select="appl"> -<case select="WRITER"><embed href="text/shared/01/06040600.xhp#worterg"/> - <embed href="text/shared/01/06040700.xhp#smarttags"/> +<case select="WRITER"><embed href="text/shared/01/06040600.xhp#worterg"/><embed href="text/shared/01/06040700.xhp#smarttags"/> </case> </switch><embed href="text/shared/00/00000001.xhp#zurueck"/> <switch select="appl"> <case select="WRITER"> <section id="relatedtopics"> - <paragraph xml-lang="en-US" id="par_id3146137" role="paragraph" l10n="C"><link href="text/swriter/01/05150200.xhp" name="AutoFormat">AutoCorrect</link></paragraph> - </section> +<paragraph id="par_id3146137" role="paragraph" xml-lang="en-US"><link href="text/swriter/01/05150200.xhp" name="AutoFormat">AutoCorrect</link></paragraph> +</section> </case> </switch> </body> diff --git a/helpcontent2/source/text/shared/01/06140500.xhp b/helpcontent2/source/text/shared/01/06140500.xhp index 4d80ae6b95..db293f91ae 100644 --- a/helpcontent2/source/text/shared/01/06140500.xhp +++ b/helpcontent2/source/text/shared/01/06140500.xhp @@ -44,12 +44,22 @@ <bookmark xml-lang="en-US" branch="index" id="bm_id3152427"><bookmark_value>customizing; events</bookmark_value> <bookmark_value>events; customizing</bookmark_value> </bookmark> -<!-- removed HID HID_CONFIG_EVENT --><paragraph role="heading" id="hd_id3152427" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140500.xhp" name="Events">Events</link></paragraph> -<paragraph role="paragraph" id="par_id3152937" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_CONFIG_EVENT">Assigns macros to program events. The assigned macro runs automatically every time the selected event occurs.</ahelp></paragraph> +<!-- removed HID HID_CONFIG_EVENT --> +<bookmark xml-lang="en-US" branch="hid/.uno:TableEvents" id="bm_id1163922275" localize="false"/> +<paragraph role="heading" id="hd_id3152427" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140500.xhp" name="Events">Events</link></paragraph> +<paragraph role="paragraph" id="par_id3152937" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="assignaction"><ahelp hid=".">Assigns macros to program events. The assigned macro runs automatically every time the selected event occurs.</ahelp></variable></paragraph> </section> <section id="howtoget"> <embed href="text/shared/00/00000406.xhp#events"/> </section> + +<switch select="appl"> +<case select="CALC"> +<paragraph role="note" id="par_id317748820" xml-lang="en-US" l10n="NEW">The dialog box has reduced functionality when called from the Edit-Sheet menu of a spreadsheet.</paragraph> +</case> +</switch> + + <bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN" id="bm_id1163975" localize="false"/><paragraph role="heading" id="par_idN1060A" xml-lang="en-US" level="2" l10n="NEW">Save In</paragraph> <paragraph role="paragraph" id="par_idN1060E" xml-lang="en-US" l10n="NEW"><ahelp hid="705547787">Select first where to save the event binding, in the current document or in %PRODUCTNAME.</ahelp></paragraph> <paragraph role="note" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="36">A macro that is saved with a document can only be run when that document is opened.</paragraph> diff --git a/helpcontent2/source/text/shared/01/extensionupdate.xhp b/helpcontent2/source/text/shared/01/extensionupdate.xhp index a50bf7c48e..9876e465b0 100644 --- a/helpcontent2/source/text/shared/01/extensionupdate.xhp +++ b/helpcontent2/source/text/shared/01/extensionupdate.xhp @@ -45,6 +45,10 @@ <section id="howtoget"> <embed href="text/shared/00/00000406.xhp#packagemanager_eu"/> </section> + + +<comment>insert hidden text for Exclude from this update/from all updates/include again, see i115834</comment> + <paragraph xml-lang="en-US" id="par_id6401257" role="paragraph" l10n="NEW">When you click the Check for Updates button or choose the Update command, the Extension Update dialog is displayed and the check for availability of updates starts immediately.</paragraph> <bookmark xml-lang="en-US" branch="hid/desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS" id="bm_id7764824" localize="false"/> <paragraph xml-lang="en-US" id="par_id5841242" role="paragraph" l10n="NEW"><ahelp hid=".">While checking for updates, you see a progress indicator. Wait for some messages to show up in the dialog, or click Cancel to abort the update check.</ahelp></paragraph> diff --git a/helpcontent2/source/text/shared/01/grid.xhp b/helpcontent2/source/text/shared/01/grid.xhp index b584aea2b5..4fa1a318f1 100755 --- a/helpcontent2/source/text/shared/01/grid.xhp +++ b/helpcontent2/source/text/shared/01/grid.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ <paragraph role="heading" id="par_idN1057E" xml-lang="en-US" level="2" l10n="NEW">Display Grid</paragraph> <paragraph role="paragraph" id="par_idN10582" xml-lang="en-US" l10n="NEW">Displays or hides grid lines that you can use to align objects such as graphics on a page.</paragraph> <paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Snap to Grid</paragraph> -<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW">Automatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key</defaultinline></switchinline> when you drag an object.<comment>UFI: copied from shared\optionen\01050100.xhp</comment></paragraph><comment>UFI removed GridFront help id</comment><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Grid to Front</paragraph> +<comment>issue 112000 for new key</comment><paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW">Automatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Option key</caseinline><defaultinline>Alt key</defaultinline></switchinline> when you drag an object.<comment>UFI: copied from shared\optionen\01050100.xhp</comment></paragraph><comment>UFI removed GridFront help id</comment><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Grid to Front</paragraph> <paragraph role="paragraph" id="par_idN105CD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the grid lines in front of the objects on the slide or page.</ahelp></paragraph> <section id="relatedtopics"> <paragraph role="paragraph" id="par_id4372692" xml-lang="en-US" l10n="NEW">Set the grid color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph> diff --git a/helpcontent2/source/text/shared/01/guides.xhp b/helpcontent2/source/text/shared/01/guides.xhp index cf22da3fab..f26ee296c2 100755 --- a/helpcontent2/source/text/shared/01/guides.xhp +++ b/helpcontent2/source/text/shared/01/guides.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ <paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2" l10n="NEW">Display Guides</paragraph> <paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW">Displays or hides guides that you can use to align objects on a page.</paragraph> <paragraph role="heading" id="par_idN10582" xml-lang="en-US" level="2" l10n="NEW">Snap to Guides</paragraph> -<paragraph role="paragraph" id="par_idN10586" xml-lang="en-US" l10n="CHG">Automatically aligns objects to vertical and horizontal guides. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key </defaultinline></switchinline>when you drag an object.<comment>UFI: test it! copied from shared\01\grid.xhp</comment></paragraph><comment>UFI: removed double help id</comment><paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Guides to Front</paragraph> +<comment>changed in BetterDefaults_Gridhandling issue 112000</comment><paragraph role="paragraph" id="par_idN10586" xml-lang="en-US" l10n="CHG">Automatically aligns objects to vertical and horizontal guides. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Option key</caseinline><defaultinline>Alt key </defaultinline></switchinline>when you drag an object.<comment>UFI: test it! copied from shared\01\grid.xhp</comment></paragraph><comment>UFI: removed double help id</comment><paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Guides to Front</paragraph> <paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the guides in front of the objects on the slide or page.</ahelp></paragraph> </body> </helpdocument> diff --git a/helpcontent2/source/text/shared/01/packagemanager.xhp b/helpcontent2/source/text/shared/01/packagemanager.xhp index 73482929ca..4de07e8fbc 100644 --- a/helpcontent2/source/text/shared/01/packagemanager.xhp +++ b/helpcontent2/source/text/shared/01/packagemanager.xhp @@ -1,11 +1,11 @@ <?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="textshared01packagemanagerxml" indexer="include"> <title id="tit" xml-lang="en-US">Extension Manager</title> @@ -122,6 +122,10 @@ <bookmark xml-lang="en-US" branch="hid/desktop:MultiLineEdit:RID_DLG_LICENSE:ML_LICENSE" id="bm_id2089297" localize="false"/> <bookmark xml-lang="en-US" branch="hid/desktop:PushButton:RID_DLG_LICENSE:PB_LICENSE_DOWN" id="bm_id3366801" localize="false"/> <paragraph role="paragraph" id="par_id4856410" xml-lang="en-US" l10n="NEW">An extension can show a license dialog. <ahelp hid=".">Read the license. Click the Scroll Down button to scroll down if necessary. Click Accept to continue the installation of the extension.</ahelp></paragraph> + +<comment>insert hidden text for Show License</comment> + + <!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_REMOVE --> <bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_REMOVE" id="bm_id0523200810562584" localize="false"/> <paragraph role="heading" id="par_idN10643" xml-lang="en-US" level="2" l10n="NEW">Remove</paragraph> diff --git a/helpcontent2/source/text/shared/02/01171300.xhp b/helpcontent2/source/text/shared/02/01171300.xhp index c826b8ef13..bc7bdf2474 100644 --- a/helpcontent2/source/text/shared/02/01171300.xhp +++ b/helpcontent2/source/text/shared/02/01171300.xhp @@ -4,7 +4,7 @@ <!--*********************************************************************** * * 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 @@ -27,17 +27,13 @@ * for a copy of the LGPLv3 License. * ************************************************************************--> - + <helpdocument version="1.0"> <meta> <topic id="textshared0201171300xml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Snap to Grid</title> <filename>/text/shared/02/01171300.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2005-02-10T15:58:14">converted from old format - fpe</lastedited> -</history> </meta> <body> <paragraph role="heading" id="hd_id3151262" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/01171300.xhp" name="Snap to Grid">Snap to Grid</link></paragraph> @@ -55,7 +51,6 @@ </tablecell> </tablerow> </table> - </section> </body> </helpdocument> diff --git a/helpcontent2/source/text/shared/02/02170000.xhp b/helpcontent2/source/text/shared/02/02170000.xhp index 8daf23a791..50d05ba2b0 100644 --- a/helpcontent2/source/text/shared/02/02170000.xhp +++ b/helpcontent2/source/text/shared/02/02170000.xhp @@ -4,7 +4,7 @@ <!--*********************************************************************** * * 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 @@ -27,32 +27,23 @@ * for a copy of the LGPLv3 License. * ************************************************************************--> - + <helpdocument version="1.0"> <meta> <topic id="textshared0202170000xml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Background color/Paragraph background </title> <filename>/text/shared/02/02170000.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2004-06-09T11:43:38">UFI: fix to #112392# -dedr: reviewed</lastedited> -</history> </meta> <body> <section id="absatzhintergrund"> -<bookmark xml-lang="en-US" branch="hid/.uno:BackgroundColor" id="bm_id1844627" localize="false"/><!-- HID added by script --> <bookmark xml-lang="en-US" branch="hid/.uno:BackgroundColor" id="bm_id3148983" localize="false"/> -<paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="1" l10n="U" oldref="1"><switchinline select="appl"><caseinline select="CALC"><link href="text/shared/02/02170000.xhp" name="Background color">Background color</link> -</caseinline><defaultinline><link href="text/shared/02/02170000.xhp" name="Paragraph background">Paragraph background</link></defaultinline></switchinline></paragraph> -<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="hintergrundfarbetext"><ahelp hid=".uno:BackgroundColor">Click to open a <link href="text/shared/00/00000001.xhp#abreissleiste" name="toolbar">toolbar</link> where you can click a background color for a paragraph. The color is applied to the background of the current paragraph or the selected paragraphs.</ahelp> +<paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/02/02170000.xhp" name="Background Color">Background Color</link></paragraph> +<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="hintergrundfarbetext"><ahelp hid=".">Click to open a toolbar where you can click a background color for a paragraph. The color is applied to the background of the current paragraph or the selected paragraphs.</ahelp> </variable></paragraph> </section> <embed href="text/shared/guide/background.xhp#background"/> <section id="syabsatzhintergrund"> -<switch select="appl"> -<case select="CALC"> <table id="tbl_id3149177"> <tablerow> <tablecell colspan="" rowspan=""> @@ -65,39 +56,6 @@ dedr: reviewed</lastedited> </tablecell> </tablerow> </table> - -</case> -<case select="WRITER"> -<table id="tbl_id3156002"> -<tablerow> -<tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="E"> -<image id="img_id3150943" src="res/commandimagelist/sc_backgroundcolor.png" ><alt id="alt_id3150943" xml-lang="en-US">Icon</alt> - </image></paragraph> -</tablecell> -<tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3153881" xml-lang="en-US" l10n="U" oldref="7">Paragraph Background, or Background Color when in a table in text, frames and inserted graphics</paragraph> -</tablecell> -</tablerow> -</table> - -</case> -<default> -<table id="tbl_id3149795"> -<tablerow> -<tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="E"> -<image id="img_id3153716" src="res/commandimagelist/sc_backgroundcolor.png" ><alt id="alt_id3153716" xml-lang="en-US">Icon</alt> - </image></paragraph> -</tablecell> -<tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3153062" xml-lang="en-US" l10n="U" oldref="6">Paragraph Background</paragraph> -</tablecell> -</tablerow> -</table> - -</default> -</switch> </section> </body> </helpdocument> diff --git a/helpcontent2/source/text/shared/02/03140000.xhp b/helpcontent2/source/text/shared/02/03140000.xhp index 0fc83599e3..b90f76ebe0 100644 --- a/helpcontent2/source/text/shared/02/03140000.xhp +++ b/helpcontent2/source/text/shared/02/03140000.xhp @@ -4,7 +4,7 @@ <!--*********************************************************************** * * 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 @@ -27,21 +27,17 @@ * for a copy of the LGPLv3 License. * ************************************************************************--> - + <helpdocument version="1.0"> <meta> <topic id="textshared0203140000xml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Line Style</title> <filename>/text/shared/02/03140000.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2005-01-10T15:32:41">converted from old format - fpe</lastedited> -</history> </meta> <body> <section id="linienstil"> -<bookmark xml-lang="en-US" branch="hid/.uno:LineStyle" id="bm_id4898355" localize="false"/><!-- HID added by script --> + <bookmark xml-lang="en-US" branch="hid/.uno:LineStyle" id="bm_id3154545" localize="false"/> <paragraph role="heading" id="hd_id3146936" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/03140000.xhp" name="Line Style">Line Style</link></paragraph> <paragraph role="paragraph" id="par_id3155577" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:LineStyle">Click this icon to open the <emph>Line Style</emph> toolbar, where you can modify the border line style.</ahelp></paragraph> diff --git a/helpcontent2/source/text/shared/02/03150000.xhp b/helpcontent2/source/text/shared/02/03150000.xhp index 88415e63ee..01b4524c38 100644 --- a/helpcontent2/source/text/shared/02/03150000.xhp +++ b/helpcontent2/source/text/shared/02/03150000.xhp @@ -4,7 +4,7 @@ <!--*********************************************************************** * * 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 @@ -27,21 +27,16 @@ * for a copy of the LGPLv3 License. * ************************************************************************--> - + <helpdocument version="1.0"> <meta> <topic id="textshared0203150000xml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Border Color</title> <filename>/text/shared/02/03150000.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2005-01-10T15:35:10">converted from old format - fpe</lastedited> -</history> </meta> <body> <section id="linienfarbe"> -<bookmark xml-lang="en-US" branch="hid/.uno:FrameLineColor" id="bm_id8323001" localize="false"/><!-- HID added by script --> <bookmark xml-lang="en-US" branch="hid/.uno:FrameLineColor" id="bm_id3109850" localize="false"/> <paragraph role="heading" id="hd_id3154873" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/03150000.xhp" name="Border Color">Border Color</link></paragraph> <paragraph role="paragraph" id="par_id3163829" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:FrameLineColor">Click the <emph>Line Color (of the border)</emph> icon to open the <emph>Border Color</emph> toolbar, which enables you to change the border color of an object.</ahelp></paragraph> diff --git a/helpcontent2/source/text/shared/02/12100100.xhp b/helpcontent2/source/text/shared/02/12100100.xhp index fcbf09c56e..ac6f18b309 100644 --- a/helpcontent2/source/text/shared/02/12100100.xhp +++ b/helpcontent2/source/text/shared/02/12100100.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,6 @@ <bookmark_value>databases; sorting</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ORDERCRIT" id="bm_id3154788" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/.uno:OrderCrit" id="bm_id4798297" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:OrderCrit" id="bm_id3154682" localize="false"/><section id="sortorder"> <paragraph role="heading" id="hd_id3147000" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="sortierung"><link href="text/shared/02/12100100.xhp" name="Sort Order">Sort Order</link> </variable></paragraph> diff --git a/helpcontent2/source/text/shared/guide/collab.xhp b/helpcontent2/source/text/shared/guide/collab.xhp index 3d0042b2b7..b7e4274410 100644 --- a/helpcontent2/source/text/shared/guide/collab.xhp +++ b/helpcontent2/source/text/shared/guide/collab.xhp @@ -1,9 +1,5 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<!-- - *********************************************************************** +<?xml version="1.0" encoding="UTF-8"?><helpdocument version="1.0"> +<!--*********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -28,133 +24,109 @@ * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. * - ************************************************************************ - --> - - - <helpdocument version="1.0"> + ************************************************************************ --> + <meta> <topic id="textsharedguidecollabxml" indexer="include" status="PUBLISH"> <title xml-lang="en-US" id="tit">Collaboration</title> -<filename>/text/shared/guide/collab.xhp</filename> +<filename>text/shared/guide/collab.xhp</filename> </topic> </meta> <body> -<bookmark xml-lang="en-US" branch="index" id="bm_id4459669"><bookmark_value>sharing documents</bookmark_value> +<bookmark xml-lang="en-US" branch="index" id="bm_id4459669"> +<bookmark_value>sharing documents</bookmark_value> <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> -</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_value>file locking with collaboration</bookmark_value> +<bookmark_value>locked documents</bookmark_value> +</bookmark><comment>MW changed the index entries to one level entries.</comment><comment>MW added two index entries with "lock"</comment> +<paragraph id="hd_id130008" role="heading" xml-lang="en-US" level="1"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link></variable></paragraph> +<paragraph id="par_id5821710" role="paragraph" xml-lang="en-US">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> +<paragraph id="par_id9590136" role="paragraph" xml-lang="en-US"><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> <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SHAREDOCUMENT:CB_SHARE" id="bm_id7900021" localize="false"/> - <paragraph xml-lang="en-US" id="par_id2519913" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable to share the current document with other users. Disable to use the document unshared. This will invalidate the not yet saved edits that other users applied in the time since you last opened or saved this document.</ahelp></paragraph> - <paragraph xml-lang="en-US" id="hd_id6917020" role="heading" level="2" l10n="NEW">Collaboration in Calc</paragraph> - <paragraph xml-lang="en-US" id="par_id4411145" role="paragraph" l10n="NEW">In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</emph> tab page.</paragraph> - <paragraph xml-lang="en-US" id="par_id6799218" role="warning" l10n="NEW">Some commands are not available (grayed out) when change tracking or document sharing is activated. For a new spreadsheet you cannot apply or insert the grayed out elements. <comment>Spec Doc owner told me that this is work in progress and may change any time</comment></paragraph> - <paragraph xml-lang="en-US" id="hd_id3274941" role="heading" level="3" l10n="NEW">Creating a new spreadsheet</paragraph> - <paragraph xml-lang="en-US" id="par_id9804681" role="paragraph" l10n="NEW">User A creates a new spreadsheet document. The following conditions can apply:</paragraph> - <list type="unordered"> - <listitem> - <paragraph xml-lang="en-US" id="par_id2109744" role="paragraph" l10n="NEW">The user does not want to share the spreadsheet for collaboration.</paragraph> - <paragraph xml-lang="en-US" id="par_id5374614" role="paragraph" l10n="NEW">User A opens, edits, and saves the document as described above for Writer, Impress, and Draw document.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id768761" role="paragraph" l10n="NEW">The user wants to share the document for collaboration.</paragraph> - <paragraph xml-lang="en-US" id="par_id6844691" role="paragraph" l10n="NEW">The user chooses <item type="menuitem">Tools - Share Document</item> to activate the collaboration features for this document. A dialog opens where the user can choose to enable or disable sharing. If the user enables sharing, the document will be saved in shared mode, which is also shown on the title bar.</paragraph> - </listitem> - </list> - <paragraph xml-lang="en-US" id="par_id5288857" role="paragraph" l10n="NEW">The <item type="menuitem">Tools - Share Document</item> command can be used to switch the mode for the current document from unshared mode to shared mode. If you want to use a shared document in unshared mode, you would save the shared document using another name or path. This creates a copy of the spreadsheet that is not shared.</paragraph> - <paragraph xml-lang="en-US" id="hd_id8842127" role="heading" level="3" l10n="NEW">Opening a spreadsheet</paragraph> - <paragraph xml-lang="en-US" id="par_id7276528" role="paragraph" l10n="NEW">User A opens a spreadsheet document. The following conditions can apply:</paragraph> - <list type="unordered"> - <listitem> - <paragraph xml-lang="en-US" id="par_id8363902" role="paragraph" l10n="NEW">The spreadsheet document is not in shared mode.</paragraph> - <paragraph xml-lang="en-US" id="par_id5974303" role="paragraph" l10n="NEW">The user can open, edit, and save the document as described above for Writer, Impress, and Draw documents.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id5323343" role="paragraph" l10n="NEW">The spreadsheet document is in shared mode.</paragraph> - <paragraph xml-lang="en-US" id="par_id5824457" role="paragraph" l10n="NEW">The user sees a message that the document is in shared mode and that some features are not available in this mode. The user can disable this message for the future. After clicking OK, the document is opened in shared mode.</paragraph> - </listitem> - </list> - <comment>Resolve Conflicts dialog</comment> - +<paragraph id="par_id2519913" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Enable to share the current document with other users. Disable to use the document unshared. This will invalidate the not yet saved edits that other users applied in the time since you last opened or saved this document.</ahelp></paragraph> +<paragraph id="hd_id6917020" role="heading" xml-lang="en-US" level="2">Collaboration in Calc</paragraph> +<paragraph id="par_id4411145" role="paragraph" xml-lang="en-US">In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph> +</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - User Data</emph> tab page.</paragraph> +<paragraph id="par_id6799218" role="warning" xml-lang="en-US">Some commands are not available (grayed out) when change tracking or document sharing is activated. For a new spreadsheet you cannot apply or insert the grayed out elements. <comment>Spec Doc owner told me that this is work in progress and may change any time</comment></paragraph> +<paragraph id="hd_id3274941" role="heading" xml-lang="en-US" level="3">Creating a new spreadsheet</paragraph> +<paragraph id="par_id9804681" role="paragraph" xml-lang="en-US">User A creates a new spreadsheet document. The following conditions can apply:</paragraph> +<list type="unordered"> +<listitem> +<paragraph id="par_id2109744" role="paragraph" xml-lang="en-US">The user does not want to share the spreadsheet for collaboration.</paragraph> +<paragraph id="par_id5374614" role="paragraph" xml-lang="en-US">User A opens, edits, and saves the document as described above for Writer, Impress, and Draw document.</paragraph> +</listitem> +<listitem> +<paragraph id="par_id768761" role="paragraph" xml-lang="en-US">The user wants to share the document for collaboration.</paragraph> +<paragraph id="par_id6844691" role="paragraph" xml-lang="en-US">The user chooses <item type="menuitem">Tools - Share Document</item> to activate the collaboration features for this document. A dialog opens where the user can choose to enable or disable sharing. If the user enables sharing, the document will be saved in shared mode, which is also shown on the title bar.</paragraph> +</listitem></list> +<paragraph id="par_id5288857" role="paragraph" xml-lang="en-US">The <item type="menuitem">Tools - Share Document</item> command can be used to switch the mode for the current document from unshared mode to shared mode. If you want to use a shared document in unshared mode, you would save the shared document using another name or path. This creates a copy of the spreadsheet that is not shared.</paragraph> +<paragraph id="hd_id8842127" role="heading" xml-lang="en-US" level="3">Opening a spreadsheet</paragraph> +<paragraph id="par_id7276528" role="paragraph" xml-lang="en-US">User A opens a spreadsheet document. The following conditions can apply:</paragraph> +<list type="unordered"> +<listitem> +<paragraph id="par_id8363902" role="paragraph" xml-lang="en-US">The spreadsheet document is not in shared mode.</paragraph> +<paragraph id="par_id5974303" role="paragraph" xml-lang="en-US">The user can open, edit, and save the document as described above for Writer, Impress, and Draw documents.</paragraph> +</listitem> +<listitem> +<paragraph id="par_id5323343" role="paragraph" xml-lang="en-US">The spreadsheet document is in shared mode.</paragraph> +<paragraph id="par_id5824457" role="paragraph" xml-lang="en-US">The user sees a message that the document is in shared mode and that some features are not available in this mode. The user can disable this message for the future. After clicking OK, the document is opened in shared mode.</paragraph> +</listitem></list><comment>Resolve Conflicts dialog</comment> <bookmark xml-lang="en-US" branch="hid/SC_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> - +<paragraph id="par_id5800653" role="paragraph" xml-lang="en-US"><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> - +<paragraph id="par_id6263924" role="paragraph" xml-lang="en-US"><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> - +<paragraph id="par_id3609118" role="paragraph" xml-lang="en-US"><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> - +<paragraph id="par_id7184057" role="paragraph" xml-lang="en-US"><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> - <paragraph xml-lang="en-US" id="par_id1174657" role="paragraph" l10n="NEW">User A saves a shared document. The following conditions can apply:</paragraph> - <list type="unordered"> - <listitem> - <paragraph xml-lang="en-US" id="par_id2577593" role="paragraph" l10n="NEW">The document was not modified and saved by another user since user A opened the document.</paragraph> - <paragraph xml-lang="en-US" id="par_id5883968" role="paragraph" l10n="NEW">The document is saved.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id9049653" role="paragraph" l10n="NEW">The document was modified and saved by another user since user A opened the document.</paragraph> - <paragraph xml-lang="en-US" id="par_id1976683" role="paragraph" l10n="NEW">If the changes do not conflict, the document is saved.</paragraph> - <paragraph xml-lang="en-US" id="par_id43946" role="paragraph" l10n="NEW">If the changes conflict, the Resolve Conflicts dialog will be shown. User A must decide for the conflicts which version to keep, "Keep Mine" or "Keep Other". When all conflicts are resolved, the document is saved. While user A resolves the conflicts, no other user is able to save the shared document.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id6449171" role="paragraph" l10n="NEW">Another user tries to save the shared document and resolves conflicts in this moment.</paragraph> - <paragraph xml-lang="en-US" id="par_id7101046" role="paragraph" l10n="NEW">User A sees a message that a merge-in is in progress. User A can choose to cancel the save command for now, or retry saving some time later.</paragraph> - </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> - <list type="unordered"> - <listitem> - <paragraph xml-lang="en-US" id="par_id9976195" role="paragraph" l10n="NEW">The document is not locked by any other user.</paragraph> - <paragraph xml-lang="en-US" id="par_id2507400" role="paragraph" l10n="NEW">This document will be opened for read and write access by user A. The document will be locked for other users until user A closes the document.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id216681" role="paragraph" l10n="NEW">The document is marked as "read-only" by the file system.</paragraph> - <paragraph xml-lang="en-US" id="par_id7709585" role="paragraph" l10n="NEW">This document will be opened in read-only mode. Editing is not allowed. User A can save the document using another document name or another path. User A can edit this copy.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id4309518" role="paragraph" l10n="NEW">The document is locked by another user.</paragraph> - <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> +<paragraph id="par_id786767" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Keeps the changes of all other users, voids your changes.</ahelp></paragraph> +<paragraph id="hd_id2934965" role="heading" xml-lang="en-US" level="3">Saving a shared spreadsheet document</paragraph> +<paragraph id="par_id1174657" role="paragraph" xml-lang="en-US">User A saves a shared document. The following conditions can apply:</paragraph> +<list type="unordered"> +<listitem> +<paragraph id="par_id2577593" role="paragraph" xml-lang="en-US">The document was not modified and saved by another user since user A opened the document.</paragraph> +<paragraph id="par_id5883968" role="paragraph" xml-lang="en-US">The document is saved.</paragraph> +</listitem> +<listitem> +<paragraph id="par_id9049653" role="paragraph" xml-lang="en-US">The document was modified and saved by another user since user A opened the document.</paragraph> +<paragraph id="par_id1976683" role="paragraph" xml-lang="en-US">If the changes do not conflict, the document is saved.</paragraph> +<paragraph id="par_id43946" role="paragraph" xml-lang="en-US">If the changes conflict, the Resolve Conflicts dialog will be shown. User A must decide for the conflicts which version to keep, "Keep Mine" or "Keep Other". When all conflicts are resolved, the document is saved. While user A resolves the conflicts, no other user is able to save the shared document.</paragraph> +</listitem> +<listitem> +<paragraph id="par_id6449171" role="paragraph" xml-lang="en-US">Another user tries to save the shared document and resolves conflicts in this moment.</paragraph> +<paragraph id="par_id7101046" role="paragraph" xml-lang="en-US">User A sees a message that a merge-in is in progress. User A can choose to cancel the save command for now, or retry saving some time later.</paragraph> +</listitem></list> +<paragraph id="par_id7186498" role="paragraph" xml-lang="en-US">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 id="hd_id2871791" role="heading" xml-lang="en-US" level="2">Collaboration in Writer, Impress, and Draw</paragraph> +<paragraph id="par_id2675862" role="paragraph" xml-lang="en-US">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 id="par_id7333597" role="paragraph" xml-lang="en-US">User A opens a document. The following conditions can apply:</paragraph> +<list type="unordered"> +<listitem> +<paragraph id="par_id9976195" role="paragraph" xml-lang="en-US">The document is not locked by any other user.</paragraph> +<paragraph id="par_id2507400" role="paragraph" xml-lang="en-US">This document will be opened for read and write access by user A. The document will be locked for other users until user A closes the document.</paragraph> +</listitem> +<listitem> +<paragraph id="par_id216681" role="paragraph" xml-lang="en-US">The document is marked as "read-only" by the file system.</paragraph> +<paragraph id="par_id7709585" role="paragraph" xml-lang="en-US">This document will be opened in read-only mode. Editing is not allowed. User A can save the document using another document name or another path. User A can edit this copy.</paragraph> +</listitem> +<listitem> +<paragraph id="par_id4309518" role="paragraph" xml-lang="en-US">The document is locked by another user.</paragraph> +<paragraph id="par_id206610" role="paragraph" xml-lang="en-US">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 id="hd_id29349651" role="heading" xml-lang="en-US" level="2">User access permissions and sharing documents</paragraph> +<paragraph id="par_id11746571" role="paragraph" xml-lang="en-US">Some conditions must be met on operating systems with a user permission management.</paragraph> +<list type="unordered"> +<listitem> +<paragraph id="par_id25775931" role="paragraph" xml-lang="en-US">The shared file needs to reside in a location which is accessible by all collaborators.</paragraph> +</listitem> +<listitem> +<paragraph id="par_id90496531" role="paragraph" xml-lang="en-US">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 id="par_id71864981" role="warning" xml-lang="en-US">Write access also enables other users to (accidentally or deliberately) delete or change a file.</paragraph> +<section id="relatedtopics"> +<paragraph id="par_id4263740" role="paragraph" xml-lang="en-US"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph> +</section> +</body> +</helpdocument>
\ No newline at end of file diff --git a/helpcontent2/source/text/shared/guide/floating_toolbar.xhp b/helpcontent2/source/text/shared/guide/floating_toolbar.xhp index ced9492191..1c17e308b3 100644 --- a/helpcontent2/source/text/shared/guide/floating_toolbar.xhp +++ b/helpcontent2/source/text/shared/guide/floating_toolbar.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ <paragraph role="heading" id="hd_id4224372" xml-lang="en-US" level="3" l10n="NEW">To Close a Toolbar Temporarily</paragraph> <paragraph role="paragraph" id="par_id295724" xml-lang="en-US" l10n="NEW">Click the icon in the toolbar's title bar, or choose <emph>Close Toolbar</emph> from the context menu. The toolbar will be shown automatically again when the context becomes active again.</paragraph> <paragraph role="heading" id="hd_id1905575" xml-lang="en-US" level="3" l10n="NEW">To Close a Toolbar Permanently</paragraph> -<paragraph role="paragraph" id="par_id9776909" xml-lang="en-US" l10n="NEW">Choose <emph>View - Toolbars</emph> and click the name of a toolbar to remove the check mark.</paragraph> +<paragraph role="paragraph" id="par_id9776909" xml-lang="en-US" l10n="CHG">While the toolbar is visible, choose <emph>View - Toolbars</emph> and click the name of the toolbar to remove the check mark.</paragraph> <paragraph role="heading" id="par_idN1077E" xml-lang="en-US" level="2" l10n="NEW">To Show a Closed Toolbar</paragraph> <list type="unordered"> <listitem> diff --git a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp index 8a238e241b..ea1b4272b8 100644 --- a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp +++ b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp @@ -1,11 +1,11 @@ <?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="textsharedguideinsert_graphic_drawitxml" indexer="include"> <title xml-lang="en-US" id="tit">Editing Graphic Objects </title> @@ -64,15 +64,15 @@ <paragraph xml-lang="en-US" id="par_id3153345" role="paragraph" l10n="CHG" oldref="9">Choose <emph>View - Toolbars - Drawing</emph> to open the <emph>Drawing</emph> toolbar, if it is not already open.</paragraph> <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="CHG" oldref="2">Drawing objects can be subsequently edited and modified. Drawing objects created in this way are vector graphics, which you can scale freely without any loss of quality.</paragraph> <paragraph xml-lang="en-US" id="par_id3148491" role="paragraph" l10n="U" oldref="3">To create a rectangle, click the rectangle icon and move your cursor to the place in the document where you want one corner of the rectangle to be. Press the mouse button and hold it down while dragging to the opposite corner of the rectangle. When you release the mouse button, the rectangle is inserted in the document. It is selected, and you can edit its properties through the context menu.</paragraph> - <list type="ordered"> + <list type="unordered"> <listitem> - <paragraph xml-lang="en-US" id="par_id3149164" role="listitem" l10n="CHG" oldref="13"><switchinline select="appl"><caseinline select="DRAW">To draw multiple objects of the same type, double-click the icon. -</caseinline><caseinline select="IMPRESS">To draw multiple objects of the same type, double-click the icon. + <paragraph xml-lang="en-US" id="par_id3149164" role="listitem" l10n="CHG" oldref="13"><switchinline select="appl"><caseinline select="DRAW">To draw multiple objects of the same type, double-click the icon. +</caseinline><caseinline select="IMPRESS">To draw multiple objects of the same type, double-click the icon. </caseinline><defaultinline>Draw multiple objects of the same type. Click the document without moving the mouse to stop drawing objects.</defaultinline></switchinline></paragraph> </listitem> <listitem> - <paragraph xml-lang="en-US" id="par_id3148473" role="listitem" l10n="U" oldref="4">If you want to open up draw objects from the center instead of dragging from one corner to the other, hold down the <switchinline select="sys"><caseinline select="MAC">Option -</caseinline><defaultinline>Alt</defaultinline></switchinline> key while dragging. <switchinline select="sys"><caseinline select="UNIX">With some window managers, you may need to hold down also the meta key. + <paragraph xml-lang="en-US" id="par_id3148473" role="listitem" l10n="U" oldref="4">If you want to open up draw objects from the center instead of dragging from one corner to the other, hold down the <switchinline select="sys"><caseinline select="MAC">Option +</caseinline><defaultinline>Alt</defaultinline></switchinline> key while dragging. <switchinline select="sys"><caseinline select="UNIX">With some window managers, you may need to hold down also the meta key. </caseinline></switchinline></paragraph> </listitem> <listitem> @@ -82,19 +82,22 @@ <paragraph xml-lang="en-US" id="par_id3153626" role="listitem" l10n="U" oldref="5">To scale the objects, first select them by clicking on them with the selection tool. You then see eight handles around the object. When you drag one of the four corner handles, the opposite corner remains fixed while the other three corners move. When you drag one of the side handles, the opposite side remains fixed.</paragraph> </listitem> <listitem> - <paragraph xml-lang="en-US" id="par_id224616" role="listitem" l10n="NEW">To scale a draw object using the keyboard, first select the object, then press <switchinline select="sys"><caseinline select="MAC">Command -</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab repeatedly to highlight one of the handles. Then press an arrow key. To scale in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option + <paragraph xml-lang="en-US" id="par_id224616" role="listitem" l10n="NEW">To scale a draw object using the keyboard, first select the object, then press <switchinline select="sys"><caseinline select="MAC">Command +</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab repeatedly to highlight one of the handles. Then press an arrow key. To scale in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option </caseinline><defaultinline>Alt</defaultinline></switchinline> key while pressing an arrow key. Press Esc to leave the point edit mode.</paragraph> </listitem> <listitem> <paragraph xml-lang="en-US" id="par_id3149669" role="listitem" l10n="CHG" oldref="6">To move draw objects, first select them. To select more than one object, press the Shift key while clicking. Select text objects by clicking exactly on their edge. While holding down the mouse button, drag the objects to the new location.</paragraph> </listitem> <listitem> - <paragraph xml-lang="en-US" id="par_id7199316" role="listitem" l10n="NEW">To move a draw object using the keyboard, first select the object, then press an arrow key. To move in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option + <paragraph xml-lang="en-US" id="par_id7199316" role="listitem" l10n="NEW">To move a draw object using the keyboard, first select the object, then press an arrow key. To move in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option </caseinline><defaultinline>Alt</defaultinline></switchinline> key while pressing an arrow key.</paragraph> </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_id7133399316" role="listitem" l10n="NEW">To enter text to be a part of a graphics object, select the object and start typing your text. Click outside the object to end entering text. Double-click text inside an object to edit the text.</paragraph> + </listitem> </list> - <paragraph xml-lang="en-US" id="par_id3156422" role="note" l10n="CHG" oldref="8">To revert to normal text mode after creating and editing draw objects, click in an area of the document containing no draw or other objects. If you see a drawing cursor, first exit this mode by clicking the <emph>Select</emph> icon.</paragraph> + <paragraph xml-lang="en-US" id="par_id3156422" role="note" l10n="CHG" oldref="8">To revert to normal mode after creating and editing draw objects, click in an area of the document containing no objects. If you see a drawing cursor, first exit this mode by clicking the <emph>Select</emph> icon.</paragraph> <section id="relatedtopics"> <paragraph xml-lang="en-US" id="par_id3145785" role="paragraph" l10n="U" oldref="10"><link href="text/shared/02/01140000.xhp" name="Information about the individual icons">Information about the individual icons</link></paragraph> <switch select="appl"> diff --git a/helpcontent2/source/text/shared/guide/pasting.xhp b/helpcontent2/source/text/shared/guide/pasting.xhp index 10f7c8df53..11137148fc 100755 --- a/helpcontent2/source/text/shared/guide/pasting.xhp +++ b/helpcontent2/source/text/shared/guide/pasting.xhp @@ -5,7 +5,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ * ************************************************************************ --> - + <helpdocument version="1.0"> <meta> <topic id="textsharedguidepastingxml" indexer="include" status="PUBLISH"> @@ -52,6 +52,9 @@ </variable></paragraph> <paragraph role="paragraph" id="par_idN10743" xml-lang="en-US" l10n="NEW">Contents that are stored on the clipboard can be pasted into your document using different formats. In %PRODUCTNAME you can choose how to paste the contents using a dialog or a drop-down icon.</paragraph> <paragraph role="paragraph" id="par_idN10746" xml-lang="en-US" l10n="NEW">The available options depend on the contents of the clipboard.</paragraph> + +<paragraph xml-lang="en-US" id="hd_id3144547360" role="paragraph" l10n="NEW">In Writer text documents, you can press <switchinline select="sys"><caseinline select="MAC">Command+Option</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Shift+V</paragraph> to paste the contents of the clipboard as unformatted text.</paragraph> + <paragraph role="heading" id="par_idN10749" xml-lang="en-US" level="2" l10n="NEW">Pasting clipboard contents using an icon menu</paragraph> <list type="ordered"> <listitem> @@ -62,6 +65,7 @@ </listitem> </list> <paragraph role="paragraph" id="par_idN1075B" xml-lang="en-US" l10n="NEW">If you do not like the result, click the <emph>Undo</emph> icon and then paste again with another option.</paragraph> + <paragraph role="heading" id="par_idN10762" xml-lang="en-US" level="2" l10n="NEW">Pasting clipboard contents using a dialog</paragraph> <list type="ordered"> <listitem> diff --git a/helpcontent2/source/text/shared/main0108.xhp b/helpcontent2/source/text/shared/main0108.xhp index 000b4ff973..1fddafc712 100644 --- a/helpcontent2/source/text/shared/main0108.xhp +++ b/helpcontent2/source/text/shared/main0108.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,12 +40,10 @@ </meta> <body> <section id="hilfe"> -<bookmark xml-lang="en-US" branch="hid/.uno:HelpMenu" id="bm_id1006749" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:HelpMenu" id="bm_id3153539" localize="false"/><paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/main0108.xhp" name="Help">Help</link></paragraph> <paragraph role="paragraph" id="par_id3153990" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:HelpMenu">The Help menu allows you to start and control the $[officename] Help system.</ahelp></paragraph> </section> <section id="helpcommand"> -<bookmark xml-lang="en-US" branch="hid/.uno:HelpIndex" id="bm_id8309965" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:HelpIndex" id="bm_id3149178" localize="false"/><paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="2" l10n="CHG" oldref="5">$[officename] Help</paragraph> <paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".uno:HelpIndex">Opens the main page of the $[officename] Help for the current application.</ahelp> You can scroll through the Help pages and you can search for index terms or any text.</paragraph> </section> @@ -63,14 +61,12 @@ </table> </section> <embed href="text/shared/main0201.xhp#whatsthis"/> -<bookmark xml-lang="en-US" branch="hid/.uno:HelpSupport" id="bm_id5582987" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:HelpSupport" id="bm_id3159176" localize="false"/><paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="15">Support</paragraph> <paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".uno:HelpSupport">Shows information on how to get support.</ahelp></paragraph> <embed href="text/shared/01/08060100.xhp#registrierung"/> <bookmark xml-lang="en-US" branch="hid/.uno:OnlineUpdate" id="bm_id2785119" localize="false"/><paragraph role="heading" id="hd_id2926419" xml-lang="en-US" level="2" l10n="CHG"><link href="text/shared/01/online_update.xhp">Check for Updates</link></paragraph> <paragraph role="paragraph" id="par_id2783898" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enable an Internet connection for %PRODUCTNAME. If you need a Proxy, check the %PRODUCTNAME Proxy settings in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet. Then choose Check for Updates to check for the availability of a newer version of your office suite.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/service:com.sun.star.tab.tabreg?purchase" id="bm_id584124" localize="false"/><paragraph role="paragraph" id="par_idN106A6" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">This menu command is visible for the evaluation version of %PRODUCTNAME. Choose to open the Purchase %PRODUCTNAME Wizard.</ahelp><comment>UFI: see spec doc "Unlocking_Evalversion_as_Fullversion.sxw" by BH</comment><comment>removed switch, changed to invisible help text</comment></paragraph> -<bookmark xml-lang="en-US" branch="hid/.uno:About" id="bm_id3757052" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:About" id="bm_id3151385" localize="false"/><paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="2" l10n="U" oldref="7">About $[officename]</paragraph> <paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid=".uno:About">Displays general program information such as version number and copyrights.</ahelp></paragraph> <embed href="text/shared/00/00000004.xhp#related"/> diff --git a/helpcontent2/source/text/shared/main0204.xhp b/helpcontent2/source/text/shared/main0204.xhp new file mode 100755 index 0000000000..e34665eb53 --- /dev/null +++ b/helpcontent2/source/text/shared/main0204.xhp @@ -0,0 +1,84 @@ +<?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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************ + --> + + +<meta> +<topic id="textsharedmain0204xml" indexer="include"> +<title id="tit" xml-lang="en-US">Table Bar</title> +<filename>/text/shared/main0204.xhp</filename> +</topic> +</meta> +<body> +<section id="tablebar"> +<bookmark xml-lang="en-US" branch="hid/.HelpId:tableobjectbar" id="bm_id3154243" localize="false"/> +<paragraph role="heading" id="hd_id3145587" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/main0204.xhp" name="Table Bar">Table Bar</link></paragraph> +<paragraph role="paragraph" id="par_id3154252" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The <emph>Table</emph> Bar contains functions you need when working with tables. It appears when you move the cursor into a table.</ahelp></paragraph> +</section> +<embed href="text/simpress/01/04080100.xhp#inserttable"/> +<embed href="text/swriter/00/00000404.xhp#sytabelle"/> +<embed href="text/shared/02/03140000.xhp#linienstil"/> +<embed href="text/shared/02/03140000.xhp#sylinienstil"/> +<embed href="text/shared/02/03150000.xhp#linienfarbe"/> +<embed href="text/shared/02/03150000.xhp#sylinienfarbe"/> +<embed href="text/shared/02/03130000.xhp#umrandung"/> +<embed href="text/shared/02/03130000.xhp#syumrandung"/> +<paragraph role="heading" id="hd_id319945759" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/05210100.xhp" name="Area Style / Filling">Area Style / Filling</link></paragraph> +<embed href="text/shared/01/05210100.xhp#sytext"/> +<paragraph role="heading" id="hd_id3147592" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/01/05100100.xhp" name="Merge Cells">Merge Cells</link></paragraph> +<embed href="text/shared/01/05100100.xhp#verbindentext"/> +<embed href="text/shared/01/05100100.xhp#syzellenverbinden"/> +<embed href="text/shared/01/05100200.xhp#zellenteilen"/> +<embed href="text/shared/01/05100200.xhp#syzellenteilen"/> +<embed href="text/shared/02/04210000.xhp#optimieren"/> +<embed href="text/shared/02/04210000.xhp#syoptimieren"/> +<embed href="text/shared/01/05100500.xhp#oben"/> +<embed href="text/shared/01/05100600.xhp#mitte"/> +<embed href="text/shared/01/05100700.xhp#unten"/> +<embed href="text/swriter/02/04090000.xhp#zeileeinfuegen"/> +<embed href="text/swriter/02/04090000.xhp#syzeileeinfuegen"/> +<embed href="text/swriter/02/04100000.xhp#spalteeinfuegen"/> +<embed href="text/swriter/02/04100000.xhp#syspalteeinfuegen"/> +<paragraph role="heading" id="hd_id3147820" xml-lang="en-US" level="2" l10n="U" oldref="9"><link href="text/swriter/01/05110500.xhp" name="Delete Row">Delete Row</link></paragraph> +<embed href="text/swriter/01/05110500.xhp#loeschentext"/> +<embed href="text/swriter/00/00000405.xhp#syzeileloeschen"/> +<paragraph role="heading" id="hd_id3147231" xml-lang="en-US" level="2" l10n="U" oldref="10"><link href="text/swriter/01/05120500.xhp" name="Delete Column">Delete Column</link></paragraph> +<embed href="text/swriter/01/05120500.xhp#loeschentext"/> +<embed href="text/swriter/00/00000405.xhp#syspalteloeschen"/> +<comment>following only optional, ext.help is available: Select Table Select Column Select Row</comment> +<paragraph role="heading" id="hd_id3134447820" xml-lang="en-US" level="2" l10n="NEW"><link href="text/simpress/01/taskpanel.xhp" name="Table Design">Table Design</link></paragraph> +<paragraph role="paragraph" id="par_id16200812240344" xml-lang="en-US" l10n="NEW">Opens the Table Design. Double-click a preview to insert a new table.<comment>Impress: Table Design tab page in task pane. +Draw: Table Design dialog</comment></paragraph> +<paragraph role="heading" id="hd_id947820" xml-lang="en-US" level="2" l10n="NEW"><link href="text/simpress/01/05090000m.xhp" name="Table Properties">Table Properties</link></paragraph> +<embed href="text/simpress/01/05090000m.xhp#tabelletext"/> + +</body> +</helpdocument> diff --git a/helpcontent2/source/text/shared/makefile.mk b/helpcontent2/source/text/shared/makefile.mk index 9996559021..72a35ef6fa 100644 --- a/helpcontent2/source/text/shared/makefile.mk +++ b/helpcontent2/source/text/shared/makefile.mk @@ -48,6 +48,7 @@ XHPFILES = \ fontwork_toolbar.xhp \ main0108.xhp \ main0201.xhp \ + main0204.xhp \ main0208.xhp \ main0209.xhp \ main0212.xhp \ diff --git a/helpcontent2/source/text/shared/optionen/01010200.xhp b/helpcontent2/source/text/shared/optionen/01010200.xhp index 20c1115709..c1de985ca9 100644 --- a/helpcontent2/source/text/shared/optionen/01010200.xhp +++ b/helpcontent2/source/text/shared/optionen/01010200.xhp @@ -46,7 +46,7 @@ <bookmark_value>absolute saving of URLs</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_SAVE" id="bm_id3109850" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3143284" role="head1" l10n="U" oldref="1"><link href="text/shared/optionen/01010200.xhp" name="General">General</link></paragraph> +<paragraph role="heading" id="hd_id3143284" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01010200.xhp" name="General">General</link></paragraph> <paragraph xml-lang="en-US" id="par_id3145669" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_SAVE">In the<emph> General</emph> section, you can select default settings for saving documents, and can select default file formats.</ahelp></paragraph> </section> <section id="howtoget"> @@ -59,7 +59,7 @@ oldref="66">Load user-specific settings with the document</paragraph> <paragraph xml-lang="en-US" id="par_id3147209" role="paragraph" l10n="U" oldref="67"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_CB_LOAD_SETTINGS">Loads the user-specific settings saved in a document with the document.</ahelp></paragraph> <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="U" oldref="68">If <emph>Load user-specific settings with the document </emph>is not selected, the following user-specific settings still apply:</paragraph> - <list type="ordered"> + <list type="unordered"> <listitem> <paragraph xml-lang="en-US" id="par_id3155388" role="listitem" l10n="U" oldref="69">Settings available in <emph>File - Print - Options</emph>,</paragraph> </listitem> @@ -77,7 +77,7 @@ </listitem> </list> <paragraph xml-lang="en-US" id="par_id3153666" role="paragraph" l10n="U" oldref="74">The following settings are <emph>always</emph> loaded with a document, whether or not this option is marked:</paragraph> - <list type="ordered"> + <list type="unordered"> <listitem> <paragraph xml-lang="en-US" id="par_id3148946" role="listitem" l10n="U" oldref="76">Data source linked to the document and its view.</paragraph> </listitem> diff --git a/helpcontent2/source/text/shared/optionen/01040200.xhp b/helpcontent2/source/text/shared/optionen/01040200.xhp index c7b09d903e..836859bcd9 100644 --- a/helpcontent2/source/text/shared/optionen/01040200.xhp +++ b/helpcontent2/source/text/shared/optionen/01040200.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,7 +104,6 @@ <paragraph role="note" id="par_id3146898" xml-lang="en-US" l10n="U" oldref="39">If the <emph>Graphics and objects </emph>option is not selected, no graphics will be loaded from the Internet. Graphics within a table and without an indication of their size can cause display problems when using an older HTML standard on the browsed page.</paragraph> <bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_TBL" id="bm_id3154164" localize="false"/><paragraph role="heading" id="hd_id3156332" xml-lang="en-US" level="3" l10n="U" oldref="40">Tables</paragraph> <paragraph role="paragraph" id="par_id3154482" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_TBL">Displays the tables contained in your document.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/.uno:TableBoundaries" id="bm_id3119506" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:TableBoundaries" id="bm_id3155443" localize="false"/><paragraph role="paragraph" id="par_id3153713" xml-lang="en-US" l10n="CHG" oldref="67"><ahelp hid=".uno:TableBoundaries">To display the table boundaries, right-click any table and choose <emph>Table Boundaries</emph>, or choose <emph>Table - Table Boundaries</emph> in a Writer document.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_DRWFAST" id="bm_id3154255" localize="false"/><paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3" l10n="U" oldref="42">Drawings and controls</paragraph> <paragraph role="paragraph" id="par_id3151249" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_DRWFAST">Displays the drawings and controls contained in your document.</ahelp></paragraph> diff --git a/helpcontent2/source/text/shared/optionen/01040400.xhp b/helpcontent2/source/text/shared/optionen/01040400.xhp index d28d0242a8..7f95106337 100644 --- a/helpcontent2/source/text/shared/optionen/01040400.xhp +++ b/helpcontent2/source/text/shared/optionen/01040400.xhp @@ -68,27 +68,27 @@ <paragraph xml-lang="en-US" id="par_id3153542" role="note" l10n="CHG" oldref="44">The print settings defined on this tab page apply to all subsequent print jobs, until you change the settings again. If you want to change the settings for the current print job only, use the <emph>File - Print</emph> dialog.</paragraph> <paragraph xml-lang="en-US" id="hd_id3156330" role="heading" level="2" l10n="U" oldref="3">Contents</paragraph> <paragraph xml-lang="en-US" id="par_id3155628" role="paragraph" l10n="U" oldref="4">Specifies which document contents are to be printed. </paragraph> -<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF" id="bm_id3145674" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF" id="bm_id3145674" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox" id="bm_id3145675" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3156156" role="heading" level="2" l10n="U" oldref="5">Graphics</paragraph> -<paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF">Specifies whether the graphics of your text document are printed.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB" id="bm_id3148564" localize="false"/> +<paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="6"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF">Specifies whether the graphics of your text document are printed.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_PTAB" id="bm_id3148564" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3150771" role="heading" level="2" l10n="U" oldref="7">Tables</paragraph> -<paragraph xml-lang="en-US" id="par_id3148943" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB">Specifies whether the tables of the text document are printed.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW" id="bm_id3154923" localize="false"/> +<paragraph xml-lang="en-US" id="par_id3148943" role="paragraph" l10n="U" oldref="8"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_PTAB">Specifies whether the tables of the text document are printed.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_PDRAW" id="bm_id3154923" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U" oldref="9">Drawings (not for HTML documents)</paragraph> -<paragraph xml-lang="en-US" id="par_id3149457" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW">Specifies whether graphics created with $[officename] drawing functions are printed.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD" id="bm_id3151210" localize="false"/> +<paragraph xml-lang="en-US" id="par_id3149457" role="paragraph" l10n="U" oldref="10"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_PDRAW">Specifies whether graphics created with $[officename] drawing functions are printed.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD" id="bm_id3151210" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintControls:CheckBox" id="bm_id3151211" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3153525" role="heading" level="2" l10n="U" oldref="11">Controls</paragraph> - <paragraph xml-lang="en-US" id="par_id3158408" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD">Specifies whether the form control fields of the text document are printed.</ahelp></paragraph> + <paragraph xml-lang="en-US" id="par_id3158408" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD">Specifies whether the form control fields of the text document are printed.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintPageBackground:CheckBox" id="bm_id3154684" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="2" l10n="U" oldref="13">Background</paragraph> <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="14"><ahelp hid=".">Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document.</ahelp><comment>UFI: fixes #i21977#</comment></paragraph> -<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT" id="bm_id3144760" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT" id="bm_id3144760" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintBlackFonts:CheckBox" id="bm_id3144761" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3150868" role="heading" level="2" l10n="U" oldref="40">Print black</paragraph> - <paragraph xml-lang="en-US" id="par_id3149562" role="paragraph" l10n="U" oldref="42"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT">Specifies whether to always print text in black.</ahelp></paragraph> + <paragraph xml-lang="en-US" id="par_id3149562" role="paragraph" l10n="U" oldref="42"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT">Specifies whether to always print text in black.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_HIDDEN_TEXT" id="bm_id342722" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintHiddenText:CheckBox" id="bm_id342723" localize="false"/> <paragraph xml-lang="en-US" id="hd_id8004394" role="heading" level="2" l10n="NEW">Hidden text</paragraph> @@ -98,18 +98,18 @@ <paragraph xml-lang="en-US" id="par_id7242042" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.</ahelp><link href="text/swriter/01/04090003.xhp">Text placeholders</link> are fields.</paragraph> <paragraph xml-lang="en-US" id="hd_id3151115" role="heading" level="2" l10n="U" oldref="15">Pages</paragraph> <paragraph xml-lang="en-US" id="par_id3145365" role="paragraph" l10n="U" oldref="16">Defines the print order for $[officename] Writer documents with multiple pages.</paragraph> -<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP" id="bm_id3148618" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP" id="bm_id3148618" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3150874" role="heading" level="2" l10n="U" oldref="17">Left pages (not for HTML documents)</paragraph> - <paragraph xml-lang="en-US" id="par_id3149665" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP">Specifies whether to print all left (even numbered) pages of the document.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP" id="bm_id3147213" localize="false"/> + <paragraph xml-lang="en-US" id="par_id3149665" role="paragraph" l10n="U" oldref="18"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP">Specifies whether to print all left (even numbered) pages of the document.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP" id="bm_id3147213" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3152885" role="heading" level="2" l10n="U" oldref="19">Right pages (not for HTML documents)</paragraph> - <paragraph xml-lang="en-US" id="par_id3150103" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP">Specifies whether to print all right (odd numbered) pages of the document.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE" id="bm_id3153142" localize="false"/> + <paragraph xml-lang="en-US" id="par_id3150103" role="paragraph" l10n="U" oldref="20"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP">Specifies whether to print all right (odd numbered) pages of the document.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_REVERSE" id="bm_id3153142" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3148577" role="heading" level="2" l10n="U" oldref="21">Reversed</paragraph> - <paragraph xml-lang="en-US" id="par_id3150486" role="paragraph" l10n="U" oldref="22"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE">Specifies whether to reverse the printing order. The last page of the document will then be the first one printed.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT" id="bm_id3155306" localize="false"/> + <paragraph xml-lang="en-US" id="par_id3150486" role="paragraph" l10n="U" oldref="22"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_REVERSE">Specifies whether to reverse the printing order. The last page of the document will then be the first one printed.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT" id="bm_id3155306" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3147318" role="heading" level="2" l10n="U" oldref="23">Brochure</paragraph> - <paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="24"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT">Select the<emph> Brochure </emph>option to print your document in brochure format.</ahelp> The brochure format is as follows in $[officename] Writer:</paragraph> + <paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="24"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT">Select the<emph> Brochure </emph>option to print your document in brochure format.</ahelp> The brochure format is as follows in $[officename] Writer:</paragraph> <section id="brochure"> <paragraph xml-lang="en-US" id="par_id3149410" role="paragraph" l10n="CHG" oldref="25">If you print a document in portrait on a landscape page, two opposing sides in a brochure will be printed next to each other. If you have a printer with double-sided printing capability, you can create an entire brochure from your document without having to collate the pages later. If you have a printer that only has single-sided printing capability, you can achieve this effect by first printing the front pages with the "Front sides / right pages /odd pages" option marked, then re-inserting the entire paper stack in your printer and printing all the back pages with the "Back pages / left pages / even pages" option marked.</paragraph> </section> @@ -125,12 +125,12 @@ <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintEmptyPages:CheckBox" id="bm_id2646871" localize="false"/> <paragraph xml-lang="en-US" id="hd_id4188055" role="heading" level="2" l10n="NEW">Print automatically inserted blank pages</paragraph> <paragraph xml-lang="en-US" id="par_id8295541" role="paragraph" l10n="CHG"><ahelp hid=".">If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS" id="bm_id3153713" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_SINGLEJOBS" id="bm_id3153713" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3145642" role="heading" level="2" l10n="CHG" oldref="47">Create single print jobs</paragraph> - <paragraph xml-lang="en-US" id="par_id3147338" role="paragraph" l10n="U" oldref="48"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS">Specifies that each new print job will begin on a new page even if you are using a duplex printer.</ahelp> If this field is not checked then it is possible that the first page of the second copy is printed on the reverse side of the last page of the first copy, especially if there are an odd number of pages.</paragraph> -<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP" id="bm_id3149107" localize="false"/> + <paragraph xml-lang="en-US" id="par_id3147338" role="paragraph" l10n="U" oldref="48"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_SINGLEJOBS">Specifies that each new print job will begin on a new page even if you are using a duplex printer.</ahelp> If this field is not checked then it is possible that the first page of the second copy is printed on the reverse side of the last page of the first copy, especially if there are an odd number of pages.</paragraph> +<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP" id="bm_id3149107" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3156384" role="heading" level="2" l10n="U" oldref="41">Paper tray from printer settings</paragraph> - <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="37"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP">For printers with multiple trays, the "Paper tray from printer settings" option specifies whether the paper tray used is specified by the system settings of the printer.</ahelp></paragraph> + <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="37"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP">For printers with multiple trays, the "Paper tray from printer settings" option specifies whether the paper tray used is specified by the system settings of the printer.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX" id="bm_id3155336" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3147362" role="heading" level="2" l10n="U" oldref="38">Fax</paragraph> <paragraph xml-lang="en-US" id="par_id3154703" role="paragraph" l10n="U" oldref="39"><ahelp hid="SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX">If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine.</ahelp></paragraph> diff --git a/helpcontent2/source/text/shared/optionen/01050100.xhp b/helpcontent2/source/text/shared/optionen/01050100.xhp index 6ddefb1561..e7d50d9423 100644 --- a/helpcontent2/source/text/shared/optionen/01050100.xhp +++ b/helpcontent2/source/text/shared/optionen/01050100.xhp @@ -1,11 +1,11 @@ <?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="textsharedoptionen01050100xml" indexer="include" status="PUBLISH"> <title xml-lang="en-US" id="tit">Grid</title> @@ -55,7 +55,7 @@ <bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_USE_GRIDSNAP" id="bm_id3150669" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3145382" role="heading" level="3" l10n="U" oldref="5">Snap to grid</paragraph> <section id="rasterfang"> - <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_USE_GRIDSNAP">Specifies whether to move frames, drawing elements, and controls only between grid points.</ahelp> To change the status of the snap grip only for the current action, drag an object while holding down the <switchinline select="sys"><caseinline select="MAC">Control key + <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_USE_GRIDSNAP">Specifies whether to move frames, drawing elements, and controls only between grid points.</ahelp> To change the status of the snap grip only for the current action, drag an object while holding down the <switchinline select="sys"><caseinline select="MAC">Control key </caseinline><defaultinline>Ctrl key</defaultinline></switchinline>.</paragraph> </section> <bookmark xml-lang="en-US" branch="hid/.uno:GridVisible" id="bm_id8442192" localize="false"/> @@ -64,10 +64,10 @@ <paragraph xml-lang="en-US" id="hd_id3153824" role="heading" level="3" l10n="U" oldref="7">Visible grid</paragraph> <paragraph xml-lang="en-US" id="par_id3149516" role="paragraph" l10n="CHG" oldref="8"><variable id="rastersicht"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_GRID_VISIBLE">Specifies whether to display the grid.</ahelp> </variable></paragraph> - <paragraph xml-lang="en-US" id="par_id3149294" role="paragraph" l10n="CHG" oldref="29"><switchinline select="appl"><caseinline select="DRAW"><variable id="rastertextdraw">It is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> command in the context menu for the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects. + <paragraph xml-lang="en-US" id="par_id3149294" role="paragraph" l10n="CHG" oldref="29"><switchinline select="appl"><caseinline select="DRAW"><variable id="rastertextdraw">It is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> command in the context menu for the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects. </variable> </caseinline></switchinline></paragraph> - <paragraph xml-lang="en-US" id="par_id3150791" role="paragraph" l10n="CHG" oldref="30"><switchinline select="appl"><caseinline select="IMPRESS"><variable id="rastertext">It is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> command in the context menu of the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects. + <paragraph xml-lang="en-US" id="par_id3150791" role="paragraph" l10n="CHG" oldref="30"><switchinline select="appl"><caseinline select="IMPRESS"><variable id="rastertext">It is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> command in the context menu of the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects. </variable> </caseinline></switchinline></paragraph> <section id="aufun"> @@ -86,36 +86,36 @@ <bookmark xml-lang="en-US" branch="hid/svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_X" id="bm_id3145785" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3153368" role="heading" level="3" l10n="U" oldref="15">Horizontal</paragraph> - <paragraph xml-lang="en-US" id="par_id3150439" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_X">Specify the number of intermediate points between grid points on the X-axis.</ahelp><comment>UFI: see #i39831#</comment></paragraph> + <paragraph xml-lang="en-US" id="par_id3150439" role="paragraph" l10n="CHG" oldref="16"><ahelp hid=".">Specify the number of intermediate spaces between grid points on the X-axis.</ahelp><comment>UFI: see #i39831#</comment><comment>UFI: see #i112000</comment></paragraph> <bookmark xml-lang="en-US" branch="hid/svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_Y" id="bm_id3147428" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3147441" role="heading" level="3" l10n="U" oldref="19">Vertical</paragraph> - <paragraph xml-lang="en-US" id="par_id3154918" role="paragraph" l10n="CHG" oldref="20"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_Y">Specify the number of intermediate points between grid points on the Y-axis.</ahelp></paragraph> + <paragraph xml-lang="en-US" id="par_id3154918" role="paragraph" l10n="CHG" oldref="20"><ahelp hid=".">Specify the number of intermediate spaces between grid points on the Y-axis.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE" id="bm_id3153138" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3149667" role="heading" level="3" l10n="U" oldref="9">Synchronize axes</paragraph> <paragraph xml-lang="en-US" id="par_id3147350" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE">Specifies whether to change the current grid settings symmetrically.</ahelp> The resolution and subdivision for the X and Y axes remain the same.</paragraph> - <paragraph xml-lang="en-US" id="par_id3146121" role="paragraph" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="DRAW">There are additional commands on the context menu of a page: -</caseinline><caseinline select="IMPRESS">There are additional commands on the context menu of a page: + <paragraph xml-lang="en-US" id="par_id3146121" role="paragraph" l10n="U" oldref="31"><switchinline select="appl"><caseinline select="DRAW">There are additional commands on the context menu of a page: +</caseinline><caseinline select="IMPRESS">There are additional commands on the context menu of a page: </caseinline></switchinline></paragraph> </section> <bookmark xml-lang="en-US" branch="hid/.uno:GridFront" id="bm_id8062547" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:GridFront" id="bm_id3147319" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3146984" role="heading" level="2" l10n="U" - oldref="32"><switchinline select="appl"><caseinline select="DRAW">Grid to Front -</caseinline><caseinline select="IMPRESS">Grid to Front + oldref="32"><switchinline select="appl"><caseinline select="DRAW">Grid to Front +</caseinline><caseinline select="IMPRESS">Grid to Front </caseinline></switchinline></paragraph> - <paragraph xml-lang="en-US" id="par_id3153573" role="paragraph" l10n="CHG" oldref="33"><switchinline select="appl"><caseinline select="DRAW">Sets the visible grid in front of all objects. -</caseinline><caseinline select="IMPRESS">Sets the visible grid in front of all objects. + <paragraph xml-lang="en-US" id="par_id3153573" role="paragraph" l10n="CHG" oldref="33"><switchinline select="appl"><caseinline select="DRAW">Sets the visible grid in front of all objects. +</caseinline><caseinline select="IMPRESS">Sets the visible grid in front of all objects. </caseinline></switchinline></paragraph> <paragraph xml-lang="en-US" id="par_id4122135" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the visible grid in front of all objects.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:HelplinesFront" id="bm_id6135046" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:HelplinesFront" id="bm_id3150116" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3149419" role="heading" level="2" l10n="U" - oldref="34"><switchinline select="appl"><caseinline select="DRAW">Snap Lines to Front -</caseinline><caseinline select="IMPRESS">Snap Lines to Front + oldref="34"><switchinline select="appl"><caseinline select="DRAW">Snap Lines to Front +</caseinline><caseinline select="IMPRESS">Snap Lines to Front </caseinline></switchinline></paragraph> - <paragraph xml-lang="en-US" id="par_id3150592" role="paragraph" l10n="CHG" oldref="35"><switchinline select="appl"><caseinline select="DRAW">Sets the snap lines in front of all objects. -</caseinline><caseinline select="IMPRESS">Sets the snap lines in front of all objects. + <paragraph xml-lang="en-US" id="par_id3150592" role="paragraph" l10n="CHG" oldref="35"><switchinline select="appl"><caseinline select="DRAW">Sets the snap lines in front of all objects. +</caseinline><caseinline select="IMPRESS">Sets the snap lines in front of all objects. </caseinline></switchinline></paragraph> <paragraph xml-lang="en-US" id="par_id1251869" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the snap lines in front of all objects.</ahelp></paragraph> <section id="relatedtopics"> diff --git a/helpcontent2/source/text/shared/optionen/01070300.xhp b/helpcontent2/source/text/shared/optionen/01070300.xhp index 68511dc868..1be580fcdb 100644 --- a/helpcontent2/source/text/shared/optionen/01070300.xhp +++ b/helpcontent2/source/text/shared/optionen/01070300.xhp @@ -1,11 +1,11 @@ <?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="textsharedoptionen01070300xml" indexer="include" status="PUBLISH"> <title xml-lang="en-US" id="tit">Grid</title> @@ -53,7 +53,6 @@ <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="3">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.</paragraph> <embed href="text/shared/optionen/01050100.xhp#aufun"/> <paragraph xml-lang="en-US" id="hd_id3156346" role="heading" level="2" l10n="U" oldref="4">Snap</paragraph> -<bookmark xml-lang="en-US" branch="hid/.uno:HelplinesUse" id="bm_id3115680" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:HelplinesUse" id="bm_id3147335" localize="false"/> <bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_HELPLINES" id="bm_id3156329" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3163802" role="heading" level="3" l10n="U" oldref="8">To snap lines</paragraph> @@ -62,38 +61,35 @@ <paragraph xml-lang="en-US" id="par_id3154142" role="paragraph" l10n="CHG" oldref="37">You can also define this setting by using the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides"><emph>Snap to Guides</emph></link> </caseinline><caseinline select="DRAW"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides"><emph>Snap to Guides</emph></link> </caseinline><defaultinline><emph>Snap to Guides</emph></defaultinline></switchinline> icon, which is available in the <emph>Options</emph> bar in a presentation or drawing document.</paragraph> -<bookmark xml-lang="en-US" branch="hid/.uno:SnapBorder" id="bm_id2054461" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:SnapBorder" id="bm_id3153254" localize="false"/> <bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_BORDER" id="bm_id3153063" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3154306" role="heading" level="3" l10n="U" oldref="31">To the page margins</paragraph> <paragraph xml-lang="en-US" id="par_id3156024" role="paragraph" l10n="U" oldref="11"><variable id="seitenrand"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_BORDER">Specifies whether to align the contour of the graphic object to the nearest page margin.</ahelp> </variable></paragraph> - <paragraph xml-lang="en-US" id="par_id3149670" role="paragraph" l10n="U" oldref="33"><variable id="seittext">The cursor or a contour line of the graphics object must be in the snap range. + <paragraph xml-lang="en-US" id="par_id3149670" role="paragraph" l10n="U" oldref="33"><variable id="seittext">The cursor or a contour line of the graphics object must be in the snap range. </variable></paragraph> <paragraph xml-lang="en-US" id="par_id3148947" role="paragraph" l10n="CHG" oldref="38">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13150000.xhp" name="Snap to Page Margins"><emph>Snap to Page Margins</emph></link> </caseinline><caseinline select="DRAW"><link href="text/simpress/02/13150000.xhp" name="Snap to Page Margins"><emph>Snap to Page Margins</emph></link> </caseinline><defaultinline><emph>Snap to Page Margins</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph> -<bookmark xml-lang="en-US" branch="hid/.uno:SnapFrame" id="bm_id215332" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:SnapFrame" id="bm_id3153194" localize="false"/> <bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_FRAME" id="bm_id3151380" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3154365" role="heading" level="3" l10n="U" oldref="12">To object frame</paragraph> <paragraph xml-lang="en-US" id="par_id3148674" role="paragraph" l10n="U" oldref="13"><variable id="rahmen"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_FRAME">Specifies whether to align the contour of the graphic object to the border of the nearest graphic object.</ahelp> </variable></paragraph> - <paragraph xml-lang="en-US" id="par_id3147228" role="paragraph" l10n="U" oldref="34"><variable id="rahmtext">The cursor or a contour line of the graphics object must be in the snap range. + <paragraph xml-lang="en-US" id="par_id3147228" role="paragraph" l10n="U" oldref="34"><variable id="rahmtext">The cursor or a contour line of the graphics object must be in the snap range. </variable></paragraph> <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="CHG" oldref="39">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13160000.xhp" name="Snap to Object Border"><emph>Snap to Object Border</emph></link> </caseinline><caseinline select="DRAW"><link href="text/simpress/02/13160000.xhp" name="Snap to Object Border"><emph>Snap to Object Border</emph></link> </caseinline><defaultinline><emph>Snap to Object Border</emph></defaultinline></switchinline> icon in the <emph>Options</emph> bar.</paragraph> -<bookmark xml-lang="en-US" branch="hid/.uno:SnapPoints" id="bm_id5317182" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:SnapPoints" id="bm_id3155131" localize="false"/> <bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_POINTS" id="bm_id3147288" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3155431" role="heading" level="3" l10n="U" oldref="14">To object points</paragraph> <paragraph xml-lang="en-US" id="par_id3145271" role="paragraph" l10n="U" oldref="15"><variable id="opunkte"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_POINTS">Specifies whether to align the contour of the graphic object to the points of the nearest graphic object.</ahelp> </variable></paragraph> - <paragraph xml-lang="en-US" id="par_id3149483" role="paragraph" l10n="U" oldref="35"><variable id="opunktetext">This only applies if the cursor or a contour line of the graphics object is in the snap range. + <paragraph xml-lang="en-US" id="par_id3149483" role="paragraph" l10n="U" oldref="35"><variable id="opunktetext">This only applies if the cursor or a contour line of the graphics object is in the snap range. </variable></paragraph> <paragraph xml-lang="en-US" id="par_id3146146" role="paragraph" l10n="CHG" oldref="40">In a presentation or drawing document, this function can also be accessed with the <switchinline select="appl"><caseinline select="IMPRESS"><link href="text/simpress/02/13170000.xhp" name="Snap to Object Points"><emph>Snap to Object Points</emph></link> </caseinline><caseinline select="DRAW"><link href="text/simpress/02/13170000.xhp" name="Snap to Object Points"><emph>Snap to Object Points</emph></link> diff --git a/helpcontent2/source/text/shared/optionen/01070500.xhp b/helpcontent2/source/text/shared/optionen/01070500.xhp index eb5759d9fe..2240de3da7 100644 --- a/helpcontent2/source/text/shared/optionen/01070500.xhp +++ b/helpcontent2/source/text/shared/optionen/01070500.xhp @@ -1,11 +1,11 @@ <?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="textsharedoptionen01070500xml" indexer="include"> <title id="tit" xml-lang="en-US">General</title> @@ -55,23 +55,21 @@ </section> <paragraph role="heading" id="hd_id3144511" xml-lang="en-US" level="2" l10n="U" oldref="3">Text objects</paragraph> <bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_QUICKEDIT" id="bm_id3156343" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/.uno:QuickEdit" id="bm_id7033098" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:QuickEdit" id="bm_id3147264" localize="false"/> <paragraph role="heading" id="hd_id3149295" xml-lang="en-US" level="3" l10n="U" oldref="5">Allow quick editing</paragraph> -<paragraph role="paragraph" id="par_id3148947" xml-lang="en-US" l10n="U" oldref="6"><variable id="schnellbearb"><ahelp hid=".uno:QuickEdit">Specifies whether to immediately switch to the text editing mode when clicking a text object.</ahelp> +<paragraph role="paragraph" id="par_id3148947" xml-lang="en-US" l10n="U" oldref="6"><variable id="schnellbearb"><ahelp hid=".">If on, you can edit text immediately after clicking a text object. If off, you must double-click to edit text.</ahelp> </variable></paragraph> <paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="28"><switchinline select="appl"><caseinline select="WRITER"> </caseinline><caseinline select="CALC"> </caseinline><caseinline select="CHART"> </caseinline><caseinline select="MATH"> -</caseinline><defaultinline>In a presentation or drawing document, you can also activate the text editing mode through the<emph> Allow Quick Editing </emph><link href="text/simpress/02/13180000.xhp" name="icon">icon</link> in the <emph>Option</emph> bar.</defaultinline></switchinline></paragraph> +</caseinline><defaultinline>In a presentation or drawing document, you can also activate the text editing mode through the <emph>Allow Quick Editing</emph> <link href="text/simpress/02/13180000.xhp" name="icon">icon</link> in the <emph>Option</emph> bar.</defaultinline></switchinline></paragraph> <bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_PICKTHROUGH" id="bm_id3148920" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/.uno:PickThrough" id="bm_id1003023" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:PickThrough" id="bm_id3153969" localize="false"/> <paragraph role="heading" id="hd_id3154686" xml-lang="en-US" level="3" l10n="U" oldref="7">Only text area selectable</paragraph> <paragraph role="paragraph" id="par_id3149808" xml-lang="en-US" l10n="U" oldref="8"><variable id="textbereich"><ahelp hid=".uno:PickThrough">Specifies whether to select a text frame by clicking the text.</ahelp> </variable></paragraph> -<paragraph role="paragraph" id="par_id3155431" xml-lang="en-US" l10n="U" oldref="23"><variable id="textbereich2">In the area of the text frame that is not filled with text, an object behind the text frame can be selected. +<paragraph role="paragraph" id="par_id3155431" xml-lang="en-US" l10n="U" oldref="23"><variable id="textbereich2">In the area of the text frame that is not filled with text, an object behind the text frame can be selected. </variable></paragraph> <paragraph role="paragraph" id="par_id3153367" xml-lang="en-US" l10n="U" oldref="29"><switchinline select="appl"><caseinline select="WRITER"> </caseinline><caseinline select="CALC"> @@ -88,7 +86,7 @@ <paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MASTERPAGE_CACHE">Specifies whether to use the cache for displaying objects on the master page.</ahelp> This speeds up the display. Unmark the <emph>Use background cache</emph> option if you want to display changing contents on the master page.</paragraph> <bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_COPY" id="bm_id3150094" localize="false"/> <paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="3" l10n="U" oldref="17">Copy when moving</paragraph> -<paragraph role="paragraph" id="par_id3154730" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_COPY">Specifies whether to automatically create a copy when you move an object while holding down the Ctrl key.</ahelp> The same will apply for rotating and resizing the object. The original object will remain in its current position and size.</paragraph> +<paragraph role="paragraph" id="par_id3154730" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid=".">If enabled, a copy is created when you move an object while holding down the Ctrl key (Mac: Command key).</ahelp> The same will apply for rotating and resizing the object. The original object will remain in its current position and size.</paragraph> <bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS" id="bm_id3150592" localize="false"/> <paragraph role="heading" id="hd_id3148457" xml-lang="en-US" level="3" l10n="U" oldref="19">Objects always moveable</paragraph> <paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS">Specifies that you want to move an object with the <emph>Rotate</emph> tool enabled. If<emph> Object always moveable </emph>is not marked, the <emph>Rotate</emph> tool can only be used to rotate an object.</ahelp></paragraph> diff --git a/helpcontent2/source/text/shared/optionen/improvement.xhp b/helpcontent2/source/text/shared/optionen/improvement.xhp index 2c72a97367..26fa2128bb 100644 --- a/helpcontent2/source/text/shared/optionen/improvement.xhp +++ b/helpcontent2/source/text/shared/optionen/improvement.xhp @@ -39,7 +39,7 @@ </meta> <body> <section id="improvement"> -<bookmark xml-lang="en-US" branch="index" id="bm_id7687094"><bookmark_value>improvement program</bookmark_value> +<bookmark xml-lang="en-US" branch="index" id="bm_id7687094"> <bookmark_value>online feedback options</bookmark_value> <bookmark_value>options;improvement program</bookmark_value> <bookmark_value>improvement program</bookmark_value> diff --git a/helpcontent2/source/text/simpress/01/04080100.xhp b/helpcontent2/source/text/simpress/01/04080100.xhp index f82bde412c..7384913316 100644 --- a/helpcontent2/source/text/simpress/01/04080100.xhp +++ b/helpcontent2/source/text/simpress/01/04080100.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,11 +40,12 @@ </topic> </meta> <body> -<bookmark xml-lang="en-US" branch="hid/.uno:InsertSpreadsheet" id="bm_id2843592" localize="false"/> +<section id="inserttable"> <bookmark xml-lang="en-US" branch="hid/.uno:InsertSpreadsheet" id="bm_id3150012" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/.uno:InsertTable" id="bm_id619220" localize="false"/><paragraph role="heading" id="hd_id3148576" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Table</paragraph> +<bookmark xml-lang="en-US" branch="hid/.uno:InsertTable" id="bm_id619220" localize="false"/><paragraph role="heading" id="hd_id3148576" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/04080100.xhp">Table</link></paragraph> <paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="tabelletext"><ahelp hid=".">Inserts a new table into the current slide or page.</ahelp> </variable></paragraph> +</section> <section id="howtoget"> <embed href="text/simpress/00/00000404.xhp#efgosc"/> </section> diff --git a/helpcontent2/source/text/simpress/01/05090000m.xhp b/helpcontent2/source/text/simpress/01/05090000m.xhp index 0000f72a37..eae89bfb74 100644 --- a/helpcontent2/source/text/simpress/01/05090000m.xhp +++ b/helpcontent2/source/text/simpress/01/05090000m.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="textsimpress0105090000mxml" indexer="include"> <title id="tit" xml-lang="en-US">Format Cells</title> @@ -38,11 +38,9 @@ </topic> </meta> <body> -<bookmark xml-lang="en-US" branch="hid/.uno:TableDialog" id="bm_id3151186" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/.uno:TableDialog" id="bm_id6845912" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:TableDialog" id="bm_id0916200801490993" localize="false"/> <paragraph role="heading" id="hd_id3147172" xml-lang="en-US" level="1" l10n="U" oldref="1">Format Cells</paragraph> -<paragraph role="paragraph" id="par_id3154643" xml-lang="en-US" l10n="U" oldref="2"><variable id="tabelletext"><ahelp hid=".uno:TableDialog">Specifies the properties of the selected table, for example, fonts, font effects, borders, and background.</ahelp> +<paragraph role="paragraph" id="par_id3154643" xml-lang="en-US" l10n="U" oldref="2"><variable id="tabelletext"><ahelp hid=".">Specifies the properties of the selected table, for example, fonts, font effects, borders, and background.</ahelp> </variable></paragraph> <section id="howtoget"> <paragraph role="paragraph" id="par_id0916200811543127" xml-lang="en-US" l10n="NEW">On the Table Bar, click <emph>Table Properties</emph>.</paragraph> diff --git a/helpcontent2/source/text/simpress/02/13060000.xhp b/helpcontent2/source/text/simpress/02/13060000.xhp index 4970a5fdde..1f3289b9bf 100644 --- a/helpcontent2/source/text/simpress/02/13060000.xhp +++ b/helpcontent2/source/text/simpress/02/13060000.xhp @@ -4,7 +4,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 @@ -27,23 +27,19 @@ * for a copy of the LGPLv3 License. * ************************************************************************--> - + <helpdocument version="1.0"> <meta> <topic id="textsimpress0213060000xml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Double-Click to add Text</title> <filename>/text/simpress/02/13060000.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2004-08-17T09:29:13">converted from old format - fpe</lastedited> -</history> </meta> <body> <section id="txtdoppel"> <bookmark xml-lang="en-US" branch="index" id="bm_id3150010"><bookmark_value>text; double-clicking to edit</bookmark_value> </bookmark> -<bookmark xml-lang="en-US" branch="hid/.uno:DoubleClickTextEdit" id="bm_id6016412" localize="false"/><!-- HID added by script --> + <bookmark xml-lang="en-US" branch="hid/.uno:DoubleClickTextEdit" id="bm_id3147434" localize="false"/> <paragraph role="heading" id="hd_id3150010" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/02/13060000.xhp" name="Double-Click to add Text">Double-Click to add Text</link></paragraph> <paragraph role="paragraph" id="par_id3149378" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DoubleClickTextEdit">Changes the mouse-click behavior, so that you can double-click an object to add or edit text.</ahelp></paragraph> @@ -61,7 +57,6 @@ </tablecell> </tablerow> </table> - </section> </body> </helpdocument> diff --git a/helpcontent2/source/text/simpress/02/13080000.xhp b/helpcontent2/source/text/simpress/02/13080000.xhp index 3430212d7b..3bb4af5230 100644 --- a/helpcontent2/source/text/simpress/02/13080000.xhp +++ b/helpcontent2/source/text/simpress/02/13080000.xhp @@ -4,7 +4,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 @@ -32,24 +32,15 @@ <title xml-lang="en-US" id="tit">Large Handles</title> <filename>/text/simpress/02/13080000.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited> -</history> </meta> <body> - - - <section id="handlbig"> - <bookmark xml-lang="en-US" branch="index" id="bm_id3146119"><bookmark_value>handles; large</bookmark_value></bookmark><bookmark xml-lang="en-US" branch="hid/.uno:BigHandles" id="bm_id4979734" localize="false"/><!-- HID added by script --> +<section id="handlbig"> +<bookmark xml-lang="en-US" branch="index" id="bm_id3146119"><bookmark_value>handles; large</bookmark_value></bookmark> <bookmark branch="hid/.uno:BigHandles" xml-lang="en-US" id="bm_id3152598"/><paragraph id="hd_id3146119" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/simpress/02/13080000.xhp" name="Large Handles">Large Handles</link></paragraph> <paragraph l10n="U" role="paragraph" id="par_id3153142" xml-lang="en-US" oldref="2"><ahelp hid=".uno:BigHandles" visibility="visible">Displays large selection handles.</ahelp></paragraph> </section> <section id="bighandl"> <table id="tbl_id3150718"> - - - <tablerow> <tablecell> <paragraph l10n="E" role="paragraph" id="par_id3155445" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_bighandles.png" id="img_id3153714"><alt xml-lang="en-US" id="alt_id3153714">Icon</alt></image></paragraph> @@ -58,9 +49,7 @@ <paragraph role="paragraph" id="par_id3154755" l10n="U" xml-lang="en-US" oldref="4">Large Handles</paragraph> </tablecell> </tablerow> - </table> </section> - </body> </helpdocument> diff --git a/helpcontent2/source/text/simpress/02/13140000.xhp b/helpcontent2/source/text/simpress/02/13140000.xhp index 941a7047dd..efe71e5006 100644 --- a/helpcontent2/source/text/simpress/02/13140000.xhp +++ b/helpcontent2/source/text/simpress/02/13140000.xhp @@ -5,7 +5,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,17 +29,13 @@ * ************************************************************************ --> - + <helpdocument version="1.0"> <meta> <topic id="textsimpress0213140000xml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Snap to Guides</title> <filename>/text/simpress/02/13140000.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2006-04-18T15:32:45">converted from old format - fpe</lastedited> -</history> </meta> <body> <paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides">Snap to Guides</link></paragraph> @@ -57,7 +53,6 @@ </tablecell> </tablerow> </table> - </section> </body> </helpdocument> diff --git a/helpcontent2/source/text/simpress/02/13160000.xhp b/helpcontent2/source/text/simpress/02/13160000.xhp index 32a49ed658..0d02869b6f 100644 --- a/helpcontent2/source/text/simpress/02/13160000.xhp +++ b/helpcontent2/source/text/simpress/02/13160000.xhp @@ -4,7 +4,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 @@ -32,22 +32,13 @@ <title xml-lang="en-US" id="tit">Snap to Object Border</title> <filename>/text/simpress/02/13160000.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited> -</history> </meta> <body> - - - <paragraph id="hd_id3125865" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/simpress/02/13160000.xhp" name="Snap to Object Border">Snap to Object Border</link></paragraph> +<paragraph id="hd_id3125865" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/simpress/02/13160000.xhp" name="Snap to Object Border">Snap to Object Border</link></paragraph> <embed href="text/shared/optionen/01070300.xhp#rahmen"/> <embed href="text/shared/optionen/01070300.xhp#rahmtext"/> <section id="sysobfang"> <table id="tbl_id3159155"> - - - <tablerow> <tablecell> <paragraph l10n="E" role="paragraph" id="par_id3150717" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_snapframe.png" id="img_id3154510"><alt xml-lang="en-US" id="alt_id3154510">Icon</alt></image></paragraph> @@ -56,9 +47,7 @@ <paragraph role="paragraph" id="par_id3154018" l10n="U" xml-lang="en-US" oldref="2">Snap to Object Border</paragraph> </tablecell> </tablerow> - </table> </section> - </body> </helpdocument> diff --git a/helpcontent2/source/text/simpress/02/13180000.xhp b/helpcontent2/source/text/simpress/02/13180000.xhp index ac751985a4..c198608219 100644 --- a/helpcontent2/source/text/simpress/02/13180000.xhp +++ b/helpcontent2/source/text/simpress/02/13180000.xhp @@ -4,7 +4,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 @@ -32,32 +32,20 @@ <title xml-lang="en-US" id="tit">Allow Quick Editing</title> <filename>/text/simpress/02/13180000.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited> -</history> </meta> <body> - - - - <paragraph id="hd_id3154758" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/simpress/02/13180000.xhp" name="Allow Quick Editing">Allow Quick Editing</link></paragraph> +<paragraph id="hd_id3154758" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/simpress/02/13180000.xhp" name="Allow Quick Editing">Allow Quick Editing</link></paragraph> <embed href="text/shared/optionen/01070500.xhp#schnellbearb"/> <section id="syschnllzu"> <table id="tbl_id3125863"> - - - <tablerow> <tablecell> <paragraph l10n="E" role="paragraph" id="par_id3149664" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_quickedit.png" id="img_id3153728"><alt xml-lang="en-US" id="alt_id3153728">Icon</alt></image></paragraph> - </tablecell> <tablecell> <paragraph role="paragraph" id="par_id3146974" l10n="U" xml-lang="en-US" oldref="2">Allow Quick Editing</paragraph> </tablecell> </tablerow> - </table> </section> </body> diff --git a/helpcontent2/source/text/simpress/guide/table_insert.xhp b/helpcontent2/source/text/simpress/guide/table_insert.xhp index 3cb5f85e91..02acb49550 100644 --- a/helpcontent2/source/text/simpress/guide/table_insert.xhp +++ b/helpcontent2/source/text/simpress/guide/table_insert.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="textsimpressguidetable_insertxml" indexer="include"> <title id="tit" xml-lang="en-US">Including Spreadsheets in Slides</title> @@ -68,7 +68,10 @@ <bookmark xml-lang="en-US" branch="hid/.uno:CellVertCenter" id="bm_id091620080323379" localize="false"/> <paragraph role="paragraph" id="par_id0916200803551697" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The cell contents are aligned vertically centered in the cells.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:CellVertBottom" id="bm_id0916200803242358" localize="false"/> -<paragraph role="paragraph" id="par_id0916200803551632" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The cell contents are aligned at the bottom of the cells.</ahelp></paragraph><comment>Row</comment> +<paragraph role="paragraph" id="par_id0916200803551632" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The cell contents are aligned at the bottom of the cells.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/.uno:SelectTable" id="bm_id3954588" localize="false"/> +<paragraph role="paragraph" id="par_idN10626" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Selects the current table.</ahelp></paragraph> +<comment>Row</comment> <bookmark xml-lang="en-US" branch="hid/.uno:RowMenu" id="bm_id0916200803255185" localize="false"/> <paragraph role="paragraph" id="par_id0916200803551734" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Choose commands for the selected or all rows.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:DistributeRows" id="bm_id0916200803565265" localize="false"/> diff --git a/helpcontent2/source/text/simpress/main0200.xhp b/helpcontent2/source/text/simpress/main0200.xhp index 0cae0f12a3..43bfdd6dca 100755 --- a/helpcontent2/source/text/simpress/main0200.xhp +++ b/helpcontent2/source/text/simpress/main0200.xhp @@ -66,7 +66,7 @@ <embed href="text/simpress/main0204.xhp#objektleistedia"/> </section> <section id="SectionSW6"> -<embed href="text/swriter/main0204.xhp#objektleistetabellen"/> +<embed href="text/shared/main0204.xhp#tablebar"/> </section> <section id="Section7"> <embed href="text/simpress/main0203.xhp#objektleistetext"/> diff --git a/helpcontent2/source/text/swriter/01/04150000.xhp b/helpcontent2/source/text/swriter/01/04150000.xhp index c4cded00a0..f76187f9e9 100644 --- a/helpcontent2/source/text/swriter/01/04150000.xhp +++ b/helpcontent2/source/text/swriter/01/04150000.xhp @@ -4,7 +4,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 @@ -27,22 +27,17 @@ * for a copy of the LGPLv3 License. * ************************************************************************--> - + <helpdocument version="1.0"> <meta> <topic id="textswriter0104150000xml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Table</title> <filename>/text/swriter/01/04150000.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2005-05-09T14:29:52">UFI: sw.features Tables in tables -dedr: reviewed</lastedited> -</history> </meta> <body> <section id="inserttable"> -<bookmark xml-lang="en-US" branch="hid/.uno:InsertTable" id="bm_id6338192" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/.uno:InsertTable" id="bm_id3151392" localize="false"/> <paragraph role="heading" id="hd_id3147402" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/01/04150000.xhp">Table</link></paragraph> <paragraph role="paragraph" id="par_id3149355" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="tabelletext"><ahelp hid=".uno:InsertTable">Inserts a table into the document. You can also click the arrow, drag to select the number of rows and columns to include in the table, and then click in the last cell.</ahelp> diff --git a/helpcontent2/source/text/swriter/01/05090000.xhp b/helpcontent2/source/text/swriter/01/05090000.xhp index 661a3cf64f..4fd9776ade 100644 --- a/helpcontent2/source/text/swriter/01/05090000.xhp +++ b/helpcontent2/source/text/swriter/01/05090000.xhp @@ -4,7 +4,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 @@ -27,22 +27,17 @@ * for a copy of the LGPLv3 License. * ************************************************************************--> - + <helpdocument version="1.0"> <meta> <topic id="textswriter0105090000xml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Table Format </title> +<title id="tit" xml-lang="en-US">Table Format</title> <filename>/text/swriter/01/05090000.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2005-01-14T13:07:00">converted from old format - fpe</lastedited> -</history> </meta> <body> -<bookmark xml-lang="en-US" branch="hid/.uno:TableDialog" id="bm_id3151186" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:TableDialog" id="bm_id6845912" localize="false"/> -<paragraph role="heading" id="hd_id3147172" xml-lang="en-US" level="1" l10n="U" oldref="1">Table Format </paragraph> +<paragraph role="heading" id="hd_id3147172" xml-lang="en-US" level="1" l10n="U" oldref="1">Table Format</paragraph> <paragraph role="paragraph" id="par_id3154643" xml-lang="en-US" l10n="U" oldref="2"><variable id="tabelletext"><ahelp hid=".uno:TableDialog">Specifies the properties of the selected table, for example, name, alignment, spacing, column width, borders, and background.</ahelp> </variable></paragraph> <section id="howtoget"> diff --git a/helpcontent2/source/text/swriter/01/05120300.xhp b/helpcontent2/source/text/swriter/01/05120300.xhp index 06eaf8f279..79f0684c9b 100644 --- a/helpcontent2/source/text/swriter/01/05120300.xhp +++ b/helpcontent2/source/text/swriter/01/05120300.xhp @@ -4,7 +4,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 @@ -32,16 +32,9 @@ <title xml-lang="en-US" id="tit">Select</title> <filename>/text/swriter/01/05120300.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited> -</history> </meta> <body> - - <section id="selektieren"> - <bookmark xml-lang="en-US" branch="hid/.uno:EntireColumn" id="bm_id6098565" localize="false"/><!-- HID added by script --> <bookmark branch="hid/.uno:EntireColumn" xml-lang="en-US" id="bm_id3150253"/><paragraph id="hd_id3154660" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05120300.xhp" name="Select">Select</link></paragraph> <paragraph l10n="U" role="paragraph" id="par_id3154765" xml-lang="en-US" oldref="2"><ahelp hid=".uno:EntireColumn" visibility="visible">Selects the column that contains the cursor.</ahelp> This option is only available if the cursor is in a table.</paragraph> </section> diff --git a/helpcontent2/source/text/swriter/01/05150101.xhp b/helpcontent2/source/text/swriter/01/05150101.xhp index cc24c8afaf..0d595185ac 100644 --- a/helpcontent2/source/text/swriter/01/05150101.xhp +++ b/helpcontent2/source/text/swriter/01/05150101.xhp @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <helpdocument version="1.0"> - + <!-- *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. * - * OpenOffice.org - a multi-platform office productivity suite + * Copyright 2000, 2010 Oracle and/or its affiliates. * - * $RCSfile: soffice2xmlhelp.xsl,v $ - * $Revision: 1.12 $ + * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * @@ -32,16 +29,15 @@ * ************************************************************************ --> - - + + <meta> - <topic id="textswriter0105150101xml" indexer="include" status="PUBLISH"> - <title xml-lang="en-US" id="tit">AutoFormat for Tables</title> - <filename>/text/swriter/01/05150101.xhp</filename> - </topic> - </meta> - <body> -<bookmark xml-lang="en-US" branch="hid/.uno:AutoFormat" id="bm_id4963785" localize="false"/> +<topic id="textswriter0105150101xml" indexer="include" status="PUBLISH"> +<title xml-lang="en-US" id="tit">AutoFormat for Tables</title> +<filename>/text/swriter/01/05150101.xhp</filename> +</topic> +</meta> +<body> <bookmark xml-lang="en-US" branch="hid/.uno:AutoFormat" id="bm_id3150343" localize="false"/> <bookmark xml-lang="en-US" branch="hid/SW_HID_AUTOFMT_TABLE" id="bm_id3150249" localize="false"/> <bookmark xml-lang="en-US" branch="index" id="bm_id2655415"><bookmark_value>tables;AutoFormat function</bookmark_value> diff --git a/helpcontent2/source/text/swriter/01/06100000.xhp b/helpcontent2/source/text/swriter/01/06100000.xhp index 918338feff..f5da8b8ff6 100644 --- a/helpcontent2/source/text/swriter/01/06100000.xhp +++ b/helpcontent2/source/text/swriter/01/06100000.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,15 +29,15 @@ * ************************************************************************ --> - - + + <meta> - <topic id="textswriter0106100000xml" indexer="include" status="PUBLISH"> - <title xml-lang="en-US" id="tit">Sort </title> - <filename>/text/swriter/01/06100000.xhp</filename> - </topic> - </meta> - <body> +<topic id="textswriter0106100000xml" indexer="include" status="PUBLISH"> +<title xml-lang="en-US" id="tit">Sort</title> +<filename>/text/swriter/01/06100000.xhp</filename> +</topic> +</meta> +<body> <bookmark xml-lang="en-US" branch="index" id="bm_id3149353"><bookmark_value>tables;sorting rows</bookmark_value> <bookmark_value>sorting;paragraphs/table rows</bookmark_value> <bookmark_value>text; sorting paragraphs</bookmark_value> @@ -46,11 +46,9 @@ <bookmark_value>Asian languages;sorting paragraphs/table rows</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/.uno:SortDialog" id="bm_id849221" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/.uno:SortDialog" id="bm_id3145829" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/.uno:TableSort" id="bm_id1702932" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:TableSort" id="bm_id6670125" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3149353" role="heading" level="1" l10n="U" oldref="1">Sort</paragraph> - <paragraph xml-lang="en-US" id="par_id3150015" role="paragraph" l10n="CHG" oldref="2"><variable id="sort"><ahelp hid=".uno:SortDialog">Sorts the selected paragraphs or table rows alphabetically or numerically.</ahelp> You can define up to three sort keys as well as combine alphanumeric and numeric sort keys. + <paragraph xml-lang="en-US" id="par_id3150015" role="paragraph" l10n="CHG" oldref="2"><variable id="sort"><ahelp hid=".uno:SortDialog">Sorts the selected paragraphs or table rows alphabetically or numerically.</ahelp> You can define up to three sort keys as well as combine alphanumeric and numeric sort keys. </variable></paragraph> <section id="howtoget"> <embed href="text/swriter/00/00000406.xhp#sortieren"/> diff --git a/helpcontent2/source/text/swriter/04/01020000.xhp b/helpcontent2/source/text/swriter/04/01020000.xhp index 4087a50112..2f84a72b9b 100755 --- a/helpcontent2/source/text/swriter/04/01020000.xhp +++ b/helpcontent2/source/text/swriter/04/01020000.xhp @@ -847,6 +847,15 @@ <paragraph xml-lang="en-US" id="par_id3147386" role="tablecontent" l10n="U" oldref="299">Use previous suggestion with <link href="text/shared/01/06040600.xhp" name="Automatic Word Completion">Automatic Word Completion</link></paragraph> </tablecell> </tablerow> + <tablerow> + <tablecell> + <paragraph xml-lang="en-US" id="hd_id3144447360" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command+Option</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Shift+V</paragraph> + </tablecell> + <tablecell> + <paragraph xml-lang="en-US" id="par_id3144447386" role="tablecontent" l10n="NEW">Paste the contents of the clipboard as unformatted text.</paragraph> + </tablecell> + </tablerow> + <tablerow> <tablecell> <paragraph xml-lang="en-US" id="hd_id3145382" role="tablecontent" l10n="U" oldref="288"><switchinline select="sys"><caseinline select="MAC">Command diff --git a/helpcontent2/source/text/swriter/guide/section_edit.xhp b/helpcontent2/source/text/swriter/guide/section_edit.xhp index da9347d3b6..90f09917ee 100755 --- a/helpcontent2/source/text/swriter/guide/section_edit.xhp +++ b/helpcontent2/source/text/swriter/guide/section_edit.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="textswriterguidesection_editxml" indexer="include" status="PUBLISH"> <title xml-lang="en-US" id="tit">Editing Sections</title> @@ -39,14 +39,16 @@ </meta> <body> <bookmark xml-lang="en-US" branch="index" id="bm_id3149816"><bookmark_value>sections; editing</bookmark_value> +<bookmark_value>sections;deleting</bookmark_value> +<bookmark_value>deleting;sections</bookmark_value> <bookmark_value>editing;sections</bookmark_value> <bookmark_value>read-only sections</bookmark_value> <bookmark_value>protecting;sections</bookmark_value> <bookmark_value>converting;sections, into normal text</bookmark_value> <bookmark_value>hiding;sections</bookmark_value> -</bookmark> +</bookmark><comment>ufi: added two deleting sections entries</comment> <paragraph xml-lang="en-US" id="hd_id3149816" role="heading" level="1" l10n="U" - oldref="13"><variable id="section_edit"><link href="text/swriter/guide/section_edit.xhp" name="Editing Sections">Editing Sections</link> + oldref="13"><variable id="section_edit"><link href="text/swriter/guide/section_edit.xhp" name="Editing Sections">Editing Sections</link> </variable></paragraph> <paragraph xml-lang="en-US" id="par_id3155858" role="paragraph" l10n="U" oldref="14">You can protect, hide, and convert sections to normal text in your document.</paragraph> <list type="ordered"> @@ -54,8 +56,9 @@ <paragraph xml-lang="en-US" id="par_id3154224" role="listitem" l10n="U" oldref="15">Choose <link href="text/swriter/01/02170000.xhp" name="Format - Sections"><emph>Format - Sections</emph></link>.</paragraph> </listitem> <listitem> - <paragraph xml-lang="en-US" id="par_id3149848" role="listitem" l10n="CHG" oldref="16">In the <item type="menuitem">Section</item> - <emph/>list, click the section you want to modify. You can press Ctrl+A to select all sections in the list, and you can Shift+click or Ctrl+click to select some sections.</paragraph> + <paragraph xml-lang="en-US" id="par_id3149848" role="listitem" l10n="CHG" oldref="16">In the <item type="menuitem">Section</item> list, click the section you want to modify. You can press <switchinline select="sys"><caseinline select="MAC">Command +</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A to select all sections in the list, and you can Shift+click or <switchinline select="sys"><caseinline select="MAC">Command +</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+click to select some sections.</paragraph> </listitem> <listitem> <paragraph xml-lang="en-US" id="par_id3153397" role="listitem" l10n="U" oldref="17">Do one of the following:</paragraph> @@ -74,15 +77,8 @@ <paragraph role="listitem" id="par_id3149609" xml-lang="en-US" l10n="U" oldref="20">To hide a section, select the <emph>Hide</emph> check box in the <emph>Hide</emph> area.</paragraph> </listitem> </list> +<comment>removed ordered list with startvalue 4, not sure if such a list will survive all transformations</comment> - - - - <list type="ordered" startwith="4"> - <listitem> - <paragraph xml-lang="en-US" id="par_id3149874" role="listitem" l10n="U" oldref="21">Set the other options that you want, and then click <emph>OK</emph>.</paragraph> - </listitem> - </list> <embed href="text/shared/00/00000004.xhp#related"/> <embed href="text/swriter/guide/sections.xhp#sections"/> <embed href="text/swriter/guide/section_insert.xhp#section_insert"/> diff --git a/helpcontent2/source/text/swriter/guide/table_sizing.xhp b/helpcontent2/source/text/swriter/guide/table_sizing.xhp index 296bc3fc34..bde82f10f1 100644 --- a/helpcontent2/source/text/swriter/guide/table_sizing.xhp +++ b/helpcontent2/source/text/swriter/guide/table_sizing.xhp @@ -1,11 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - -<!-- -*********************************************************************** +<?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 @@ -27,95 +24,86 @@ * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. * - ************************************************************************ - --> + ************************************************************************ --> - <meta> - <topic id="textswriterguidetable_sizingxml" indexer="include"> - <title xml-lang="en-US" id="tit">Resizing Rows and Columns in a Text Table </title> - <filename>/text/swriter/guide/table_sizing.xhp</filename> - </topic> - </meta> - <body> -<bookmark xml-lang="en-US" branch="index" id="bm_id3156108"><bookmark_value>cells; enlarging and reducing in text tables</bookmark_value> - <bookmark_value>table cells; enlarging/reducing in text</bookmark_value> - <bookmark_value>keyboard; resizing rows/columns</bookmark_value> - <bookmark_value>resizing;rows and columns in text tables</bookmark_value> - <bookmark_value>enlarging columns,cells and table rows</bookmark_value> - <bookmark_value>reducing rows and columns in text tables</bookmark_value> - <bookmark_value>tables; resizing/juxtaposing</bookmark_value> - <bookmark_value>juxtaposing tables</bookmark_value> -</bookmark><comment>mw deleted "text tables;enlarging cells", "tables;changing the size", "tables;arranging" and "arranging;tables". MW changed "tables;sizing" and "table cells;". MW added "reducing rows and columns in text tables"</comment><comment>MW changed "tables;" and added "juxtaposing tables"</comment> -<paragraph xml-lang="en-US" id="hd_id3156108" role="heading" level="1" l10n="CHG" - oldref="12"><variable id="table_sizing"><link href="text/swriter/guide/table_sizing.xhp" name="Resizing Rows and Columns in a Text Table">Resizing Rows and Columns in a Text Table</link> -</variable></paragraph> -<paragraph role="paragraph" id="par_id3153140" xml-lang="en-US" l10n="U" oldref="13">You can resize the width of table cells and columns, as well as change the height of table rows.</paragraph> +<topic id="textswriterguidetable_sizingxml" indexer="include"> +<title xml-lang="en-US" id="tit">Resizing Rows and Columns in a Text Table </title> +<filename>text/swriter/guide/table_sizing.xhp</filename> +</topic> +</meta> +<body> +<bookmark xml-lang="en-US" branch="index" id="bm_id3156108"> +<bookmark_value>cells; enlarging and reducing in text tables</bookmark_value> +<bookmark_value>table cells; enlarging/reducing in text</bookmark_value> +<bookmark_value>keyboard; resizing rows/columns</bookmark_value> +<bookmark_value>resizing;rows and columns in text tables</bookmark_value> +<bookmark_value>enlarging columns,cells and table rows</bookmark_value> +<bookmark_value>reducing rows and columns in text tables</bookmark_value> +<bookmark_value>tables; resizing/juxtaposing</bookmark_value> +<bookmark_value>juxtaposing tables</bookmark_value> +<bookmark_value>heights of table rows</bookmark_value> +<bookmark_value>widths of table columns</bookmark_value> +<bookmark_value>rows;resizing in tables</bookmark_value> +<bookmark_value>columns;resizing in tables</bookmark_value> +<bookmark_value>column widths in tables</bookmark_value> +</bookmark><comment>mw deleted "text tables;enlarging cells", "tables;changing the size", "tables;arranging" and "arranging;tables". MW changed "tables;sizing" and "table cells;". MW added "reducing rows and columns in text tables"</comment><comment>MW changed "tables;" and added "juxtaposing tables"</comment><comment>MW added 5 index entries wrt column widths and row heights</comment> +<paragraph id="hd_id3156108" role="heading" xml-lang="en-US" level="1"><variable id="table_sizing"><link href="text/swriter/guide/table_sizing.xhp" name="Resizing Rows and Columns in a Text Table">Resizing Rows and Columns in a Text Table</link></variable></paragraph> +<paragraph id="par_id3153140" role="paragraph" xml-lang="en-US">You can resize the width of table cells and columns, as well as change the height of table rows.</paragraph> <table id="tbl_id3149640"> <tablerow> <tablecell> -<paragraph role="paragraph" id="par_id3149615" xml-lang="en-US" l10n="E"> -<image id="img_id3149622" src="res/commandimagelist/sc_optimizetable.png" width="0.423cm" height="0.423cm"><alt id="alt_id3149622" xml-lang="en-US">Icon</alt> +<paragraph id="par_id3149615" role="paragraph" xml-lang="en-US"> +<image id="img_id3149622" src="res/commandimagelist/sc_optimizetable.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149622">Icon</alt> </image></paragraph> - </tablecell> - <tablecell> - <paragraph xml-lang="en-US" id="par_id3146497" role="paragraph" l10n="U" oldref="22">You can also distribute rows and columns evenly using the icons on the <item type="menuitem">Optimize</item> toolbar on the <item type="menuitem">Table</item> - <emph/>Bar.</paragraph> - </tablecell> - </tablerow> - </table> +</tablecell> +<tablecell> +<paragraph id="par_id3146497" role="paragraph" xml-lang="en-US">You can also distribute rows and columns evenly using the icons on the <item type="menuitem">Optimize</item> toolbar on the <item type="menuitem">Table</item> Bar.</paragraph> +</tablecell> +</tablerow> +</table> - <paragraph xml-lang="en-US" id="hd_id3145109" role="heading" level="2" l10n="U" - oldref="24">Changing the Width of Columns and Cells</paragraph> - <paragraph xml-lang="en-US" id="hd_id3149574" role="heading" level="3" l10n="U" - oldref="25">To Change the Width of a Column</paragraph> - <paragraph xml-lang="en-US" id="par_id3149587" role="paragraph" l10n="U" oldref="26">Do one of the following:</paragraph> - <list type="unordered"> - <listitem> - <paragraph xml-lang="en-US" id="par_id3156246" role="listitem" l10n="U" oldref="21">Rest the mouse pointer over the column dividing line until the pointer becomes a separator icon, and then drag the line to a new location.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id3145390" role="listitem" l10n="U" oldref="27">Rest the mouse pointer over the column dividing line on the ruler until the pointer becomes a separator icon, and then drag the line to a new location.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id0918200811260957" role="listitem" l10n="NEW">Hold down <switchinline select="sys"><caseinline select="MAC">Command +<paragraph id="hd_id3145109" role="heading" xml-lang="en-US" level="2">Changing the Width of Columns and Cells</paragraph> +<paragraph id="hd_id3149574" role="heading" xml-lang="en-US" level="3">To Change the Width of a Column</paragraph> +<paragraph id="par_id3149587" role="paragraph" xml-lang="en-US">Do one of the following:</paragraph> +<list type="unordered"> +<listitem> +<paragraph id="par_id3156246" role="listitem" xml-lang="en-US">Rest the mouse pointer over the column dividing line until the pointer becomes a separator icon, and then drag the line to a new location.</paragraph> +</listitem> +<listitem> +<paragraph id="par_id3145390" role="listitem" xml-lang="en-US">Rest the mouse pointer over the column dividing line on the ruler until the pointer becomes a separator icon, and then drag the line to a new location.</paragraph> +</listitem> +<listitem> +<paragraph id="par_id0918200811260957" role="listitem" xml-lang="en-US">Hold down <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl</defaultinline></switchinline> and then click and drag a line to scale all cells right or above the line proportionally.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id3145411" role="listitem" l10n="U" oldref="14">Place the cursor in a cell in the column, hold down the <switchinline select="sys"><caseinline select="MAC">Option +</listitem> +<listitem> +<paragraph id="par_id3145411" role="listitem" xml-lang="en-US">Place the cursor in a cell in the column, hold down the <switchinline select="sys"><caseinline select="MAC">Option </caseinline><defaultinline>Alt</defaultinline></switchinline> key, and then press the left or the right arrow key.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id3153364" role="listitem" l10n="U" oldref="28">To increase the distance from the left edge of the page to the edge of the table, hold down <switchinline select="sys"><caseinline select="MAC">Option +</listitem> +<listitem> +<paragraph id="par_id3153364" role="listitem" xml-lang="en-US">To increase the distance from the left edge of the page to the edge of the table, hold down <switchinline select="sys"><caseinline select="MAC">Option </caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift, and then press the right arrow key.</paragraph> - </listitem> - </list> - <paragraph xml-lang="en-US" id="par_id3155891" role="note" l10n="U" oldref="29">You can specify the behavior for the arrow keys by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Table</emph>, and selecting the options that you want in the <emph>Keyboard handling</emph> area.</paragraph> - <paragraph xml-lang="en-US" id="hd_id3149993" role="heading" level="3" l10n="U" - oldref="30">To Change the Width of a Cell</paragraph> - <paragraph xml-lang="en-US" id="par_id3148676" role="listitem" l10n="U" oldref="31">Hold down <switchinline select="sys"><caseinline select="MAC">Option+Command +</listitem></list> +<paragraph id="par_id3155891" role="note" xml-lang="en-US">You can specify the behavior for the arrow keys by choosing <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph> +</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><emph>%PRODUCTNAME Writer - Table</emph>, and selecting the options that you want in the <emph>Keyboard handling</emph> area.</paragraph> +<paragraph id="hd_id3149993" role="heading" xml-lang="en-US" level="3">To Change the Width of a Cell</paragraph> +<paragraph id="par_id3148676" role="listitem" xml-lang="en-US">Hold down <switchinline select="sys"><caseinline select="MAC">Option+Command </caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>, and then press the left or the right arrow key</paragraph> - <paragraph xml-lang="en-US" id="hd_id3153014" role="heading" level="2" l10n="U" - oldref="32">Changing the Height of a Row</paragraph> - <paragraph xml-lang="en-US" id="par_id3153035" role="listitem" l10n="U" oldref="33">To change the height of a row, place the cursor in a cell in the row, hold down the <switchinline select="sys"><caseinline select="MAC">Option +<paragraph id="hd_id3153014" role="heading" xml-lang="en-US" level="2">Changing the Height of a Row</paragraph> +<paragraph id="par_id3153035" role="listitem" xml-lang="en-US">To change the height of a row, place the cursor in a cell in the row, hold down the <switchinline select="sys"><caseinline select="MAC">Option </caseinline><defaultinline>Alt</defaultinline></switchinline> key, and then press the up or the down arrow key.</paragraph> - <paragraph xml-lang="en-US" id="hd_id8478041" role="heading" level="2" l10n="NEW">Resizing a Whole Table</paragraph> - <paragraph xml-lang="en-US" id="par_id3358867" role="paragraph" l10n="NEW">To change the width and height of a table, do one of the following:</paragraph> - <list type="unordered"> - <listitem> - <paragraph xml-lang="en-US" id="par_id5366679" role="paragraph" l10n="NEW">Click inside the table. In the rulers, drag the border between the white and the gray area to resize the table.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_id1279030" role="paragraph" l10n="NEW">Click inside the table. Choose <item type="menuitem">Table - Table Properties</item> to open a dialog and set the properties to the numbers.</paragraph> - </listitem> - </list> - <paragraph xml-lang="en-US" id="par_id5009308" role="tip" l10n="NEW">To wrap text to the sides of a table, and to arrange two tables next to another, you must insert the tables into a frame. Click inside the table, press <switchinline select="sys"><caseinline select="MAC">Command +<paragraph id="hd_id8478041" role="heading" xml-lang="en-US" level="2">Resizing a Whole Table</paragraph> +<paragraph id="par_id3358867" role="paragraph" xml-lang="en-US">To change the width and height of a table, do one of the following:</paragraph> +<list type="unordered"> +<listitem> +<paragraph id="par_id5366679" role="paragraph" xml-lang="en-US">Click inside the table. In the rulers, drag the border between the white and the gray area to resize the table.</paragraph> +</listitem> +<listitem> +<paragraph id="par_id1279030" role="paragraph" xml-lang="en-US">Click inside the table. Choose <item type="menuitem">Table - Table Properties</item> to open a dialog and set the properties to the numbers.</paragraph> +</listitem></list> +<paragraph id="par_id5009308" role="tip" xml-lang="en-US">To wrap text to the sides of a table, and to arrange two tables next to another, you must insert the tables into a frame. Click inside the table, press <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A twice to select the whole table, then choose <emph>Insert - Frame</emph>.</paragraph> - <paragraph xml-lang="en-US" id="par_id4190496" role="note" l10n="NEW">Tables within HTML pages do not offer the full range of properties and commands as tables in OpenDocument format.</paragraph> - <embed href="text/shared/00/00000004.xhp#related"/> - <embed href="text/swriter/guide/tablemode.xhp#tablemode"/> - <embed href="text/swriter/guide/table_cells.xhp#table_cells"/> - <embed href="text/swriter/guide/table_cellmerge.xhp#table_cellmerge"/> - <embed href="text/swriter/guide/ruler.xhp#ruler"/> - </body> +<paragraph id="par_id4190496" role="note" xml-lang="en-US">Tables within HTML pages do not offer the full range of properties and commands as tables in OpenDocument format.</paragraph><embed href="text/shared/00/00000004.xhp#related"/><embed href="text/swriter/guide/tablemode.xhp#tablemode"/><embed href="text/swriter/guide/table_cells.xhp#table_cells"/><embed href="text/swriter/guide/table_cellmerge.xhp#table_cellmerge"/><embed href="text/swriter/guide/ruler.xhp#ruler"/> +</body> </helpdocument>
\ No newline at end of file diff --git a/helpcontent2/source/text/swriter/main0110.xhp b/helpcontent2/source/text/swriter/main0110.xhp index 597d8e1918..bc84c83fd7 100644 --- a/helpcontent2/source/text/swriter/main0110.xhp +++ b/helpcontent2/source/text/swriter/main0110.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ <paragraph role="heading" id="par_idN105E5" xml-lang="en-US" level="3" l10n="NEW">Rows</paragraph> <paragraph role="paragraph" id="par_idN105E8" xml-lang="en-US" l10n="NEW">Inserts rows.<comment>see also swriter/02/0409</comment></paragraph> <paragraph role="heading" id="par_idN105AF" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph> -<bookmark xml-lang="en-US" branch="hid/.uno:DeleteTable" id="bm_id276497" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/.uno:DeleteTable" id="bm_id7886898" localize="false"/><paragraph role="heading" id="par_idN1063E" xml-lang="en-US" level="3" l10n="NEW">Table</paragraph> <paragraph role="paragraph" id="par_idN1060A" xml-lang="en-US" l10n="NEW"><ahelp hid="20529">Deletes the current table.</ahelp></paragraph> <paragraph role="heading" id="par_idN1060D" xml-lang="en-US" level="3" l10n="NEW">Columns</paragraph> @@ -60,14 +60,13 @@ <paragraph role="heading" id="par_idN1066A" xml-lang="en-US" level="3" l10n="NEW">Rows</paragraph> <paragraph role="paragraph" id="par_idN10616" xml-lang="en-US" l10n="NEW">Deletes the selected rows.</paragraph> <paragraph role="heading" id="par_idN105B3" xml-lang="en-US" level="2" l10n="NEW">Select</paragraph> -<bookmark xml-lang="en-US" branch="hid/.uno:SelectTable" id="bm_id398795" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:SelectTable" id="bm_id3954588" localize="false"/><paragraph role="heading" id="par_idN10623" xml-lang="en-US" level="3" l10n="NEW">Table</paragraph> -<paragraph role="paragraph" id="par_idN10626" xml-lang="en-US" l10n="NEW"><ahelp hid="20515">Selects the current table.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN10626" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Selects the current table.</ahelp></paragraph> <paragraph role="heading" id="par_idN10629" xml-lang="en-US" level="3" l10n="NEW">Column</paragraph> <paragraph role="paragraph" id="par_idN1062C" xml-lang="en-US" l10n="NEW">Selects the current column.</paragraph> <paragraph role="heading" id="par_idN1062F" xml-lang="en-US" level="3" l10n="NEW">Row</paragraph> <paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW">Selects the current row.</paragraph> -<bookmark xml-lang="en-US" branch="hid/.uno:EntireCell" id="bm_id6264534" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/.uno:EntireCell" id="bm_id6957914" localize="false"/><paragraph role="heading" id="par_idN10635" xml-lang="en-US" level="3" l10n="NEW">Cell</paragraph> <paragraph role="paragraph" id="par_idN10638" xml-lang="en-US" l10n="NEW"><ahelp hid="20530">Selects the current cell.</ahelp></paragraph> <paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/05100100.xhp">Merge Cells</link></paragraph> diff --git a/helpcontent2/source/text/swriter/main0203.xhp b/helpcontent2/source/text/swriter/main0203.xhp index 3c6d596cc9..8b0551d70e 100755 --- a/helpcontent2/source/text/swriter/main0203.xhp +++ b/helpcontent2/source/text/swriter/main0203.xhp @@ -1,10 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> - - +<?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,38 +24,22 @@ * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. * - ************************************************************************--> - -<helpdocument version="1.0"> + ************************************************************************ --> + <meta> <topic id="textswritermain0203xml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Picture Bar</title> -<filename>/text/swriter/main0203.xhp</filename> +<title xml-lang="en-US" id="tit">Picture Bar</title> +<filename>swriter/main0203.xhp</filename> </topic> -<history> -<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2005-07-19T14:09:20">converted from old format - fpe</lastedited> -</history> </meta> <body> <section id="objektleistegrafik"> <bookmark xml-lang="en-US" branch="hid/HID_GRAFIK_TOOLBOX" id="bm_id3154274" localize="false"/> -<paragraph role="heading" id="hd_id3154263" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/main0203.xhp" name="Picture Bar">Picture Bar</link></paragraph> -<paragraph role="paragraph" id="par_id3147756" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_GRAFIK_TOOLBOX">The <emph>Picture</emph> Bar contains functions for formatting and positioning selected bitmap graphics.</ahelp></paragraph> -</section> -<embed href="text/shared/02/24010000.xhp#filter"/> -<embed href="text/shared/02/24010000.xhp#syfilter"/> -<embed href="text/shared/02/24020000.xhp#grafikmodus"/> -<embed href="text/shared/02/24020000.xhp#sygrafikmodus"/> -<embed href="text/shared/02/colortoolbar.xhp#color"/> -<embed href="text/shared/02/24090000.xhp#transparenz"/> -<embed href="text/shared/02/24090000.xhp#sytransparenz"/> -<paragraph role="heading" id="hd_id3145606" xml-lang="en-US" level="2" l10n="U" oldref="12"><link href="text/swriter/01/05060300.xhp" name="Flip Vertically">Flip Vertically</link></paragraph> -<embed href="text/swriter/01/05060300.xhp#vertikaltext"/> -<paragraph role="heading" id="hd_id3145639" xml-lang="en-US" level="2" l10n="U" oldref="10"><link href="text/swriter/01/05060300.xhp" name="Flip Horizontally">Flip Horizontally</link></paragraph> -<embed href="text/swriter/01/05060300.xhp#horizontaltext"/> -<paragraph role="heading" id="hd_id3145673" xml-lang="en-US" level="2" l10n="U" oldref="14"><link href="text/swriter/01/05060000.xhp" name="Graphics Properties">Graphics Properties</link></paragraph> -<embed href="text/swriter/01/05060000.xhp#grafiktext"/> -<embed href="text/swriter/00/00000405.xhp#syeigenschaften"/> +<paragraph id="hd_id3154263" role="heading" xml-lang="en-US" level="1"><link href="text/swriter/main0203.xhp" name="Picture Bar">Picture Bar</link></paragraph> +<paragraph id="par_id3147756" role="paragraph" xml-lang="en-US"><ahelp hid="HID_GRAFIK_TOOLBOX">The <emph>Picture</emph> Bar contains functions for formatting and positioning selected bitmap graphics.</ahelp></paragraph> +</section><embed href="text/shared/02/24010000.xhp#filter"/><embed href="text/shared/02/24010000.xhp#syfilter"/><embed href="text/shared/02/24020000.xhp#grafikmodus"/><embed href="text/shared/02/24020000.xhp#sygrafikmodus"/><embed href="text/shared/02/colortoolbar.xhp#color"/><embed href="text/shared/02/24090000.xhp#transparenz"/><embed href="text/shared/02/24090000.xhp#sytransparenz"/> +<paragraph id="hd_id3145606" role="heading" xml-lang="en-US" level="2"><link href="text/swriter/01/05060300.xhp" name="Flip Vertically">Flip Vertically</link></paragraph><embed href="text/swriter/01/05060300.xhp#vertikaltext"/> +<paragraph id="hd_id3145639" role="heading" xml-lang="en-US" level="2"><link href="text/swriter/01/05060300.xhp" name="Flip Horizontally">Flip Horizontally</link></paragraph><embed href="text/swriter/01/05060300.xhp#horizontaltext"/> +<paragraph id="hd_id3145673" role="heading" xml-lang="en-US" level="2"><link href="text/swriter/01/05060000.xhp" name="Graphics Properties">Graphics Properties</link></paragraph><embed href="text/swriter/01/05060000.xhp#grafiktext"/><embed href="text/swriter/00/00000405.xhp#syeigenschaften"/> </body> -</helpdocument> +</helpdocument>
\ No newline at end of file diff --git a/helpcontent2/source/text/swriter/main0204.xhp b/helpcontent2/source/text/swriter/main0204.xhp index 330837c393..8e773b4883 100755 --- a/helpcontent2/source/text/swriter/main0204.xhp +++ b/helpcontent2/source/text/swriter/main0204.xhp @@ -43,12 +43,16 @@ <paragraph role="heading" id="hd_id3145587" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/swriter/main0204.xhp" name="Table Bar">Table Bar</link></paragraph> <paragraph role="paragraph" id="par_id3154252" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_TABLE_TOOLBOX">The <emph>Table </emph>Bar contains functions you need when working with tables. It appears when you move the cursor into a table.</ahelp></paragraph> </section> +<embed href="text/swriter/01/04150000.xhp#inserttable"/> +<embed href="text/swriter/00/00000404.xhp#sytabelle"/> <embed href="text/shared/02/03140000.xhp#linienstil"/> <embed href="text/shared/02/03140000.xhp#sylinienstil"/> - +<embed href="text/shared/02/03150000.xhp#linienfarbe"/> +<embed href="text/shared/02/03150000.xhp#sylinienfarbe"/> <embed href="text/shared/02/03130000.xhp#umrandung"/> <embed href="text/shared/02/03130000.xhp#syumrandung"/> - +<embed href="text/shared/02/02170000.xhp#absatzhintergrund"/> +<embed href="text/shared/02/02170000.xhp#syabsatzhintergrund"/> <paragraph role="heading" id="hd_id3147592" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/01/05100100.xhp" name="Merge Cells">Merge Cells</link></paragraph> <embed href="text/shared/01/05100100.xhp#verbindentext"/> <embed href="text/shared/01/05100100.xhp#syzellenverbinden"/> @@ -56,7 +60,9 @@ <embed href="text/shared/01/05100200.xhp#syzellenteilen"/> <embed href="text/shared/02/04210000.xhp#optimieren"/> <embed href="text/shared/02/04210000.xhp#syoptimieren"/> - +<embed href="text/shared/01/05100500.xhp#oben"/> +<embed href="text/shared/01/05100600.xhp#mitte"/> +<embed href="text/shared/01/05100700.xhp#unten"/> <embed href="text/swriter/02/04090000.xhp#zeileeinfuegen"/> <embed href="text/swriter/02/04090000.xhp#syzeileeinfuegen"/> <embed href="text/swriter/02/04100000.xhp#spalteeinfuegen"/> @@ -66,18 +72,15 @@ <embed href="text/swriter/00/00000405.xhp#syzeileloeschen"/> <paragraph role="heading" id="hd_id3147231" xml-lang="en-US" level="2" l10n="U" oldref="10"><link href="text/swriter/01/05120500.xhp" name="Delete Column">Delete Column</link></paragraph> <embed href="text/swriter/01/05120500.xhp#loeschentext"/> - -<embed href="text/swriter/02/04220000.xhp#tabellefix"/> -<embed href="text/swriter/02/04220000.xhp#sytabellefix"/> -<embed href="text/swriter/02/04230000.xhp#tabellefixprop"/> -<embed href="text/swriter/02/04230000.xhp#sytabellefixprop"/> -<embed href="text/swriter/02/04240000.xhp#tabellevariabel"/> -<embed href="text/swriter/02/04240000.xhp#sytabellevariabel"/> <embed href="text/swriter/00/00000405.xhp#syspalteloeschen"/> -<embed href="text/shared/02/02170000.xhp#absatzhintergrund"/> -<embed href="text/shared/02/02170000.xhp#syabsatzhintergrund"/> +<comment>following only optional, ext.help is available: Select Table Select Column Select Row</comment> +<paragraph role="heading" id="hd_id943333820" xml-lang="en-US" level="2" l10n="NEW"><link href="text/swriter/01/05150101.xhp" name="AutoFormat">AutoFormat</link></paragraph> +<embed href="text/swriter/01/05150101.xhp#autoformattabelle"/> +<paragraph role="heading" id="hd_id947820" xml-lang="en-US" level="2" l10n="NEW"><link href="text/swriter/01/05090000.xhp" name="Table Properties">Table Properties</link></paragraph> +<embed href="text/swriter/01/05090000.xhp#tabelletext"/> +<paragraph role="heading" id="hd_id94007820" xml-lang="en-US" level="2" l10n="NEW"><link href="text/swriter/01/06100000.xhp" name="Sort">Sort</link></paragraph> +<embed href="text/swriter/01/06100000.xhp#sort"/> <embed href="text/swriter/02/04250000.xhp#summe"/> <embed href="text/swriter/02/04250000.xhp#sysumme"/> - </body> </helpdocument> diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk index b389c418c3..8cc7286ac7 100644 --- a/helpcontent2/util/sbasic/makefile.mk +++ b/helpcontent2/util/sbasic/makefile.mk @@ -1154,6 +1154,7 @@ LINKLINKFILES= \ text$/shared$/guide$/xsltfilter_distribute.xhp \ text$/shared$/main0108.xhp \ text$/shared$/main0201.xhp \ + text$/shared$/main0204.xhp \ text$/shared$/main0208.xhp \ text$/shared$/main0209.xhp \ text$/shared$/main0212.xhp \ diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk index e44424f8ee..234bbc7a44 100644 --- a/helpcontent2/util/scalc/makefile.mk +++ b/helpcontent2/util/scalc/makefile.mk @@ -1167,6 +1167,7 @@ LINKLINKFILES= \ text$/shared$/guide$/xsltfilter_distribute.xhp \ text$/shared$/main0108.xhp \ text$/shared$/main0201.xhp \ + text$/shared$/main0204.xhp \ text$/shared$/main0208.xhp \ text$/shared$/main0209.xhp \ text$/shared$/main0212.xhp \ diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk index af7502bc5f..25805c51c4 100644 --- a/helpcontent2/util/schart/makefile.mk +++ b/helpcontent2/util/schart/makefile.mk @@ -855,6 +855,7 @@ LINKLINKFILES= \ text$/shared$/guide$/xsltfilter_distribute.xhp \ text$/shared$/main0108.xhp \ text$/shared$/main0201.xhp \ + text$/shared$/main0204.xhp \ text$/shared$/main0208.xhp \ text$/shared$/main0209.xhp \ text$/shared$/main0212.xhp \ diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk index 5a29e0315e..cce9a418ad 100644 --- a/helpcontent2/util/sdatabase/makefile.mk +++ b/helpcontent2/util/sdatabase/makefile.mk @@ -853,6 +853,7 @@ LINKLINKFILES= \ text$/shared$/guide$/xsltfilter_distribute.xhp \ text$/shared$/main0108.xhp \ text$/shared$/main0201.xhp \ + text$/shared$/main0204.xhp \ text$/shared$/main0208.xhp \ text$/shared$/main0209.xhp \ text$/shared$/main0212.xhp \ diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk index b216372f3b..9c38a6810b 100644 --- a/helpcontent2/util/sdraw/makefile.mk +++ b/helpcontent2/util/sdraw/makefile.mk @@ -1088,6 +1088,7 @@ LINKLINKFILES= \ text$/shared$/guide$/xsltfilter_distribute.xhp \ text$/shared$/main0108.xhp \ text$/shared$/main0201.xhp \ + text$/shared$/main0204.xhp \ text$/shared$/main0208.xhp \ text$/shared$/main0209.xhp \ text$/shared$/main0212.xhp \ diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk index 494cd75032..864768854b 100644 --- a/helpcontent2/util/simpress/makefile.mk +++ b/helpcontent2/util/simpress/makefile.mk @@ -1090,6 +1090,7 @@ LINKLINKFILES= \ text$/shared$/guide$/xsltfilter_distribute.xhp \ text$/shared$/main0108.xhp \ text$/shared$/main0201.xhp \ + text$/shared$/main0204.xhp \ text$/shared$/main0208.xhp \ text$/shared$/main0209.xhp \ text$/shared$/main0212.xhp \ diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk index fc8767572b..3199c0ec41 100644 --- a/helpcontent2/util/smath/makefile.mk +++ b/helpcontent2/util/smath/makefile.mk @@ -933,6 +933,7 @@ LINKLINKFILES= \ text$/shared$/guide$/xsltfilter_distribute.xhp \ text$/shared$/main0108.xhp \ text$/shared$/main0201.xhp \ + text$/shared$/main0204.xhp \ text$/shared$/main0208.xhp \ text$/shared$/main0209.xhp \ text$/shared$/main0212.xhp \ diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk index 63c3df0e3f..56f99bdaae 100644 --- a/helpcontent2/util/swriter/makefile.mk +++ b/helpcontent2/util/swriter/makefile.mk @@ -1245,6 +1245,7 @@ LINKLINKFILES= \ text$/shared$/guide$/xsltfilter_distribute.xhp \ text$/shared$/main0108.xhp \ text$/shared$/main0201.xhp \ + text$/shared$/main0204.xhp \ text$/shared$/main0208.xhp \ text$/shared$/main0209.xhp \ text$/shared$/main0212.xhp \ |