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

Caolán McNamara caolanm at redhat.com
Fri Jul 26 06:20:49 PDT 2013


 helpers/help_hid.lst               |   10 ----------
 source/text/scalc/01/12010000.xhp  |   18 +++++++++---------
 source/text/scalc/01/12010100.xhp  |   16 ++++++++--------
 source/text/shared/00/00000001.xhp |    9 ++-------
 4 files changed, 19 insertions(+), 34 deletions(-)

New commits:
commit 9d984456abaefb364a6b5f77928dfc14e2c571c1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 26 14:20:13 2013 +0100

    update help ids for databaserange define dialog .ui conversion
    
    Change-Id: I3a7453866fa4478d3102067f2b1f3e1d47ff241b

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 6757143..81b7dc0 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6266,10 +6266,6 @@ sc_CheckBox_RID_SCDLG_COL_OPT_BTN_DEFVAL,1494926337,
 sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND1,2568520705,
 sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND2,2568520715,
 sc_CheckBox_RID_SCDLG_CONDFORMAT_CBX_COND3,2568520725,
-sc_CheckBox_RID_SCDLG_DBNAMES_BTN_FORMAT,2567324695,
-sc_CheckBox_RID_SCDLG_DBNAMES_BTN_HEADER,2567324693,
-sc_CheckBox_RID_SCDLG_DBNAMES_BTN_SIZE,2567324694,
-sc_CheckBox_RID_SCDLG_DBNAMES_BTN_STRIPDATA,2567324696,
 sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_LAYOUT_EMPTY,1495401474,
 sc_CheckBox_RID_SCDLG_DPSUBTOTAL_OPT_CB_SHOW,1495401475,
 sc_CheckBox_RID_SCDLG_HIGHLIGHT_CHANGES_CB_HIGHLIGHT,2568963085,
@@ -6319,7 +6315,6 @@ sc_CheckBox_TP_VALIDATION_VALUES_CB_SHOWLIST,548275227,
 sc_CheckBox_TP_VALIDATION_VALUES_CB_SORTLIST,548275228,
 sc_CheckBox_TP_VALIDATION_VALUES_TSB_ALLOW_BLANKS,548275203,
 sc_ComboBox_RID_SCDLG_DAPIDATA_CB_OBJECT,1495355413,
-sc_ComboBox_RID_SCDLG_DBNAMES_ED_NAME,2567327755,
 sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_FIELDSEP,1494175749,
 sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_TEXTSEP,1494175751,
 sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL1,1493749792,
@@ -6338,7 +6333,6 @@ sc_Edit_RID_SCDLG_DAPISERVICE_ED_NAME,1495336973,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_PASSWD,1495336977,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_SOURCE,1495336971,
 sc_Edit_RID_SCDLG_DAPISERVICE_ED_USER,1495336975,
-sc_Edit_RID_SCDLG_DBNAMES_ED_DBAREA,2567325709,
 sc_Edit_RID_SCDLG_DPNUMGROUP_ED_BY,1495418883,
 sc_Edit_RID_SCDLG_DPNUMGROUP_ED_END,1495418882,
 sc_Edit_RID_SCDLG_DPNUMGROUP_ED_START,1495418881,
@@ -6367,7 +6361,6 @@ sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND2_1,2568531471,
 sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND2_2,2568531474,
 sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND3_1,2568531481,
 sc_ImageButton_RID_SCDLG_CONDFORMAT_RB_COND3_2,2568531484,
-sc_ImageButton_RID_SCDLG_DBNAMES_RB_DBAREA,2567335438,
 sc_ImageButton_RID_SCDLG_HIGHLIGHT_CHANGES_RB_ASSIGN,2568973840,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_OUTAREA,2567515672,
@@ -6433,7 +6426,6 @@ sc_ModalDialog_RID_SCDLG_RETYPEPASS_INPUT,1495678976,
 sc_ModalDialog_RID_SCDLG_STRINPUT,1493467136,
 sc_ModelessDialog_RID_SCDLG_SIMPLEREF,2568994816,
 sc_MoreButton_RID_SCDLG_AUTOFORMAT_BTN_MORE,1493545576,
-sc_MoreButton_RID_SCDLG_DBNAMES_BTN_MORE,2567336481,
 sc_MoreButton_RID_SCDLG_DPDATAFIELD_BTN_MORE,1495396868,
 sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465,
 sc_MoreButton_RID_SCDLG_PIVOT_LAYOUT_BTN_MORE,2567516676,
@@ -6457,8 +6449,6 @@ sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLMINE,1495585286,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLOTHERS,1495585287,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPMINE,1495585283,
 sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPOTHER,1495585284,
-sc_PushButton_RID_SCDLG_DBNAMES_BTN_ADD,2567328259,
-sc_PushButton_RID_SCDLG_DBNAMES_BTN_REMOVE,2567328260,
 sc_PushButton_RID_SCDLG_PIVOTSUBT_BTN_OPTIONS,1493832197,
 sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_OPTIONS,2567508486,
 sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_REMOVE,2567508485,
diff --git a/source/text/scalc/01/12010000.xhp b/source/text/scalc/01/12010000.xhp
index aece565..806c226 100644
--- a/source/text/scalc/01/12010000.xhp
+++ b/source/text/scalc/01/12010000.xhp
@@ -28,7 +28,7 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/.uno:DefineDBName" id="bm_id6632476" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DefineDBName" id="bm_id3147335" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/DefineDatabaseRangeDialog" id="bm_id3147335" localize="false"/>
 <paragraph role="heading" id="hd_id3157909" xml-lang="en-US" level="1" l10n="U" oldref="1">Define Database Range</paragraph>
 <paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="2"><variable id="bereichtext"><ahelp hid=".uno:DefineDBName">Defines a database range based on the selected cells in your sheet.</ahelp>
 </variable></paragraph>
@@ -36,19 +36,19 @@
 <section id="howtoget">
 <embed href="text/scalc/00/00000412.xhp#dbrbf"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/sc:ComboBox:RID_SCDLG_DBNAMES:ED_NAME" id="bm_id3150868" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/entry" id="bm_id3150868" localize="false"/>
 <paragraph role="heading" id="hd_id3156422" xml-lang="en-US" level="2" l10n="U" oldref="3">Name</paragraph>
-<paragraph role="paragraph" id="par_id3150770" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:COMBOBOX:RID_SCDLG_DBNAMES:ED_NAME">Enter a name for the database range that you want to define, or select an existing name from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_DBNAMES:ED_DBAREA" id="bm_id3155133" localize="false"/>
+<paragraph role="paragraph" id="par_id3150770" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/entry">Enter a name for the database range that you want to define, or select an existing name from the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/assign" id="bm_id3155133" localize="false"/>
 <paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="2" l10n="U" oldref="6">Range</paragraph>
-<paragraph role="paragraph" id="par_id3150441" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SC:EDIT:RID_SCDLG_DBNAMES:ED_DBAREA">Displays the selected cell range.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150441" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/assign">Displays the selected cell range.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
-<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_DBNAMES:BTN_ADD" id="bm_id3153951" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/add" id="bm_id3153951" localize="false"/>
 <paragraph role="heading" id="hd_id3153188" xml-lang="en-US" level="2" l10n="U" oldref="10">Add/Modify</paragraph>
-<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:PUSHBUTTON:RID_SCDLG_DBNAMES:BTN_ADD">Adds the selected cell range to the database range list, or modifies an existing database range.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/add">Adds the selected cell range to the database range list, or modifies an existing database range.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#loeschen"/>
-<bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_DBNAMES:BTN_MORE" id="bm_id3152596" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/more" id="bm_id3152596" localize="false"/>
 <paragraph role="heading" id="hd_id3150010" xml-lang="en-US" level="2" l10n="U" oldref="12">More >></paragraph>
-<paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_DBNAMES:BTN_MORE">Shows additional <link href="text/scalc/01/12010100.xhp" name="options">options</link>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/more">Shows additional <link href="text/scalc/01/12010100.xhp" name="options">options</link>.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/scalc/01/12010100.xhp b/source/text/scalc/01/12010100.xhp
index 7169c64..9e52d03 100644
--- a/source/text/scalc/01/12010100.xhp
+++ b/source/text/scalc/01/12010100.xhp
@@ -34,14 +34,14 @@
   
   
   <paragraph role="heading" level="1" id="hd_id3154760" l10n="U" xml-lang="en-US" oldref="1">Options</paragraph>
-  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_DBNAMES:BTN_HEADER" xml-lang="en-US" id="bm_id3150399" localize="false"/><paragraph role="heading" level="3" id="hd_id3153379" l10n="U" xml-lang="en-US" oldref="3">Contains column labels</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3148798" xml-lang="en-US" oldref="4"><ahelp hid="SC:CHECKBOX:RID_SCDLG_DBNAMES:BTN_HEADER" visibility="visible">Selected cell ranges contains labels.</ahelp></paragraph>
-  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_DBNAMES:BTN_SIZE" xml-lang="en-US" id="bm_id3156422" localize="false"/><paragraph role="heading" level="3" id="hd_id3153970" l10n="U" xml-lang="en-US" oldref="5">Insert or delete cells</paragraph>
-  <paragraph l10n="U" xml-lang="en-US" oldref="6" role="paragraph" id="par_id3154684"><ahelp hid="SC:CHECKBOX:RID_SCDLG_DBNAMES:BTN_SIZE" visibility="visible">Automatically inserts new rows and columns into the database range in your document when new records are added to the database.</ahelp> To manually update the database range, choose <emph>Data - Refresh</emph> <emph>Range</emph>.</paragraph>
-  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_DBNAMES:BTN_FORMAT" xml-lang="en-US" id="bm_id3151117" localize="false"/><paragraph role="heading" level="3" id="hd_id3153768" l10n="U" xml-lang="en-US" oldref="7">Keep formatting</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3147435" xml-lang="en-US" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCDLG_DBNAMES:BTN_FORMAT" visibility="visible">Applies the existing cell format of headers and first data row to the whole database range.</ahelp></paragraph>
-  <bookmark branch="hid/sc:CheckBox:RID_SCDLG_DBNAMES:BTN_STRIPDATA" xml-lang="en-US" id="bm_id3145748" localize="false"/><paragraph role="heading" level="3" id="hd_id3155856" l10n="U" xml-lang="en-US" oldref="9">Don't save imported data</paragraph>
-  <paragraph l10n="U" role="paragraph" id="par_id3153363" xml-lang="en-US" oldref="10"><ahelp hid="SC:CHECKBOX:RID_SCDLG_DBNAMES:BTN_STRIPDATA" visibility="visible">Only saves a reference to the database, and not the contents of the cells.</ahelp></paragraph>
+  <bookmark branch="hid/modules/scalc/ui/definedatabaserangedialog/ContainsColumnLabels" xml-lang="en-US" id="bm_id3150399" localize="false"/><paragraph role="heading" level="3" id="hd_id3153379" l10n="U" xml-lang="en-US" oldref="3">Contains column labels</paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3148798" xml-lang="en-US" oldref="4"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/ContainsColumnLabels" visibility="visible">Selected cell ranges contains labels.</ahelp></paragraph>
+  <bookmark branch="hid/modules/scalc/ui/definedatabaserangedialog/InsertOrDeleteCells" xml-lang="en-US" id="bm_id3156422" localize="false"/><paragraph role="heading" level="3" id="hd_id3153970" l10n="U" xml-lang="en-US" oldref="5">Insert or delete cells</paragraph>
+  <paragraph l10n="U" xml-lang="en-US" oldref="6" role="paragraph" id="par_id3154684"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/InsertOrDeleteCells" visibility="visible">Automatically inserts new rows and columns into the database range in your document when new records are added to the database.</ahelp> To manually update the database range, choose <emph>Data - Refresh</emph> <emph>Range</emph>.</paragraph>
+  <bookmark branch="hid/modules/scalc/ui/definedatabaserangedialog/KeepFormatting" xml-lang="en-US" id="bm_id3151117" localize="false"/><paragraph role="heading" level="3" id="hd_id3153768" l10n="U" xml-lang="en-US" oldref="7">Keep formatting</paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3147435" xml-lang="en-US" oldref="8"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/KeepFormatting" visibility="visible">Applies the existing cell format of headers and first data row to the whole database range.</ahelp></paragraph>
+  <bookmark branch="hid/modules/scalc/ui/definedatabaserangedialog/DontSaveImportedData" xml-lang="en-US" id="bm_id3145748" localize="false"/><paragraph role="heading" level="3" id="hd_id3155856" l10n="U" xml-lang="en-US" oldref="9">Don't save imported data</paragraph>
+  <paragraph l10n="U" role="paragraph" id="par_id3153363" xml-lang="en-US" oldref="10"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/DontSaveImportedData" visibility="visible">Only saves a reference to the database, and not the contents of the cells.</ahelp></paragraph>
   <paragraph role="heading" level="3" id="hd_id3147428" l10n="U" xml-lang="en-US" oldref="11">Source:</paragraph>
   <paragraph role="paragraph" id="par_id3148576" l10n="U" xml-lang="en-US" oldref="12">Displays information about the current database source and any existing operators.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3146976" l10n="U" xml-lang="en-US" oldref="13">More <<</paragraph>
diff --git a/source/text/shared/00/00000001.xhp b/source/text/shared/00/00000001.xhp
index b6fc06a..7c6da93 100644
--- a/source/text/shared/00/00000001.xhp
+++ b/source/text/shared/00/00000001.xhp
@@ -83,7 +83,7 @@
 <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_AUTOFORMAT:BTN_REMOVE" id="bm_id3153766" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/namerangesdialog/delete" id="bm_id3153839" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/managenamesdialog/delete" id="bm_id3150089" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_DBNAMES:BTN_REMOVE" id="bm_id3146120" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/delete" id="bm_id3146120" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SW_HID_MD_GLOS_DELETE" id="bm_id3148722" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optsortslist/delete" id="bm_id3152577" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_COLOR:BTN_DELETE" id="bm_id3156382" localize="false"/>
@@ -153,13 +153,8 @@
 <bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND2_2" id="bm_id3150519" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND3_2" id="bm_id3155532" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/managenamesdialog/assign" id="bm_id3159155" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_DBNAMES:RB_DBAREA" id="bm_id3149262" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/assignrb" id="bm_id3149262" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/rbfilterarea" id="bm_id3153190" localize="false"/>
-<!-- removed HID SC:IMAGEBUTTON:RID_SCDLG_FORMULA:RB_REF -->
-<!-- removed HID HID_SC_FAP_BTN_REF1 -->
-<!-- removed HID HID_SC_FAP_BTN_REF2 -->
-<!-- removed HID HID_SC_FAP_BTN_REF3 -->
-<!-- removed HID HID_SC_FAP_BTN_REF4 -->
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/rbcopyarea" id="bm_id3150010" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/rbcopyarea" id="bm_id3146985" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153760" role="heading" level="2" l10n="U"


More information about the Libreoffice-commits mailing list