[Libreoffice-commits] help.git: 2 commits - helpers/help_hid.lst source/text

Caolán McNamara caolanm at redhat.com
Wed Mar 6 06:53:03 PST 2013


 helpers/help_hid.lst               |    7 -------
 source/text/scalc/01/04070100.xhp  |   30 +++++++++++++++---------------
 source/text/shared/00/00000208.xhp |    8 ++++----
 3 files changed, 19 insertions(+), 26 deletions(-)

New commits:
commit 44a39c4833aef3499030d046f153bb1d27e84027
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 6 14:46:35 2013 +0000

    update help ids for define name widget .ui conversion
    
    Change-Id: I42a378b7e8ea6074939967efd634c3c9af9cbbc4

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 5311cf2..debf715 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6510,10 +6510,6 @@ sc_CheckBox_RID_SCDLG_INSCONT_BTN_SKIP_EMPTY,1493435425,
 sc_CheckBox_RID_SCDLG_INSCONT_BTN_TRANSPOSE,1493435426,
 sc_CheckBox_RID_SCDLG_LINKAREA_BTN_RELOAD,1495368714,
 sc_CheckBox_RID_SCDLG_MOVETAB_BTN_COPY,1493451781,
-sc_CheckBox_RID_SCDLG_NAMES_BTN_COLHEADER,2567308321,
-sc_CheckBox_RID_SCDLG_NAMES_BTN_CRITERIA,2567308319,
-sc_CheckBox_RID_SCDLG_NAMES_BTN_PRINTAREA,2567308320,
-sc_CheckBox_RID_SCDLG_NAMES_BTN_ROWHEADER,2567308322,
 sc_CheckBox_RID_SCDLG_NAMES_CREATE_BTN_BOTTOM,1494402053,
 sc_CheckBox_RID_SCDLG_NAMES_CREATE_BTN_LEFT,1494402050,
 sc_CheckBox_RID_SCDLG_NAMES_CREATE_BTN_RIGHT,1494402051,
@@ -6603,7 +6599,6 @@ sc_ComboBox_RID_SCDLG_FILTER_ED_VAL4,2567082024,
 sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_FIELDSEP,1494175749,
 sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_TEXTSEP,1494175751,
 sc_ComboBox_RID_SCDLG_LINKAREA_CB_URL,1495371781,
-sc_ComboBox_RID_SCDLG_NAMES_ED_NAME,2567311372,
 sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL1,1493749792,
 sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL2,1493749793,
 sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL3,1493749794,
@@ -6636,7 +6631,6 @@ sc_Edit_RID_SCDLG_FILLSERIES_ED_INCREMENT,1493518375,
 sc_Edit_RID_SCDLG_FILLSERIES_ED_START_VALUES,1493518388,
 sc_Edit_RID_SCDLG_FILTER_ED_COPY_AREA,2567079943,
 sc_Edit_RID_SCDLG_HIGHLIGHT_CHANGES_ED_ASSIGN,2568964111,
-sc_Edit_RID_SCDLG_NAMES_ED_ASSIGN,2567309327,
 sc_Edit_RID_SCDLG_NEWSCENARIO_ED_NAME,1493846027,
 sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT1,2569209860,
 sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT2,2569209861,
@@ -6825,7 +6819,6 @@ sc_MoreButton_RID_SCDLG_CONSOLIDATE_BTN_MORE,2567533060,
 sc_MoreButton_RID_SCDLG_DBNAMES_BTN_MORE,2567336481,
 sc_MoreButton_RID_SCDLG_DPDATAFIELD_BTN_MORE,1495396868,
 sc_MoreButton_RID_SCDLG_FILTER_BTN_MORE,2567090689,
-sc_MoreButton_RID_SCDLG_NAMES_BTN_MORE,2567320070,
 sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465,
 sc_MoreButton_RID_SCDLG_PIVOT_LAYOUT_BTN_MORE,2567516676,
 sc_MoreButton_RID_SCDLG_SPEC_FILTER_BTN_MORE,2567107073,
diff --git a/source/text/scalc/01/04070100.xhp b/source/text/scalc/01/04070100.xhp
index 2221143..0054da0 100644
--- a/source/text/scalc/01/04070100.xhp
+++ b/source/text/scalc/01/04070100.xhp
@@ -28,7 +28,7 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/.uno:DefineName" id="bm_id4757802" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DefineName" id="bm_id3155922" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definename/DefineNameDialog" id="bm_id3155922" localize="false"/>
 <paragraph role="heading" id="hd_id3156330" xml-lang="en-US" level="1" l10n="U" oldref="1">Define Names</paragraph>
 <paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="2"><variable id="namenfestlegentext"><ahelp hid=".uno:DefineName">Opens a dialog where you can specify a name for a selected area.</ahelp>
 </variable></paragraph>
@@ -37,31 +37,31 @@
 <embed href="text/scalc/00/00000404.xhp#einafe"/>
 </section>
 <paragraph role="paragraph" id="par_id3155131" xml-lang="en-US" l10n="U" oldref="30">The <emph>Sheet Area</emph> box on the Formula bar contains a list of defined names for the ranges. Click a name from this box to highlight the corresponding reference on the spreadsheet. Names given formulas or parts of a formula are not listed here.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_NAMES:ED_NAME" id="bm_id3151114" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definename/edit" id="bm_id3151114" localize="false"/>
 <paragraph role="heading" id="hd_id3151118" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
-<paragraph role="paragraph" id="par_id3163712" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SC:COMBOBOX:RID_SCDLG_NAMES:ED_NAME">Enter the name of the area for which you want to define a reference. All area names already defined in the spreadsheet are listed in the text field below.</ahelp> If you click a name on the list, the corresponding reference in the document will be shown with a blue frame. If multiple cell ranges belong to the same area name, they are displayed with different colored frames.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_NAMES:ED_ASSIGN" id="bm_id3145750" localize="false"/>
+<paragraph role="paragraph" id="par_id3163712" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="modules/scalc/ui/definename/edit">Enter the name of the area for which you want to define a reference. All area names already defined in the spreadsheet are listed in the text field below.</ahelp> If you click a name on the list, the corresponding reference in the document will be shown with a blue frame. If multiple cell ranges belong to the same area name, they are displayed with different colored frames.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definename/range" id="bm_id3145750" localize="false"/>
 <paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="2" l10n="U" oldref="9">Assigned to</paragraph>
-<paragraph role="paragraph" id="par_id3147435" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:EDIT:RID_SCDLG_NAMES:ED_ASSIGN">The reference of the selected area name is shown here as an absolute value.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147435" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="modules/scalc/ui/definename/range">The reference of the selected area name is shown here as an absolute value.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3146986" xml-lang="en-US" l10n="U" oldref="12">To insert a new area reference, place the cursor in this field and use your mouse to select the desired area in any sheet of your spreadsheet document.</paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
-<bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_NAMES:BTN_MORE" id="bm_id3148455" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definename/more" id="bm_id3148455" localize="false"/>
 <paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="2" l10n="U" oldref="13">More</paragraph>
-<paragraph role="paragraph" id="par_id3149958" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_NAMES:BTN_MORE">Allows you to specify the <emph>Area type </emph>(optional) for the reference.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149958" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="modules/scalc/ui/definename/more">Allows you to specify the <emph>Area type </emph>(optional) for the reference.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147394" xml-lang="en-US" level="3" l10n="U" oldref="15">Area type</paragraph>
 <paragraph role="paragraph" id="par_id3155416" xml-lang="en-US" l10n="U" oldref="16">Defines additional options related to the type of reference area.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA" id="bm_id3146972" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definename/printarea" id="bm_id3146972" localize="false"/>
 <paragraph role="heading" id="hd_id3150716" xml-lang="en-US" level="4" l10n="U" oldref="17">Print range</paragraph>
-<paragraph role="paragraph" id="par_id3150751" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SC:CHECKBOX:RID_SCDLG_NAMES:BTN_PRINTAREA">Defines the area as a print range.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA" id="bm_id3155446" localize="false"/>
+<paragraph role="paragraph" id="par_id3150751" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="modules/scalc/ui/definename/printarea">Defines the area as a print range.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definename/filter" id="bm_id3155446" localize="false"/>
 <paragraph role="heading" id="hd_id3153764" xml-lang="en-US" level="4" l10n="U" oldref="19">Filter</paragraph>
-<paragraph role="paragraph" id="par_id3155766" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SC:CHECKBOX:RID_SCDLG_NAMES:BTN_CRITERIA">Defines the selected area to be used in an <link href="text/scalc/01/12040300.xhp" name="advanced filter">advanced filter</link>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER" id="bm_id3147344" localize="false"/>
+<paragraph role="paragraph" id="par_id3155766" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="modules/scalc/ui/definename/filter">Defines the selected area to be used in an <link href="text/scalc/01/12040300.xhp" name="advanced filter">advanced filter</link>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definename/colheader" id="bm_id3147344" localize="false"/>
 <paragraph role="heading" id="hd_id3159267" xml-lang="en-US" level="4" l10n="U" oldref="21">Repeat column</paragraph>
-<paragraph role="paragraph" id="par_id3149565" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SC:CHECKBOX:RID_SCDLG_NAMES:BTN_COLHEADER">Defines the area as a repeating column.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER" id="bm_id3154021" localize="false"/>
+<paragraph role="paragraph" id="par_id3149565" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="modules/scalc/ui/definename/colheader">Defines the area as a repeating column.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definename/rowheader" id="bm_id3154021" localize="false"/>
 <paragraph role="heading" id="hd_id3153966" xml-lang="en-US" level="4" l10n="U" oldref="23">Repeat row</paragraph>
-<paragraph role="paragraph" id="par_id3150300" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SC:CHECKBOX:RID_SCDLG_NAMES:BTN_ROWHEADER">Defines the area as a repeating row.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150300" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="modules/scalc/ui/definename/rowheader">Defines the area as a repeating row.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_NAMES:BTN_ADD" id="bm_id3150207" localize="false"/>
 <paragraph role="heading" id="hd_id3155112" xml-lang="en-US" level="2" l10n="U" oldref="27">Add/Modify</paragraph>
 <paragraph role="paragraph" id="par_id3159236" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_NAMES:BTN_ADD">Click the <emph>Add</emph> button to add the defined name to the list. Click the <emph>Modify</emph> button to enter another name for an already existing name selected from the list.</ahelp></paragraph>
commit 08db61acb79ce9ead9fb4723a87eac199472ab29
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 6 14:40:37 2013 +0000

    doubled id names
    
    Change-Id: I9ab9a2f484131d94835eaf323bbe24771dffb5d1

diff --git a/source/text/shared/00/00000208.xhp b/source/text/shared/00/00000208.xhp
index b2a97be..daa51b7 100644
--- a/source/text/shared/00/00000208.xhp
+++ b/source/text/shared/00/00000208.xhp
@@ -78,11 +78,11 @@
 
 <paragraph role="heading" id="hd_id315538811" xml-lang="en-US" level="2" l10n="NEW">Other options</paragraph>
 <paragraph role="paragraph" id="par_id315366511" xml-lang="en-US" l10n="NEW">Sets some other import options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/textimportcsv/modules/scalc/ui/textimportcsv/charset" id="bm_id315790911" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/textimportcsv/charset" id="bm_id315790911" localize="false"/>
 <paragraph role="heading" id="hd_id314847411" xml-lang="en-US" level="3" l10n="NEW">Quoted fields as text</paragraph>
 <paragraph role="paragraph" id="par_id314995711" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When this option is enabled, fields or cells whose values are quoted in their entirety (the first and last characters of the value equal the text delimiter) are imported as text.</ahelp></paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/textimportcsv/modules/scalc/ui/textimportcsv/detectspecialnumbers" id="bm_id315790922" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/textimportcsv/detectspecialnumbers" id="bm_id315790922" localize="false"/>
 <paragraph role="heading" id="hd_id314847422" xml-lang="en-US" level="3" l10n="NEW">Detect special numbers</paragraph>
 <paragraph role="paragraph" id="par_id314995722" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When this option is enabled, Calc will automatically detect all number formats, including special number formats such as dates, time, and scientific notation.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id314995723" xml-lang="en-US" l10n="NEW">The selected language influences how such special numbers are detected, since different languages and regions many have different conventions for such special numbers.</paragraph>
@@ -92,8 +92,8 @@
 
 <paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="61">Fields</paragraph>
 <paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="62">Shows how your data will look when it is separated into columns.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/textimportcsv/modules/scalc/ui/textimportcsv/columntype" id="bm_id3157909" localize="false"/><paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="3" l10n="U" oldref="63">Column type</paragraph>
-<paragraph role="paragraph" id="par_id314995725" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="modules/scalc/ui/textimportcsv/modules/scalc/ui/textimportcsv/columntype">Choose a column in the preview window and select the data type to be applied the imported data.</ahelp> You can select one of the following options:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/textimportcsv/columntype" id="bm_id3157909" localize="false"/><paragraph role="heading" id="hd_id3148474" xml-lang="en-US" level="3" l10n="U" oldref="63">Column type</paragraph>
+<paragraph role="paragraph" id="par_id314995725" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="modules/scalc/ui/textimportcsv/columntype">Choose a column in the preview window and select the data type to be applied the imported data.</ahelp> You can select one of the following options:</paragraph>
 <table id="tbl_id3155179">
 <tablerow>
 <tablecell colspan="" rowspan="">


More information about the Libreoffice-commits mailing list