[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - helpcontent2/helpers helpcontent2/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Sep 25 06:31:07 PDT 2012


 helpcontent2/helpers/help_hid.lst               |   11 -----
 helpcontent2/source/text/shared/01/03010000.xhp |   46 +++++++-----------------
 2 files changed, 14 insertions(+), 43 deletions(-)

New commits:
commit 56b4bba69f7ba08e06faab3e00f59fa2eee698a5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 25 13:47:17 2012 +0100

    adapt zoom helpids to .ui names
    
    Change-Id: I01743d55f302015bb9a2085f75b3bb9467f97e63

diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index 5b87ebb..0e14258 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -8162,7 +8162,6 @@ svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_REMOVEINFO,1242498070,
 svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_SAVESENDDOCS,1242498061,
 svx_CheckBox_RID_SVXDLG_SECURITY_OPTIONS_CB_SIGNDOCS,1242498063,
 svx_CheckBox_RID_SVXDLG_SPELLCHECK_CB_CHECK_GRAMMAR,2311849014,
-svx_CheckBox_RID_SVXDLG_ZOOM_CHK_BOOK,1237582874,
 svx_CheckBox_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ACCESSIBILITY_TOOL,704807947,
 svx_CheckBox_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ANIMATED_GRAPHICS,704807943,
 svx_CheckBox_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ANIMATED_TEXTS,704807944,
@@ -8670,8 +8669,6 @@ svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_DISTANCE,3386595841,
 svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_SHADOW_X,3386595843,
 svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_SHADOW_Y,3386595844,
 svx_MetricField_RID_SVXDLG_FONTWORK_MTR_FLD_TEXTSTART,3386595842,
-svx_MetricField_RID_SVXDLG_ZOOM_ED_COLUMNS,1237588505,
-svx_MetricField_RID_SVXDLG_ZOOM_ED_USER,1237588500,
 svx_MetricField_RID_SVXFLOAT_3D_MTR_BACKSCALE,3388496416,
 svx_MetricField_RID_SVXFLOAT_3D_MTR_DEPTH,3388496420,
 svx_MetricField_RID_SVXFLOAT_3D_MTR_DISTANCE,3388496436,
@@ -9110,14 +9107,6 @@ svx_RadioButton_RID_SVXDLG_SEARCHFORM_RB_SEARCHFORTEXT,1368769027,
 svx_RadioButton_RID_SVXDLG_SEARCHFORM_RB_SINGLEFIELD,1368769026,
 svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_COLUMNS,2311651898,
 svx_RadioButton_RID_SVXDLG_SEARCH_RB_CALC_ROWS,2311651897,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_100,1237582354,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_AUTOMATIC,1237582358,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_COLUMNS,1237582360,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_OPTIMAL,1237582351,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_PAGE_WIDTH,1237582353,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_SINGLE,1237582359,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_USER,1237582355,
-svx_RadioButton_RID_SVXDLG_ZOOM_BTN_WHOLE_PAGE,1237582352,
 svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_CENTERALIGN,703775264,
 svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_JUSTIFYALIGN,703775265,
 svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_LEFTALIGN,703775262,
diff --git a/helpcontent2/source/text/shared/01/03010000.xhp b/helpcontent2/source/text/shared/01/03010000.xhp
index 13d0204..d9bf5b9 100644
--- a/helpcontent2/source/text/shared/01/03010000.xhp
+++ b/helpcontent2/source/text/shared/01/03010000.xhp
@@ -44,7 +44,7 @@
          <bookmark_value>screen; scaling</bookmark_value>
          <bookmark_value>pages; scaling</bookmark_value>
 </bookmark><comment>mw deleted "scaling;"</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:Zoom" id="bm_id2031101" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/ZoomDialog" id="bm_id2031101" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Zoom" id="bm_id3153321" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3154682" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/03010000.xhp">Zoom & View Layout</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id3149578" role="paragraph" l10n="U" oldref="2"><variable id="massstabtext"><ahelp hid=".uno:Zoom">Reduces or enlarges the screen display of %PRODUCTNAME.</ahelp>
@@ -56,66 +56,49 @@
       <paragraph xml-lang="en-US" id="par_id3149655" role="note" l10n="CHG" oldref="26">Zooming is handled differently on Unix, Linux, and Windows platforms. A document saved with a 100% zoom factor in Windows is displayed at a larger zoom factor on Unix/Linux platforms. To change the zoom factor, double-click or right-click the percentage value on the <emph>Status</emph> bar, and select the zoom factor that you want.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id3149669" role="heading" level="2" l10n="U" oldref="3">Zoom factor</paragraph>
       <paragraph xml-lang="en-US" id="par_id3154389" role="paragraph" l10n="CHG" oldref="4">Set the zoom factor at which to display the current document and all documents of the same type that you open thereafter.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL" id="bm_id3145606" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/optimal" id="bm_id3145606" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_OPTIMAL" id="bm_id3150498" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153351" role="heading" level="2" l10n="U"
                  oldref="20">Optimal</paragraph>
       <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_MNU_ZOOM_OPTIMAL"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width of the selected cell area at the moment the command is started.
 </caseinline><defaultinline>Resizes the display to fit the width of the text in the document at .</defaultinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE" id="bm_id3150359" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/fitwandh" id="bm_id3150359" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_WHOLE_PAGE" id="bm_id3150358" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3151210" role="heading" level="2" l10n="CHG"
                  oldref="22">Fit width and height</paragraph>
       <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_MNU_ZOOM_WHOLE_PAGE"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width and height of the selected cell area at the moment the command is started.
 </caseinline><defaultinline>Displays the entire page on your screen.</defaultinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH" id="bm_id3148797" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/fitw" id="bm_id3148797" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_PAGE_WIDTH" id="bm_id3154140" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3152771" role="heading" level="2" l10n="CHG"
                  oldref="24">Fit width</paragraph>
       <paragraph xml-lang="en-US" id="par_id3143231" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_MNU_ZOOM_PAGE_WIDTH">Displays the complete width of the document page. The top and bottom edges of the page may not be visible.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_200" id="bm_id3156280" localize="false"/>
-<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_200 -->
-<bookmark xml-lang="en-US" branch="hid/SID_VIEW200" id="bm_id4566280" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3159151" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="." visibility="hidden">Displays the document at two times its actual size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_150" id="bm_id3148676" localize="false"/>
-<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_150 -->
-<paragraph xml-lang="en-US" id="par_id3145173" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="." visibility="hidden">Displays the document at one and a half times its actual size.</ahelp></paragraph>
       <section id="hdrt">
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_100" id="bm_id3149560" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:View100" id="bm_id3159252" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100" id="bm_id051420080349501" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/100pc" id="bm_id051420080349501" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153106" role="heading" level="2" l10n="U" oldref="9">100 %</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3147353" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_100">Displays the document at its actual size.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3147353" role="paragraph" l10n="U" oldref="10"><ahelp hid="cui/ui/zoomdialog/100pc">Displays the document at its actual size.</ahelp></paragraph>
       </section>
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_75" id="bm_id3159199" localize="false"/>
-<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_75 -->
-<paragraph xml-lang="en-US" id="par_id3152791" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="." visibility="hidden">Displays the document at 75% of its actual size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_50" id="bm_id3150488" localize="false"/>
-<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_50 -->
-<bookmark xml-lang="en-US" branch="hid/SID_VIEW050" id="bm_id765488" localize="false"/>
-
-<paragraph xml-lang="en-US" id="par_id3156005" role="paragraph" l10n="CHG" oldref="14"><ahelp hid="." visibility="hidden">Displays the document at half of its actual size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER" id="bm_id3147478" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXDLG_ZOOM:ED_USER" id="bm_id3151352" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXDLG_ZOOM_ED_USER" id="bm_id1551561" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_USER" id="bm_id2212897" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/variable" id="bm_id3147478" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/zoomsb" id="bm_id3151352" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153191" role="heading" level="2" l10n="U"
                  oldref="15">Variable</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3159125" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_ZOOM:ED_USER">Enter the zoom factor at which you want to display the document. Enter a percentage in the box.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159125" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="cui/ui/zoomdialog/zoomsb">Enter the zoom factor at which you want to display the document. Enter a percentage in the box.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="hd_id7319864" role="heading" level="2" l10n="NEW">View layout</paragraph>
       <paragraph xml-lang="en-US" id="par_id3423871" role="paragraph" l10n="NEW">For text documents, you can set the view layout. Reduce the zoom factor to see the effects of different view layout settings.<comment>for this doc or all docs? answer: it's the same as before for the zoom factor.</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_AUTOMATIC" id="bm_id2504654" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/automatic" id="bm_id2504654" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3818475" role="heading" level="2" l10n="NEW">Automatic</paragraph>
       <paragraph xml-lang="en-US" id="par_id3187353" role="paragraph" l10n="NEW"><ahelp hid=".">The automatic view layout displays pages side by side, as many as the zoom factor allows.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_SINGLE" id="bm_id5292519" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/singlepage" id="bm_id5292519" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id8455153" role="heading" level="2" l10n="NEW">Single page</paragraph>
       <paragraph xml-lang="en-US" id="par_id9912411" role="paragraph" l10n="NEW"><ahelp hid=".">The single page view layout displays pages beneath each other, but never side by side.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_RADIOBUTTON_RID_SVXDLG_ZOOM_BTN_COLUMNS" id="bm_id3984496" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXDLG_ZOOM_ED_COLUMNS" id="bm_id9693899" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/columns" id="bm_id3984496" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/columnssb" id="bm_id9693899" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id9204992" role="heading" level="2" l10n="NEW">Columns</paragraph>
       <paragraph xml-lang="en-US" id="par_id1993774" role="paragraph" l10n="NEW"><ahelp hid=".">In columns view layout you see pages in a given number of columns side by side. Enter the number of columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SVXDLG_ZOOM_CHK_BOOK" id="bm_id8689230" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/zoomdialog/bookmode" id="bm_id8689230" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id2949919" role="heading" level="2" l10n="NEW">Book mode</paragraph>
       <paragraph xml-lang="en-US" id="par_id2355113" role="paragraph" l10n="NEW"><ahelp hid=".">In book mode view layout you see two pages side by side as in an open book. The first page is a right page with an odd page number.</ahelp></paragraph>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>


More information about the Libreoffice-commits mailing list