helpers/help_hid.lst | 15 ---------
source/text/swriter/01/05060200.xhp | 58 +++++++++++++++---------------------
2 files changed, 25 insertions(+), 48 deletions(-)
New commits:
commit 48fa20a5cd43b2f132709e7ad9274627c1983d9b
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 17 17:27:09 2013 +0100
update help ids for wrap page .ui conversion
Change-Id: If7eca8f015e51de5cc50f7fa209a24f6fec40aa5
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 0ed86c9..8b39d6b 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1802,7 +1802,6 @@ HID_FORMULA_LB_FUNCTION,64866,
HID_FORM_NAVIGATOR,38068,
HID_FORM_NAVIGATOR_WIN,38069,
HID_FRAME_TOOLBOX,54829,
-HID_FRM_EXT,53169,
HID_FRM_STD,53170,
HID_FTP,41040,
HID_FTP_BTN_PATH,41046,
@@ -7727,10 +7726,6 @@ sw_CheckBox_TP_FRM_STD_CB_FOLLOWTEXTFLOW,878167169,
sw_CheckBox_TP_FRM_STD_CB_MIRROR,878167077,
sw_CheckBox_TP_FRM_STD_CB_REL_HEIGHT,878167141,
sw_CheckBox_TP_FRM_STD_CB_REL_WIDTH,878167140,
-sw_CheckBox_TP_FRM_WRAP_CB_ANCHOR_ONLY,878461960,
-sw_CheckBox_TP_FRM_WRAP_CB_ONLYOUTSIDE,878461977,
-sw_CheckBox_TP_FRM_WRAP_CB_OUTLINE,878461975,
-sw_CheckBox_TP_FRM_WRAP_CB_TRANSPARENT,878461974,
sw_CheckBox_TP_GRF_EXT_CB_HOR,878232622,
sw_CheckBox_TP_GRF_EXT_CB_VERT,878232623,
sw_CheckBox_TP_INSERT_SECTION_CB_DDE,879051777,
@@ -7901,12 +7896,6 @@ sw_ImageButton_TP_TABLE_COLUMN_COL_BTN_UP,888499832,
sw_ImageButton_TP_TOX_ENTRY_WIN_TOKEN_WIN_LEFT_SCROLL,537456193,
sw_ImageButton_TP_TOX_ENTRY_WIN_TOKEN_WIN_RIGHT_SCROLL,537456195,
sw_ImageButton_TP_TOX_STYLES_BT_ASSIGN,879177248,
-sw_ImageRadioButton_TP_FRM_WRAP_RB_NO_WRAP,878469634,
-sw_ImageRadioButton_TP_FRM_WRAP_RB_WRAP_IDEAL,878469639,
-sw_ImageRadioButton_TP_FRM_WRAP_RB_WRAP_LEFT,878469635,
-sw_ImageRadioButton_TP_FRM_WRAP_RB_WRAP_PARALLEL,878469637,
-sw_ImageRadioButton_TP_FRM_WRAP_RB_WRAP_RIGHT,878469636,
-sw_ImageRadioButton_TP_FRM_WRAP_RB_WRAP_THROUGH,878469638,
sw_ImageRadioButton_TP_TOX_ENTRY_RB_SORTDOWN1,879157900,
sw_ImageRadioButton_TP_TOX_ENTRY_RB_SORTDOWN2,879157901,
sw_ImageRadioButton_TP_TOX_ENTRY_RB_SORTDOWN3,879157902,
@@ -8043,10 +8032,6 @@ sw_MetricField_TP_FRM_STD_ED_AT_HORZ_POS,878172708,
sw_MetricField_TP_FRM_STD_ED_AT_VERT_POS,878172713,
sw_MetricField_TP_FRM_STD_ED_HEIGHT,878172702,
sw_MetricField_TP_FRM_STD_ED_WIDTH,878172700,
-sw_MetricField_TP_FRM_WRAP_ED_BOTTOM_MARGIN,878467603,
-sw_MetricField_TP_FRM_WRAP_ED_LEFT_MARGIN,878467598,
-sw_MetricField_TP_FRM_WRAP_ED_RIGHT_MARGIN,878467600,
-sw_MetricField_TP_FRM_WRAP_ED_TOP_MARGIN,878467602,
sw_MetricField_TP_LAB_FMT_FLD_HDIST,909711875,
sw_MetricField_TP_LAB_FMT_FLD_HEIGHT,909711881,
sw_MetricField_TP_LAB_FMT_FLD_LEFT,909711883,
diff --git a/source/text/swriter/01/05060200.xhp
b/source/text/swriter/01/05060200.xhp
index 6e040dc..9b01c4f 100644
--- a/source/text/swriter/01/05060200.xhp
+++ b/source/text/swriter/01/05060200.xhp
@@ -28,9 +28,8 @@
</meta>
<body>
<section id="umlauf">
-<bookmark xml-lang="en-US" branch="hid/SW_HID_FRM_EXT" id="bm_id3153538"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/WrapPage"
id="bm_id3153538" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:TextWrap" id="bm_id6339381"
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:TextWrap" id="bm_id3154564"
localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapMenu"
id="bm_id0801200803335347" localize="false"/>
<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="1"
l10n="U" oldref="1"><link href="text/swriter/01/05060200.xhp"
name="Wrap">Wrap</link></paragraph>
<paragraph role="paragraph" id="par_id3154478" xml-lang="en-US" l10n="CHG"
oldref="2"><variable id="umlauftext"><ahelp hid=".uno:TextWrap">Specify the way
you want text to wrap around an object.</ahelp> You can also specify the
spacing between the text and the object.
@@ -41,11 +40,10 @@
</section>
<paragraph role="tip" id="par_id3151249" xml-lang="en-US" l10n="U"
oldref="56">To wrap text around a table, place the table in a frame, and then
wrap the text around the frame.</paragraph>
<paragraph role="heading" id="hd_id3154829" xml-lang="en-US" level="2"
l10n="U" oldref="3">Settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:WrapOff" id="bm_id6970184"
localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapOff" id="bm_id3148982"
localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_NO_WRAP" id="bm_id3147090"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/none"
id="bm_id3147090" localize="false"/>
<paragraph role="heading" id="hd_id3148971" xml-lang="en-US" level="3"
l10n="U" oldref="5">None</paragraph>
-<paragraph role="paragraph" id="par_id3147100" xml-lang="en-US" l10n="U"
oldref="6"><variable id="keinumlauftext"><ahelp
hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_NO_WRAP">Places the object on a
separate line in the document. The Text in the document appears above and below
the object, but not on the sides of the object.</ahelp>
+<paragraph role="paragraph" id="par_id3147100" xml-lang="en-US" l10n="U"
oldref="6"><variable id="keinumlauftext"><ahelp
hid="modules/swriter/ui/wrappage/none">Places the object on a separate line in
the document. The Text in the document appears above and below the object, but
not on the sides of the object.</ahelp>
</variable></paragraph>
<table id="tbl_id3152738">
<tablerow>
@@ -60,9 +58,9 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US"
branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_LEFT" id="bm_id3149164"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/before"
id="bm_id3149164" localize="false"/>
<paragraph role="heading" id="hd_id3153351" xml-lang="en-US" level="3"
l10n="CHG" oldref="17">Before</paragraph>
-<paragraph role="paragraph" id="par_id3149171" xml-lang="en-US" l10n="U"
oldref="18"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_LEFT">Wraps
text on the left side of the object if there is enough
space.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149171" xml-lang="en-US" l10n="U"
oldref="18"><ahelp hid="modules/swriter/ui/wrappage/before">Wraps text on the
left side of the object if there is enough space.</ahelp></paragraph>
<table id="tbl_id3151031">
<tablerow>
<tablecell>
@@ -76,9 +74,9 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US"
branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_RIGHT" id="bm_id3150694"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/after"
id="bm_id3150694" localize="false"/>
<paragraph role="heading" id="hd_id3155870" xml-lang="en-US" level="3"
l10n="CHG" oldref="19">After</paragraph>
-<paragraph role="paragraph" id="par_id3150700" xml-lang="en-US" l10n="U"
oldref="20"><ahelp hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_RIGHT">Wraps
text on the right side of the object if there is enough
space.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150700" xml-lang="en-US" l10n="U"
oldref="20"><ahelp hid="modules/swriter/ui/wrappage/after">Wraps text on the
right side of the object if there is enough space.</ahelp></paragraph>
<table id="tbl_id3147426">
<tablerow>
<tablecell>
@@ -93,10 +91,9 @@
</table>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapOn" id="bm_id3149224"
localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_PARALLEL" id="bm_id3149228"
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:WrapOn" id="bm_id0801200803382855"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/parallel"
id="bm_id3149228" localize="false"/>
<paragraph role="heading" id="hd_id3149213" xml-lang="en-US" level="3"
l10n="U" oldref="21">Parallel</paragraph>
-<paragraph role="paragraph" id="par_id3147740" xml-lang="en-US" l10n="U"
oldref="22"><variable id="seitenumlauftext"><ahelp
hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_PARALLEL">Wraps text on all four
sides of the border frame of the object.</ahelp>
+<paragraph role="paragraph" id="par_id3147740" xml-lang="en-US" l10n="U"
oldref="22"><variable id="seitenumlauftext"><ahelp
hid="modules/swriter/ui/wrappage/parallel">Wraps text on all four sides of the
border frame of the object.</ahelp>
</variable></paragraph>
<table id="tbl_id3146337">
<tablerow>
@@ -112,10 +109,9 @@
</table>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapThrough" id="bm_id622670"
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:WrapThrough" id="bm_id3151092"
localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_THROUGH" id="bm_id3151096"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/through"
id="bm_id3151096" localize="false"/>
<paragraph role="heading" id="hd_id3151081" xml-lang="en-US" level="3"
oldref="11">Through</paragraph>
-<paragraph role="paragraph" id="par_id3154089" xml-lang="en-US" l10n="U"
oldref="12"><variable id="durchlauftext"><ahelp
hid="SW:IMAGERADIOBUTTON:TP_FRM_WRAP:RB_WRAP_THROUGH">Places the object in
front of the text.</ahelp>
+<paragraph role="paragraph" id="par_id3154089" xml-lang="en-US" l10n="U"
oldref="12"><variable id="durchlauftext"><ahelp
hid="modules/swriter/ui/wrappage/through">Places the object in front of the
text.</ahelp>
</variable></paragraph>
<table id="tbl_id3145320">
<tablerow>
@@ -130,8 +126,7 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US"
branch="hid/sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_IDEAL" id="bm_id3150463"
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:WrapIdeal" id="bm_id5276"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/optimal"
id="bm_id3150463" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapIdeal" id="bm_id3150462"
localize="false"/>
<paragraph role="heading" id="hd_id3150451" xml-lang="en-US" level="3"
l10n="U" oldref="23">Optimal</paragraph>
<paragraph role="paragraph" id="par_id3154716" xml-lang="en-US" l10n="U"
oldref="24"><variable id="dynamischertext"><ahelp
hid=".uno:WrapIdeal">Automatically wraps text to the left, to the right, or on
all four sides of the border frame of the object. If the distance between the
object and the page margin is less than 2 cm, the text is not wrapped. </ahelp>
@@ -151,40 +146,37 @@
<paragraph role="heading" id="hd_id3146940" xml-lang="en-US" level="2"
l10n="U" oldref="26">Options</paragraph>
<paragraph role="paragraph" id="par_id3146953" xml-lang="en-US" l10n="U"
oldref="27">Specify the text wrap options.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_WRAP:CB_ANCHOR_ONLY"
id="bm_id3153240" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:WrapAnchorOnly" id="bm_id7795797"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/anchoronly"
id="bm_id3153240" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapAnchorOnly" id="bm_id3154324"
localize="false"/>
<paragraph role="heading" id="hd_id3153229" xml-lang="en-US" level="3"
l10n="U" oldref="28">First Paragraph</paragraph>
<paragraph role="paragraph" id="par_id3154333" xml-lang="en-US" l10n="U"
oldref="29"><variable id="ersterabsatztext"><ahelp
hid=".uno:WrapAnchorOnly">Starts a new paragraph below the object after you
press Enter.</ahelp> The space between the paragraphs is determined by the size
of the object.
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_WRAP:CB_TRANSPARENT"
id="bm_id3150086" localize="false"/>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/wrappage/transparent" id="bm_id3150086"
localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapThroughTransparent"
id="bm_id7503356" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:WrapThroughTransparent"
id="bm_id3150090" localize="false"/>
<paragraph role="heading" id="hd_id3148790" xml-lang="en-US" level="3"
l10n="U" oldref="30">In Background</paragraph>
<paragraph role="paragraph" id="par_id3150100" xml-lang="en-US" l10n="U"
oldref="31"><variable id="hintergrundtext"><ahelp
hid=".uno:WrapThroughTransparent">Moves the selected object to the background.
This option is only available if you selected the<emph> Through</emph> wrap
type.</ahelp>
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_WRAP:CB_OUTLINE"
id="bm_id3149369" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:WrapContour" id="bm_id2682094"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/outline"
id="bm_id3149369" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WrapContour" id="bm_id3149372"
localize="false"/>
<paragraph role="heading" id="hd_id3149358" xml-lang="en-US" level="3"
l10n="U" oldref="47">Contour</paragraph>
<paragraph role="paragraph" id="par_id3155793" xml-lang="en-US" l10n="U"
oldref="48"><variable id="konturtext"><ahelp hid=".uno:WrapContour">Wraps text
around the shape of the object. This option is not available for the
<emph>Through</emph> wrap type, or for frames.</ahelp> To change the contour of
an object, select the object, and then choose <emph>Format - Wrap -
</emph><link href="text/swriter/01/05060201.xhp" name="Edit Contour"><emph>Edit
Contour</emph></link>.
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_FRM_WRAP:CB_ONLYOUTSIDE"
id="bm_id3154632" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/outside"
id="bm_id3154632" localize="false"/>
<paragraph role="heading" id="hd_id3154620" xml-lang="en-US" level="3"
l10n="U" oldref="51">Only outside</paragraph>
-<paragraph role="paragraph" id="par_id3147377" xml-lang="en-US" l10n="U"
oldref="52"><ahelp hid="SW:CHECKBOX:TP_FRM_WRAP:CB_ONLYOUTSIDE">Wraps text only
around the contour of the object, but not in open areas within the object
shape.</ahelp> This option is not available for frames.</paragraph>
+<paragraph role="paragraph" id="par_id3147377" xml-lang="en-US" l10n="U"
oldref="52"><ahelp hid="modules/swriter/ui/wrappage/outside">Wraps text only
around the contour of the object, but not in open areas within the object
shape.</ahelp> This option is not available for frames.</paragraph>
<paragraph role="heading" id="hd_id3147397" xml-lang="en-US" level="2"
l10n="U" oldref="33">Gaps</paragraph>
<paragraph role="paragraph" id="par_id3149637" xml-lang="en-US" l10n="U"
oldref="34">Specify the amount of space to leave between the selected object
and the text.</paragraph>
-<bookmark xml-lang="en-US"
branch="hid/sw:MetricField:TP_FRM_WRAP:ED_LEFT_MARGIN" id="bm_id3150671"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/left"
id="bm_id3150671" localize="false"/>
<paragraph role="heading" id="hd_id3150659" xml-lang="en-US" level="3"
l10n="U" oldref="35">Left</paragraph>
-<paragraph role="paragraph" id="par_id3150678" xml-lang="en-US" l10n="U"
oldref="36"><ahelp hid="SW:METRICFIELD:TP_FRM_WRAP:ED_LEFT_MARGIN">Enter the
amount of space that you want between the left edge of the object and the
text.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/sw:MetricField:TP_FRM_WRAP:ED_RIGHT_MARGIN" id="bm_id3149949"
localize="false"/>
+<paragraph role="paragraph" id="par_id3150678" xml-lang="en-US" l10n="U"
oldref="36"><ahelp hid="modules/swriter/ui/wrappage/left">Enter the amount of
space that you want between the left edge of the object and the
text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/right"
id="bm_id3149949" localize="false"/>
<paragraph role="heading" id="hd_id3154032" xml-lang="en-US" level="3"
l10n="U" oldref="37">Right</paragraph>
-<paragraph role="paragraph" id="par_id3149956" xml-lang="en-US" l10n="U"
oldref="38"><ahelp hid="SW:METRICFIELD:TP_FRM_WRAP:ED_RIGHT_MARGIN">Enter the
amount of space that you want between the right edge of the object and the
text.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/sw:MetricField:TP_FRM_WRAP:ED_TOP_MARGIN" id="bm_id3147277"
localize="false"/>
+<paragraph role="paragraph" id="par_id3149956" xml-lang="en-US" l10n="U"
oldref="38"><ahelp hid="modules/swriter/ui/wrappage/right">Enter the amount of
space that you want between the right edge of the object and the
text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/top"
id="bm_id3147277" localize="false"/>
<paragraph role="heading" id="hd_id3149974" xml-lang="en-US" level="3"
l10n="U" oldref="39">Top</paragraph>
-<paragraph role="paragraph" id="par_id3147284" xml-lang="en-US" l10n="U"
oldref="40"><ahelp hid="SW:METRICFIELD:TP_FRM_WRAP:ED_TOP_MARGIN">Enter the
amount of space that you want between the top edge of the object and the
text.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/sw:MetricField:TP_FRM_WRAP:ED_BOTTOM_MARGIN" id="bm_id3149621"
localize="false"/>
+<paragraph role="paragraph" id="par_id3147284" xml-lang="en-US" l10n="U"
oldref="40"><ahelp hid="modules/swriter/ui/wrappage/top">Enter the amount of
space that you want between the top edge of the object and the
text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/bottom"
id="bm_id3149621" localize="false"/>
<paragraph role="heading" id="hd_id3149609" xml-lang="en-US" level="3"
l10n="U" oldref="41">Bottom</paragraph>
-<paragraph role="paragraph" id="par_id3157884" xml-lang="en-US" l10n="U"
oldref="42"><ahelp hid="SW:METRICFIELD:TP_FRM_WRAP:ED_BOTTOM_MARGIN">Enter the
amount of space that you want between the bottom edge of the object and the
text.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3157884" xml-lang="en-US" l10n="U"
oldref="42"><ahelp hid="modules/swriter/ui/wrappage/bottom">Enter the amount of
space that you want between the bottom edge of the object and the
text.</ahelp></paragraph>
</body>
</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
