[Libreoffice-commits] .: 2 commits - source/text

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Jan 24 13:35:13 PST 2013 

 source/text/swriter/01/05040500.xhp |    5 +----
 source/text/swriter/01/05090200.xhp |   35 ++++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 21 deletions(-)

New commits:
commit f2d63b153483caab5009d0d4d2eab9a1bac77f82
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 24 21:34:08 2013 +0000

    update help ids for table column page .ui conversion
    
    and point the over all tab page help to the right help
    page

diff --git a/source/text/swriter/01/05090200.xhp b/source/text/swriter/01/05090200.xhp
index a567d8c..9a1e9a4 100644
--- a/source/text/swriter/01/05090200.xhp
+++ b/source/text/swriter/01/05090200.xhp
@@ -32,37 +32,38 @@
 </meta>
 <body>
 <section id="spalten">
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tablecolumnpage/TableColumnPage" id="bm_id7831292" localize="false"/>
 <paragraph role="heading" id="hd_id3150756" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05090200.xhp" name="Columns">Columns</link></paragraph>
 <paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="2">Specify the column width properties.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/swriter/00/00000405.xhp#spaltentab"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_COLUMN:CB_MOD_TBL" id="bm_id3154273" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tablecolumnpage/adaptwidth" id="bm_id3154273" localize="false"/>
 <paragraph role="heading" id="hd_id3147510" xml-lang="en-US" level="2" l10n="U" oldref="3">Adapt table width</paragraph>
-<paragraph role="paragraph" id="par_id3154280" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:CHECKBOX:TP_TABLE_COLUMN:CB_MOD_TBL">Maintains the current width of the table when you change the width of a column.</ahelp> This option is not available if <emph>Automatic</emph> is selected in the <emph>Alignment </emph>area on the <emph>Table </emph>tab.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_TABLE_COLUMN:CB_PROP" id="bm_id3149809" localize="false"/>
+<paragraph role="paragraph" id="par_id3154280" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="modules/swriter/ui/tablecolumnpage/adaptwidth">Maintains the current width of the table when you change the width of a column.</ahelp> This option is not available if <emph>Automatic</emph> is selected in the <emph>Alignment </emph>area on the <emph>Table </emph>tab.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tablecolumnpage/adaptcolumns" id="bm_id3149809" localize="false"/>
 <paragraph role="heading" id="hd_id3145587" xml-lang="en-US" level="2" l10n="U" oldref="5">Adjust columns proportionally</paragraph>
-<paragraph role="paragraph" id="par_id3153530" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_TABLE_COLUMN:CB_PROP">Resizes the table width in relation to the column width that you enter.</ahelp> This option is not available if <emph>Automatic</emph> is selected in the <emph>Alignment </emph>area on the <emph>Table </emph>tab.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:ED_SPACE" id="bm_id3154564" localize="false"/>
+<paragraph role="paragraph" id="par_id3153530" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="modules/swriter/ui/tablecolumnpage/adaptcolumns">Resizes the table width in relation to the column width that you enter.</ahelp> This option is not available if <emph>Automatic</emph> is selected in the <emph>Alignment </emph>area on the <emph>Table </emph>tab.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tablecolumnpage/space-nospin" id="bm_id3154564" localize="false"/>
 <paragraph role="heading" id="hd_id3150349" xml-lang="en-US" level="2" l10n="U" oldref="7">Remaining space</paragraph>
-<paragraph role="paragraph" id="par_id3154571" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:METRICFIELD:TP_TABLE_COLUMN:ED_SPACE">Displays the amount of space that is available for adjusting the width of the columns. To set the width of the table, click the <emph>Table </emph>tab.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154571" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="modules/swriter/ui/tablecolumnpage/space-nospin">Displays the amount of space that is available for adjusting the width of the columns. To set the width of the table, click the <emph>Table </emph>tab.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154476" xml-lang="en-US" level="2" l10n="U" oldref="9">Column width</paragraph>
 <paragraph role="paragraph" id="par_id3150976" xml-lang="en-US" l10n="U" oldref="10">Specify the column widths for the table.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_1" id="bm_id3149690" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_2" id="bm_id3149694" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_3" id="bm_id3154188" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_4" id="bm_id3154193" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_5" id="bm_id3154197" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_TABLE_COLUMN:COL_MF_6" id="bm_id3154202" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tablecolumnpage/width1" id="bm_id3149690" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tablecolumnpage/width2" id="bm_id3149694" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tablecolumnpage/width3" id="bm_id3154188" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tablecolumnpage/width4" id="bm_id3154193" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tablecolumnpage/width5" id="bm_id3154197" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tablecolumnpage/width6" id="bm_id3154202" localize="false"/>
 <paragraph role="heading" id="hd_id3155899" xml-lang="en-US" level="3" l10n="U" oldref="11">Column widths</paragraph>
-<paragraph role="paragraph" id="par_id3159193" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:METRICFIELD:TP_TABLE_COLUMN:COL_MF_6">Enter the width that you want for the column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_DOWN" id="bm_id3149487" localize="false"/>
+<paragraph role="paragraph" id="par_id3159193" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="modules/swriter/ui/tablecolumnpage/width6">Enter the width that you want for the column.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tablecolumnpage/back" id="bm_id3149487" localize="false"/>
 <paragraph role="heading" id="hd_id3155182" xml-lang="en-US" level="3" l10n="U" oldref="13">Left Arrow</paragraph>
-<paragraph role="paragraph" id="par_id3149494" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:IMAGEBUTTON:TP_TABLE_COLUMN:COL_BTN_DOWN">Displays the table columns found to the left of the current column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_UP" id="bm_id3149826" localize="false"/>
+<paragraph role="paragraph" id="par_id3149494" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="modules/swriter/ui/tablecolumnpage/back">Displays the table columns found to the left of the current column.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/tablecolumnpage/next" id="bm_id3149826" localize="false"/>
 <paragraph role="heading" id="hd_id3149814" xml-lang="en-US" level="3" l10n="U" oldref="15">Right Arrow</paragraph>
-<paragraph role="paragraph" id="par_id3149099" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:IMAGEBUTTON:TP_TABLE_COLUMN:COL_BTN_UP">Displays the table columns found to the right of the current column.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149099" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="modules/swriter/ui/tablecolumnpage/next">Displays the table columns found to the right of the current column.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/swriter/01/05090201.xhp#tabelle_tastatur"/>
 </body>
commit 8511f484d27b4b20e653c6db66df39a52643489f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 24 21:27:33 2013 +0000

    wrong help page for format->table->columns

diff --git a/source/text/swriter/01/05040500.xhp b/source/text/swriter/01/05040500.xhp
index 93b1141..61e612e 100644
--- a/source/text/swriter/01/05040500.xhp
+++ b/source/text/swriter/01/05040500.xhp
@@ -29,10 +29,7 @@
    <body>
       <section id="spalten">
 <bookmark xml-lang="en-US" branch="hid/.uno:FormatColumns" id="bm_id7831291" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:FormatColumns" id="bm_id3151243" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_TABLE_COLUMN" id="bm_id3150212" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SW_HID_COLUMN" id="bm_id3153246" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:PageColumnDialog" id="bm_id121220080934019" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:PageColumnDialog" id="bm_id1212200809342598" localize="false"/><comment>added two Help IDs, see i97180</comment>
 <paragraph xml-lang="en-US" id="hd_id3149875" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05040500.xhp" name="Columns">Columns</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id3151392" role="paragraph" l10n="U" oldref="2"><variable id="spaltentext"><ahelp hid="HID_COLUMN">Specifies the number of columns and the column layout for a page style, frame, or section.</ahelp>
@@ -133,4 +130,4 @@
          <embed href="text/shared/01/05030700.xhp#textflow"/>
       </section>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>

More information about the Libreoffice-commits mailing list