helpers/help_hid.lst                |   18 ---------
 source/text/swriter/01/05060201.xhp |   65 +++++++++++++++++-------------------
 2 files changed, 32 insertions(+), 51 deletions(-)

New commits:
commit a142ecbf720d2dbdf1930f5c2ba958a90df5b056
Author: Caolán McNamara <caol...@redhat.com>
Date:   Fri Sep 5 15:40:32 2014 +0100

    update help ids for contour floating window .ui conversion
    
    Change-Id: I1376f54c72200f7e85e3edb814cf98e86d8eb3d5

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 099bac5..2b40431 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -925,22 +925,6 @@ HID_COMPATIBILITY_OPTIONS_BOX,53252,
 HID_CONFIG_EVENT_DOCUMENT_BASED,33167,
 HID_CONFIG_EVENT_OFFICE_BASED,33166,
 HID_CONFIRM_DROP_BUTTON_ALL,38937,
-HID_CONTDLG_APPLY,33918,
-HID_CONTDLG_AUTOCONTOUR,33931,
-HID_CONTDLG_CIRCLE,33922,
-HID_CONTDLG_GRAPHWND,33980,
-HID_CONTDLG_PIPETTE,33932,
-HID_CONTDLG_POLY,33923,
-HID_CONTDLG_POLYDELETE,33928,
-HID_CONTDLG_POLYEDIT,33925,
-HID_CONTDLG_POLYINSERT,33927,
-HID_CONTDLG_POLYMOVE,33926,
-HID_CONTDLG_RECT,33921,
-HID_CONTDLG_REDO,33930,
-HID_CONTDLG_SELECT,33920,
-HID_CONTDLG_TOOLBOX,33979,
-HID_CONTDLG_UNDO,33929,
-HID_CONTDLG_WORKPLACE,33919,
 HID_CONTROLS_DATE_N_TIME,38194,
 HID_CTL_ACTION_DLG_1,59870,
 HID_CTL_ACTION_DLG_2,59871,
@@ -5244,7 +5228,6 @@ svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_SEPARATOR,703334448,
 svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_URL,703334446,
 svx_Edit_RID_SVX_MDLG_ERR_REP_OPTIONS_ED_ERROPT_PROXYPORT,1237796872,
 svx_Edit_RID_SVX_MDLG_ERR_REP_OPTIONS_ED_ERROPT_PROXYSERVER,1237796870,
-svx_FloatingWindow_RID_SVXDLG_CONTOUR,1782005760,
 svx_FloatingWindow_RID_SVXFLOAT_EXTRUSION_DEPTH,1790640128,
 svx_FloatingWindow_RID_SVXFLOAT_EXTRUSION_DIRECTION,1790590976,
 svx_FloatingWindow_RID_SVXFLOAT_EXTRUSION_LIGHTING,1790656512,
@@ -5366,7 +5349,6 @@ svx_MetricField_RID_SVXDLG_BMPMASK_SP_1,3391953410,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_2,3391953412,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_3,3391953409,
 svx_MetricField_RID_SVXDLG_BMPMASK_SP_4,3391953411,
-svx_MetricField_RID_SVXDLG_CONTOUR_MTF_TOLERANCE,1782012417,
 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,
diff --git a/source/text/swriter/01/05060201.xhp 
b/source/text/swriter/01/05060201.xhp
index 029686d..7af6fe5 100644
--- a/source/text/swriter/01/05060201.xhp
+++ b/source/text/swriter/01/05060201.xhp
@@ -31,20 +31,19 @@
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/svx:FloatingWindow:RID_SVXDLG_CONTOUR" 
id="bm_id3151318" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ContourDialog" id="bm_id8126690" 
localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/FloatingContour" 
id="bm_id3151318" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ContourDialog" id="bm_id3154564" 
localize="false"/>
 <paragraph role="heading" id="hd_id3153539" xml-lang="en-US" level="1" 
l10n="U" oldref="1">Contour Editor</paragraph>
 <paragraph role="paragraph" id="par_id3153677" xml-lang="en-US" l10n="U" 
oldref="2"><variable id="konturtext"><ahelp hid=".uno:ContourDialog">Changes 
the contour of the selected object. $[officename] uses the contour when 
determining the <link href="text/swriter/01/05060200.xhp" name="text wrap">text 
wrap</link> options for the object.</ahelp>
 </variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_GRAPHWND" 
id="bm_id3155903" localize="false"/>
-<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" 
oldref="46"><ahelp hid="HID_CONTDLG_GRAPHWND">Displays a preview of the 
contour.</ahelp><comment>and this bubble text hides both from view if not set 
to 0 length</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/container" 
id="bm_id3155903" localize="false"/>
+<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" 
oldref="46"><ahelp hid="svx/ui/floatingcontour/container">Displays a preview of 
the contour.</ahelp><comment>and this bubble text hides both from view if not 
set to 0 length</comment></paragraph>
 <section id="howtoget">
   <embed href="text/swriter/00/00000405.xhp#kontureditor"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_APPLY" 
id="bm_id3155178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/TBI_APPLY" 
id="bm_id3155178" localize="false"/>
 <paragraph role="heading" id="hd_id3159195" xml-lang="en-US" level="2" 
l10n="U" oldref="3">Apply</paragraph>
-<paragraph role="paragraph" id="par_id3155184" xml-lang="en-US" l10n="U" 
oldref="4"><ahelp hid="HID_CONTDLG_APPLY">Applies the contour to the selected 
object.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155184" xml-lang="en-US" l10n="U" 
oldref="4"><ahelp hid="svx/ui/floatingcontour/TBI_APPLY">Applies the contour to 
the selected object.</ahelp></paragraph>
 <table id="tbl_id3149495">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -58,9 +57,9 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_WORKPLACE" 
id="bm_id3147102" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/TBI_WORKPLACE" 
id="bm_id3147102" localize="false"/>
 <paragraph role="heading" id="hd_id3147091" xml-lang="en-US" level="2" 
l10n="U" oldref="6">Wrap Region</paragraph>
-<paragraph role="paragraph" id="par_id3147217" xml-lang="en-US" l10n="U" 
oldref="7"><ahelp hid="HID_CONTDLG_WORKPLACE">Deletes the custom contour. Click 
here, and then click in the preview area.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147217" xml-lang="en-US" l10n="U" 
oldref="7"><ahelp hid="svx/ui/floatingcontour/TBI_WORKPLACE">Deletes the custom 
contour. Click here, and then click in the preview area.</ahelp></paragraph>
 <table id="tbl_id3153637">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -74,9 +73,9 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_SELECT" 
id="bm_id3149181" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/TBI_SELECT" 
id="bm_id3149181" localize="false"/>
 <paragraph role="heading" id="hd_id3149170" xml-lang="en-US" level="2" 
l10n="U" oldref="9">Select</paragraph>
-<paragraph role="paragraph" id="par_id3156270" xml-lang="en-US" l10n="U" 
oldref="10"><ahelp hid="HID_CONTDLG_SELECT">Changes to selection mode, so that 
you can select the contour.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156270" xml-lang="en-US" l10n="U" 
oldref="10"><ahelp hid="svx/ui/floatingcontour/TBI_SELECT">Changes to selection 
mode, so that you can select the contour.</ahelp></paragraph>
 <table id="tbl_id3151029">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -90,9 +89,9 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_RECT" id="bm_id3150690" 
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/TBI_RECT" 
id="bm_id3150690" localize="false"/>
 <paragraph role="heading" id="hd_id3155868" xml-lang="en-US" level="2" 
l10n="U" oldref="12">Rectangle</paragraph>
-<paragraph role="paragraph" id="par_id3150696" xml-lang="en-US" l10n="U" 
oldref="13"><ahelp hid="HID_CONTDLG_RECT">Draws a rectangular contour where you 
drag in the object preview. To draw a square, hold down Shift while you 
drag.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150696" xml-lang="en-US" l10n="U" 
oldref="13"><ahelp hid="svx/ui/floatingcontour/TBI_RECT">Draws a rectangular 
contour where you drag in the object preview. To draw a square, hold down Shift 
while you drag.</ahelp></paragraph>
 <table id="tbl_id3147424">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -106,9 +105,9 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_CIRCLE" 
id="bm_id3150552" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/TBI_CIRCLE" 
id="bm_id3150552" localize="false"/>
 <paragraph role="heading" id="hd_id3155980" xml-lang="en-US" level="2" 
l10n="U" oldref="15">Ellipse</paragraph>
-<paragraph role="paragraph" id="par_id3150558" xml-lang="en-US" l10n="U" 
oldref="16"><ahelp hid="HID_CONTDLG_CIRCLE">Draws an oval contour where you 
drag in the object preview.</ahelp> To draw a circle, hold down shift while you 
drag.</paragraph>
+<paragraph role="paragraph" id="par_id3150558" xml-lang="en-US" l10n="U" 
oldref="16"><ahelp hid="svx/ui/floatingcontour/TBI_CIRCLE">Draws an oval 
contour where you drag in the object preview.</ahelp> To draw a circle, hold 
down shift while you drag.</paragraph>
 <table id="tbl_id3149228">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -122,9 +121,9 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_POLY" id="bm_id3154769" 
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/TBI_POLY" 
id="bm_id3154769" localize="false"/>
 <paragraph role="heading" id="hd_id3148443" xml-lang="en-US" level="2" 
l10n="U" oldref="18">Polygon</paragraph>
-<paragraph role="paragraph" id="par_id3154774" xml-lang="en-US" l10n="U" 
oldref="19"><ahelp hid="HID_CONTDLG_POLY">Draws a closed contour consisting of 
straight line segments. Click where you want to start the polygon, and drag to 
draw a line segment. Click again to define the end of the line segment, and 
continue clicking to define the remaining line segments of the polygon. 
Double-click to finish drawing the polygon. To constrain the polygon to angles 
of 45 degree, hold down Shift when you click.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154774" xml-lang="en-US" l10n="U" 
oldref="19"><ahelp hid="svx/ui/floatingcontour/TBI_POLY">Draws a closed contour 
consisting of straight line segments. Click where you want to start the 
polygon, and drag to draw a line segment. Click again to define the end of the 
line segment, and continue clicking to define the remaining line segments of 
the polygon. Double-click to finish drawing the polygon. To constrain the 
polygon to angles of 45 degree, hold down Shift when you 
click.</ahelp></paragraph>
 <table id="tbl_id3151089">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -138,9 +137,9 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_POLYEDIT" 
id="bm_id3156106" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/TBI_POLYEDIT" 
id="bm_id3156106" localize="false"/>
 <paragraph role="heading" id="hd_id3156096" xml-lang="en-US" level="2" 
l10n="U" oldref="21">Edit Points</paragraph>
-<paragraph role="paragraph" id="par_id3156112" xml-lang="en-US" l10n="U" 
oldref="22"><ahelp hid="HID_CONTDLG_POLYEDIT">Lets you change the shape of the 
contour. Click here, and then drag the handles of the 
contour.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156112" xml-lang="en-US" l10n="U" 
oldref="22"><ahelp hid="svx/ui/floatingcontour/TBI_POLYEDIT">Lets you change 
the shape of the contour. Click here, and then drag the handles of the 
contour.</ahelp></paragraph>
 <table id="tbl_id3145342">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -154,9 +153,9 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_POLYMOVE" 
id="bm_id3150919" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/TBI_POLYMOVE" 
id="bm_id3150919" localize="false"/>
 <paragraph role="heading" id="hd_id3150909" xml-lang="en-US" level="2" 
l10n="U" oldref="24">Move Points</paragraph>
-<paragraph role="paragraph" id="par_id3150925" xml-lang="en-US" l10n="U" 
oldref="25"><ahelp hid="HID_CONTDLG_POLYMOVE">Lets you drag the handles of the 
contour to change the shape of the contour.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150925" xml-lang="en-US" l10n="U" 
oldref="25"><ahelp hid="svx/ui/floatingcontour/TBI_POLYMOVE">Lets you drag the 
handles of the contour to change the shape of the contour.</ahelp></paragraph>
 <table id="tbl_id3155088">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -170,9 +169,9 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_POLYINSERT" 
id="bm_id3150097" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/TBI_POLYINSERT" 
id="bm_id3150097" localize="false"/>
 <paragraph role="heading" id="hd_id3150086" xml-lang="en-US" level="2" 
l10n="U" oldref="27">Insert Points</paragraph>
-<paragraph role="paragraph" id="par_id3150103" xml-lang="en-US" l10n="U" 
oldref="28"><ahelp hid="HID_CONTDLG_POLYINSERT">Inserts a handle that you can 
drag to change the shape of the contour. Click here, and then click on the 
contour outline.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150103" xml-lang="en-US" l10n="U" 
oldref="28"><ahelp hid="svx/ui/floatingcontour/TBI_POLYINSERT">Inserts a handle 
that you can drag to change the shape of the contour. Click here, and then 
click on the contour outline.</ahelp></paragraph>
 <table id="tbl_id3148793">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -186,9 +185,9 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_POLYDELETE" 
id="bm_id3154618" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/TBI_POLYDELETE" 
id="bm_id3154618" localize="false"/>
 <paragraph role="heading" id="hd_id3153136" xml-lang="en-US" level="2" 
l10n="U" oldref="30">Delete Points</paragraph>
-<paragraph role="paragraph" id="par_id3154624" xml-lang="en-US" l10n="U" 
oldref="31"><ahelp hid="HID_CONTDLG_POLYDELETE">Removes a point from the 
contour outline. Click here, and then click the point that you want to 
delete.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154624" xml-lang="en-US" l10n="U" 
oldref="31"><ahelp hid="svx/ui/floatingcontour/TBI_POLYDELETE">Removes a point 
from the contour outline. Click here, and then click the point that you want to 
delete.</ahelp></paragraph>
 <table id="tbl_id3147380">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -202,9 +201,9 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_AUTOCONTOUR" 
id="bm_id3149960" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/TBI_AUTOCONTOUR" 
id="bm_id3149960" localize="false"/>
 <paragraph role="heading" id="hd_id3149949" xml-lang="en-US" level="2" 
l10n="U" oldref="33">Auto Contour</paragraph>
-<paragraph role="paragraph" id="par_id3149966" xml-lang="en-US" l10n="U" 
oldref="34"><ahelp hid="HID_CONTDLG_AUTOCONTOUR">Automatically draws a contour 
around the object that you can edit.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149966" xml-lang="en-US" l10n="U" 
oldref="34"><ahelp hid="svx/ui/floatingcontour/TBI_AUTOCONTOUR">Automatically 
draws a contour around the object that you can edit.</ahelp></paragraph>
 <table id="tbl_id3147277">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -218,9 +217,9 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_UNDO" id="bm_id3148716" 
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/TBI_UNDO" 
id="bm_id3148716" localize="false"/>
 <paragraph role="heading" id="hd_id3148705" xml-lang="en-US" level="2" 
l10n="U" oldref="36">Undo</paragraph>
-<paragraph role="paragraph" id="par_id3148722" xml-lang="en-US" l10n="U" 
oldref="37"><ahelp hid="HID_CONTDLG_UNDO">Reverses the last 
action.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3148722" xml-lang="en-US" l10n="U" 
oldref="37"><ahelp hid="svx/ui/floatingcontour/TBI_UNDO">Reverses the last 
action.</ahelp></paragraph>
 <table id="tbl_id3155345">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -234,9 +233,9 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_REDO" id="bm_id3154213" 
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/TBI_REDO" 
id="bm_id3154213" localize="false"/>
 <paragraph role="heading" id="hd_id3157907" xml-lang="en-US" level="2" 
l10n="U" oldref="39">Redo</paragraph>
-<paragraph role="paragraph" id="par_id3154219" xml-lang="en-US" l10n="U" 
oldref="40"><ahelp hid="HID_CONTDLG_REDO">Reverses the action of the last 
<emph>Undo </emph>command.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154219" xml-lang="en-US" l10n="U" 
oldref="40"><ahelp hid="svx/ui/floatingcontour/TBI_REDO">Reverses the action of 
the last <emph>Undo </emph>command.</ahelp></paragraph>
 <table id="tbl_id3155773">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -250,9 +249,9 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_PIPETTE" 
id="bm_id3145092" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/TBI_PIPETTE" 
id="bm_id3145092" localize="false"/>
 <paragraph role="heading" id="hd_id3153212" xml-lang="en-US" level="2" 
l10n="CHG" oldref="42">Color Replacer</paragraph>
-<paragraph role="paragraph" id="par_id3145098" xml-lang="en-US" l10n="U" 
oldref="43"><ahelp hid="HID_CONTDLG_PIPETTE">Selects the parts of the bitmap 
that are the same color. Click here, and then click a color in the bitmap. To 
increase the color range that is selected, increase the value in the 
<emph>Tolerance</emph> box.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145098" xml-lang="en-US" l10n="U" 
oldref="43"><ahelp hid="svx/ui/floatingcontour/TBI_PIPETTE">Selects the parts 
of the bitmap that are the same color. Click here, and then click a color in 
the bitmap. To increase the color range that is selected, increase the value in 
the <emph>Tolerance</emph> box.</ahelp></paragraph>
 <table id="tbl_id3146880">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -266,7 +265,7 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" 
branch="hid/svx:MetricField:RID_SVXDLG_CONTOUR:MTF_TOLERANCE" id="bm_id3154729" 
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/floatingcontour/spinbutton" 
id="bm_id3154729" localize="false"/>
 <paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="2" 
l10n="U" oldref="45">Tolerance</paragraph>
 <paragraph role="paragraph" id="par_id3154735" xml-lang="en-US" l10n="CHG" 
oldref="47"><ahelp hid=".">Enter the color tolerance for the Color Replacer as 
a percentage. To increase the color range that the Color Replacer selects, 
enter a high percentage.</ahelp></paragraph>
 <section id="relatedtopics">
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to