Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4961

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/61/4961/1

update help ids for advanced filter dialog .ui conversion

Change-Id: I3f4ed027caf18871f6642eb96c2f857d77cad242
---
M helpers/help_hid.lst
M source/text/scalc/01/12040201.xhp
M source/text/scalc/01/12040300.xhp
M source/text/shared/00/00000001.xhp
4 files changed, 20 insertions(+), 33 deletions(-)



diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 14816d7..f4d76ed 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6339,12 +6339,6 @@
 sc_CheckBox_RID_SCDLG_RETYPEPASS_INPUT_BTN_MATCH_OLD_PASSWORD,1495680305,
 sc_CheckBox_RID_SCDLG_ROW_MAN_BTN_DEFVAL,1494942721,
 sc_CheckBox_RID_SCDLG_ROW_OPT_BTN_DEFVAL,1494959105,
-sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_CASE,2567095298,
-sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_COPY_RESULT,2567095301,
-sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_DEST_PERS,2567095308,
-sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_HEADER,2567095300,
-sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_REGEXP,2567095299,
-sc_CheckBox_RID_SCDLG_SPEC_FILTER_BTN_UNIQUE,2567095297,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_CALC,957252625,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_CASE,957252623,
 sc_CheckBox_RID_SCPAGE_CALC_BTN_ITERATE,957252609,
@@ -6402,8 +6396,6 @@
 sc_Edit_RID_SCDLG_RETYPEPASS_INPUT_ED_PASSWORD1,1495681326,
 sc_Edit_RID_SCDLG_RETYPEPASS_INPUT_ED_PASSWORD2,1495681328,
 sc_Edit_RID_SCDLG_SIMPLEREF_ED_ASSIGN,2568996875,
-sc_Edit_RID_SCDLG_SPEC_FILTER_ED_COPY_AREA,2567096327,
-sc_Edit_RID_SCDLG_SPEC_FILTER_ED_CRITERIA_AREA,2567096372,
 sc_Edit_RID_SCDLG_STRINPUT_ED_INPUT,1493469194,
 sc_Edit_RID_SCDLG_TABOP_ED_COLCELL,2567899139,
 sc_Edit_RID_SCDLG_TABOP_ED_FORMULARANGE,2567899137,
@@ -6432,8 +6424,6 @@
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_OUTAREA,2567515672,
 sc_ImageButton_RID_SCDLG_SIMPLEREF_RB_ASSIGN,2569006604,
-sc_ImageButton_RID_SCDLG_SPEC_FILTER_RB_COPY_AREA,2567106056,
-sc_ImageButton_RID_SCDLG_SPEC_FILTER_RB_CRITERIA_AREA,2567106101,
 sc_ImageButton_RID_SCDLG_TABOP_RB_COLCELL,2567908867,
 sc_ImageButton_RID_SCDLG_TABOP_RB_FORMULARANGE,2567908865,
 sc_ImageButton_RID_SCDLG_TABOP_RB_ROWCELL,2567908866,
@@ -6493,8 +6483,6 @@
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_OP1,1493749275,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_OP2,1493749276,
 sc_ListBox_RID_SCDLG_PIVOT_LAYOUT_LB_OUTAREA,2567507478,
-sc_ListBox_RID_SCDLG_SPEC_FILTER_LB_COPY_AREA,2567097862,
-sc_ListBox_RID_SCDLG_SPEC_FILTER_LB_CRITERIA_AREA,2567097907,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974,
@@ -6521,7 +6509,6 @@
 sc_MoreButton_RID_SCDLG_FILTER_BTN_MORE,2567090689,
 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,
 sc_MultiLineEdit_RID_SCDLG_NEWSCENARIO_ED_COMMENT,1493846541,
 sc_MultiLineEdit_TP_VALIDATION_ERROR_EDT_ERROR,548309529,
 sc_MultiLineEdit_TP_VALIDATION_INPUTHELP_EDT_INPUTHELP,548293135,
diff --git a/source/text/scalc/01/12040201.xhp b/source/text/scalc/01/12040201.xhp
index 54e683d..11ca7af 100644
--- a/source/text/scalc/01/12040201.xhp
+++ b/source/text/scalc/01/12040201.xhp
@@ -29,40 +29,40 @@
 <body>
 <paragraph role="heading" id="hd_id3148492" xml-lang="en-US" level="1" l10n="U" oldref="1"><link 
href="text/scalc/01/12040201.xhp" name="More">More</link></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_FILTER:BTN_MORE" id="bm_id3152350" 
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:MoreButton:RID_SCDLG_SPEC_FILTER:BTN_MORE" 
id="bm_id3156023" localize="false"/>
-<paragraph role="paragraph" id="par_id3159400" xml-lang="en-US" l10n="U" oldref="2"><variable 
id="zusaetzetext"><ahelp hid="SC:MOREBUTTON:RID_SCDLG_SPEC_FILTER:BTN_MORE">Shows additional filter 
options.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/more" 
id="bm_id3156023" localize="false"/>
+<paragraph role="paragraph" id="par_id3159400" xml-lang="en-US" l10n="U" oldref="2"><variable 
id="zusaetzetext"><ahelp hid="modules/scalc/ui/advancedfilterdialog/more">Shows additional filter 
options.</ahelp>
 </variable></paragraph>
 <section id="howtoget">
 <embed href="text/scalc/00/00000412.xhp#filterzus"/>
 </section>
 <paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="2" l10n="U" 
oldref="3">Options</paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_FILTER:BTN_CASE" id="bm_id3151210" 
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_CASE" 
id="bm_id3150871" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/case" 
id="bm_id3150871" localize="false"/>
 <paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="3" l10n="U" oldref="5">Case 
sensitive</paragraph>
-<paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="6"><ahelp 
hid="SC:CHECKBOX:RID_SCDLG_SPEC_FILTER:BTN_CASE">Distinguishes between uppercase and lowercase 
letters when filtering the data.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="6"><ahelp 
hid="modules/scalc/ui/advancedfilterdialog/case">Distinguishes between uppercase and lowercase 
letters when filtering the data.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_FILTER:BTN_HEADER" id="bm_id3153968" 
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_HEADER" 
id="bm_id3145173" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/header" 
id="bm_id3145173" localize="false"/>
 <paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="3" l10n="U" oldref="7">Range 
contains column labels</paragraph>
-<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="8"><ahelp 
hid="SC:CHECKBOX:RID_SCDLG_SPEC_FILTER:BTN_HEADER">Includes the column labels in the first row of a 
cell range.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="8"><ahelp 
hid="modules/scalc/ui/advancedfilterdialog/header">Includes the column labels in the first row of a 
cell range.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_FILTER:BTN_COPY_RESULT" 
id="bm_id3147426" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_COPY_RESULT" 
id="bm_id3148576" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/copyresult" 
id="bm_id3148576" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_FILTER:LB_COPY_AREA" id="bm_id3163713" 
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_COPY_AREA" 
id="bm_id3147349" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/lbcopyarea" 
id="bm_id3147349" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_FILTER:ED_COPY_AREA" id="bm_id3147348" 
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_SPEC_FILTER:ED_COPY_AREA" 
id="bm_id3153093" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/edcopyarea" 
id="bm_id3153093" localize="false"/>
 <paragraph role="heading" id="hd_id3155306" xml-lang="en-US" level="3" l10n="U" oldref="9">Copy 
results to</paragraph>
-<paragraph role="paragraph" id="par_id3154319" xml-lang="en-US" l10n="U" oldref="10"><ahelp 
hid="SC:EDIT:RID_SCDLG_SPEC_FILTER:ED_COPY_AREA">Select the check box, and then select the cell 
range where you want to display the filter results.</ahelp> You can also select a named range from 
the list.</paragraph>
+<paragraph role="paragraph" id="par_id3154319" xml-lang="en-US" l10n="U" oldref="10"><ahelp 
hid="modules/scalc/ui/advancedfilterdialog/edcopyarea">Select the check box, and then select the 
cell range where you want to display the filter results.</ahelp> You can also select a named range 
from the list.</paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_FILTER:BTN_REGEXP" id="bm_id3153726" 
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_REGEXP" 
id="bm_id3153144" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/regexp" 
id="bm_id3153144" localize="false"/>
 <paragraph role="heading" id="hd_id3145272" xml-lang="en-US" level="3" l10n="U" 
oldref="11">Regular expression</paragraph>
-<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="12"><ahelp 
hid="SC:CHECKBOX:RID_SCDLG_SPEC_FILTER:BTN_REGEXP">Allows you to use wildcards in the filter 
definition.</ahelp> For a list of the regular expressions that $[officename] supports, click <link 
href="text/shared/01/02100001.xhp" name="here">here</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="12"><ahelp 
hid="modules/scalc/ui/advancedfilterdialog/regexp">Allows you to use wildcards in the filter 
definition.</ahelp> For a list of the regular expressions that $[officename] supports, click <link 
href="text/shared/01/02100001.xhp" name="here">here</link>.</paragraph>
 <paragraph role="paragraph" id="par_id3149377" xml-lang="en-US" l10n="CHG" oldref="33">If the 
<emph>Regular Expressions</emph> check box is selected, you can use regular expressions in the 
Value field if the Condition list box is set to '=' EQUAL or '&lt;&gt;' UNEQUAL. This also applies 
to the respective cells that you reference for an advanced filter.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_FILTER:BTN_UNIQUE" id="bm_id3149410" 
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_UNIQUE" 
id="bm_id3147126" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/unique" 
id="bm_id3147126" localize="false"/>
 <paragraph role="heading" id="hd_id3149958" xml-lang="en-US" level="3" l10n="U" oldref="34">No 
duplication</paragraph>
-<paragraph role="paragraph" id="par_id3153876" xml-lang="en-US" l10n="U" oldref="35"><ahelp 
hid="SC:CHECKBOX:RID_SCDLG_SPEC_FILTER:BTN_UNIQUE">Excludes duplicate rows in the list of filtered 
data.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_DEST_PERS" 
id="bm_id3149403" localize="false"/>
+<paragraph role="paragraph" id="par_id3153876" xml-lang="en-US" l10n="U" oldref="35"><ahelp 
hid="modules/scalc/ui/advancedfilterdialog/unique">Excludes duplicate rows in the list of filtered 
data.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/destpers" 
id="bm_id3149403" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_FILTER:BTN_DEST_PERS" 
id="bm_id3149402" localize="false"/>
 <paragraph role="heading" id="hd_id3154018" xml-lang="en-US" level="3" l10n="U" oldref="40">Keep 
filter criteria</paragraph>
 <paragraph role="paragraph" id="par_id3149123" xml-lang="en-US" l10n="U" oldref="41"><ahelp 
hid="SC:CHECKBOX:RID_SCDLG_FILTER:BTN_DEST_PERS">Select the <emph>Copy results to</emph> check box, 
and then specify the destination range where you want to display the filtered data. If this box is 
checked, the destination range remains linked to the source range. You must have defined the source 
range under <emph>Data - Define range</emph> as a database range.</ahelp> Following this, you can 
reapply the defined filter at any time as follows: click into the source range, then choose 
<emph>Data - Refresh Range</emph>.</paragraph>
diff --git a/source/text/scalc/01/12040300.xhp b/source/text/scalc/01/12040300.xhp
index 7172d50..98b027d 100644
--- a/source/text/scalc/01/12040300.xhp
+++ b/source/text/scalc/01/12040300.xhp
@@ -38,10 +38,10 @@
 <paragraph role="paragraph" id="par_idN105EB" xml-lang="en-US" l10n="NEW">
 <embedvar href="text/scalc/guide/filters.xhp#filters"/>
 </paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_CRITERIA_AREA" 
id="bm_id3149664" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCDLG_SPEC_FILTER:ED_CRITERIA_AREA" 
id="bm_id3151113" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/lbfilterarea" 
id="bm_id3149664" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/edfilterarea" 
id="bm_id3151113" localize="false"/>
 <paragraph role="heading" id="hd_id3153771" xml-lang="en-US" level="2" l10n="U" oldref="25">Read 
filter criteria from</paragraph>
-<paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="26"><ahelp 
hid="SC:EDIT:RID_SCDLG_SPEC_FILTER:ED_CRITERIA_AREA">Select the named range, or enter the cell 
range that contains the filter criteria that you want to use.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="26"><ahelp 
hid="modules/scalc/ui/advancedfilterdialog/edfilterarea">Select the named range, or enter the cell 
range that contains the filter criteria that you want to use.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
 <paragraph role="heading" id="hd_id3153188" xml-lang="en-US" level="2" l10n="U" oldref="27"><link 
href="text/scalc/01/12040201.xhp" name="More">More</link></paragraph>
 <embed href="text/scalc/01/12040201.xhp#zusaetzetext"/>
diff --git a/source/text/shared/00/00000001.xhp b/source/text/shared/00/00000001.xhp
index e37b2ec..77d80e3 100644
--- a/source/text/shared/00/00000001.xhp
+++ b/source/text/shared/00/00000001.xhp
@@ -154,14 +154,14 @@
 <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/sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_CRITERIA_AREA" 
id="bm_id3153190" 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/sc:ImageButton:RID_SCDLG_FILTER:RB_COPY_AREA" 
id="bm_id3150010" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_COPY_AREA" 
id="bm_id3146985" 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"
                     oldref="47">Shrink / Maximize</paragraph>
          <paragraph xml-lang="en-US" id="par_id3153087" role="paragraph" l10n="U" 
oldref="48"><ahelp hid=".">Click the<emph> Shrink </emph>icon to reduce the dialog to the size of 
the input field. It is then easier to mark the required reference in the sheet. The icons then 
automatically convert to the <emph>Maximize</emph> icon. Click it to restore the dialog to its 
original size.</ahelp></paragraph>

-- 
To view, visit https://gerrit.libreoffice.org/4961
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f4ed027caf18871f6642eb96c2f857d77cad242
Gerrit-PatchSet: 1
Gerrit-Project: help
Gerrit-Branch: master
Gerrit-Owner: Tamás Csikós <csks.tomi@gmail.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.