summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/swriter/00/00000405.xhp
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/swriter/00/00000405.xhp')
-rw-r--r--helpcontent2/source/text/swriter/00/00000405.xhp147
1 files changed, 136 insertions, 11 deletions
diff --git a/helpcontent2/source/text/swriter/00/00000405.xhp b/helpcontent2/source/text/swriter/00/00000405.xhp
index ae349c9ef0..46708e8126 100644
--- a/helpcontent2/source/text/swriter/00/00000405.xhp
+++ b/helpcontent2/source/text/swriter/00/00000405.xhp
@@ -70,7 +70,7 @@
</variable></paragraph>
<section id="spaltens">
<paragraph role="paragraph" id="par_id3150836" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>Format - Page - Columns</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149687" xml-lang="en-US" l10n="U" oldref="123">Choose <emph>Format - Frame - Columns</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3149687" xml-lang="en-US" l10n="U" oldref="123">Choose <emph>Format - Frame/Object - Columns</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3149298" xml-lang="en-US" l10n="U" oldref="22">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Columns</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3151336" xml-lang="en-US" l10n="U" oldref="23">Choose <emph>Insert - Frame - Columns</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3143276" xml-lang="en-US" l10n="U" oldref="156">Choose <emph>Insert/Format - Section(s) - Columns</emph> tab</paragraph>
@@ -95,13 +95,13 @@
<section id="numerierungsvorlage">
<paragraph role="paragraph" id="par_id3156364" xml-lang="en-US" l10n="U" oldref="142">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New</emph> (for Numbering Styles)</paragraph>
</section>
-<paragraph role="paragraph" id="par_id3151370" xml-lang="en-US" l10n="U" oldref="37"><variable id="eingabe">Choose <emph>Format - AutoFormat - While Typing</emph>
+<paragraph role="paragraph" id="par_id3151370" xml-lang="en-US" l10n="U" oldref="37"><variable id="eingabe">Choose <emph>Format - AutoCorrect - While Typing</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149538" xml-lang="en-US" l10n="U" oldref="42"><variable id="autoformat1">Choose <emph>Format - AutoFormat</emph>
+<paragraph role="paragraph" id="par_id3149538" xml-lang="en-US" l10n="U" oldref="42"><variable id="autoformat1">Choose <emph>Format - AutoCorrect</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150117" xml-lang="en-US" l10n="U" oldref="43"><variable id="autoformat2">Choose <emph>Format - AutoFormat - Apply</emph>
+<paragraph role="paragraph" id="par_id3150117" xml-lang="en-US" l10n="U" oldref="43"><variable id="autoformat2">Choose <emph>Format - AutoCorrect - Apply</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155870" xml-lang="en-US" l10n="U" oldref="153"><variable id="autoformat3">Choose <emph>Format - AutoFormat - Apply and Edit Changes</emph>
+<paragraph role="paragraph" id="par_id3155870" xml-lang="en-US" l10n="U" oldref="153"><variable id="autoformat3">Choose <emph>Format - AutoCorrect - Apply and Edit Changes</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3147413" xml-lang="en-US" l10n="CHG" oldref="44"><variable id="autoformattab">Choose <emph>Table - AutoFormat</emph> (with cursor in a table)
</variable></paragraph>
@@ -117,7 +117,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3150557" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3149214" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149214" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3149214" src="res/commandimagelist/sc_framedialog.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149214" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -130,13 +134,13 @@
</section>
<section id="grafiktyp">
<paragraph role="paragraph" id="par_id3146337" xml-lang="en-US" l10n="U" oldref="51">Choose <emph>Format - Picture - Type</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3149841" xml-lang="en-US" l10n="U" oldref="124">Choose <emph>Format - Frame - Type</emph> tab</paragraph><comment>UFI: removed some lines with Format-Object, see #i64150</comment>
+<paragraph role="paragraph" id="par_id3149841" xml-lang="en-US" l10n="U" oldref="124">Choose <emph>Format - Frame/Object - Type</emph> tab</paragraph><comment>UFI: removed some lines with Format-Object, see #i64150</comment>
<paragraph role="paragraph" id="par_id3148856" xml-lang="en-US" l10n="U" oldref="54">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Type</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3147067" xml-lang="en-US" l10n="U" oldref="55">Choose <emph>Insert - Frame - Type</emph> tab</paragraph>
</section>
<section id="grafikumlauf">
<paragraph role="paragraph" id="par_id3151082" xml-lang="en-US" l10n="U" oldref="56">Choose <emph>Format - Picture - Wrap</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3148437" xml-lang="en-US" l10n="U" oldref="125">Choose <emph>Format - Frame - Wrap</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3148437" xml-lang="en-US" l10n="U" oldref="125">Choose <emph>Format - Frame/Object - Wrap</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3150169" xml-lang="en-US" l10n="U" oldref="60">Choose <emph>Insert - Frame - Wrap</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3153299" xml-lang="en-US" l10n="U" oldref="61">Choose <emph>Format - Wrap</emph>
</paragraph>
@@ -145,12 +149,12 @@
</variable></paragraph>
<section id="grahyper">
<paragraph role="paragraph" id="par_id3153984" xml-lang="en-US" l10n="U" oldref="63">Choose <emph>Format - Picture - Hyperlink</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3156130" xml-lang="en-US" l10n="U" oldref="126">Choose <emph>Format - Frame - Hyperlink</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3156130" xml-lang="en-US" l10n="U" oldref="126">Choose <emph>Format - Frame/Object - Hyperlink</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3145337" xml-lang="en-US" l10n="U" oldref="64">Choose <emph>Insert - Frame - Hyperlink</emph> tab</paragraph>
</section>
<section id="grazusaetze">
<paragraph role="paragraph" id="par_id3154724" xml-lang="en-US" l10n="U" oldref="65">Choose <emph>Format - Picture - Options</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3145636" xml-lang="en-US" l10n="U" oldref="128">Choose <emph>Format - Frame - Options</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3145636" xml-lang="en-US" l10n="U" oldref="128">Choose <emph>Format - Frame/Object - Options</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3149774" xml-lang="en-US" l10n="U" oldref="68">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Options</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3150922" xml-lang="en-US" l10n="U" oldref="69">Choose <emph>Insert - Frame - Options</emph> tab</paragraph>
</section>
@@ -158,7 +162,7 @@
</variable></paragraph>
<section id="makrografik">
<paragraph role="paragraph" id="par_id3146938" xml-lang="en-US" l10n="U" oldref="72">Choose <emph>Insert/Format - Picture - Macro</emph> tab</paragraph>
-<paragraph role="paragraph" id="par_id3154323" xml-lang="en-US" l10n="U" oldref="129">Choose <emph>Insert/Format - Frame - Macro</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3154323" xml-lang="en-US" l10n="U" oldref="129">Choose <emph>Insert/Format - Frame/Object - Macro</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3153238" xml-lang="en-US" l10n="U" oldref="73">Choose <emph>Edit - AutoText - AutoText (button) - Macro</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3148792" xml-lang="en-US" l10n="U" oldref="148">Choose <emph>Edit - ImageMap -</emph> open context menu<emph> - Macro</emph>
@@ -180,6 +184,49 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3148823" xml-lang="en-US" l10n="CHG" oldref="78"><variable id="zelle">Right-click in a table, choose <emph>Cell</emph>
</variable></paragraph>
+<<<<<<< .working
+<section id="verbindenze">
+<paragraph role="paragraph" id="par_id3154351" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>Table - Merge Cells</emph>
+</paragraph>
+<paragraph role="paragraph" id="par_id3154370" xml-lang="en-US" l10n="U" oldref="80">On the <emph>Table</emph> Bar, click</paragraph>
+<section id="syzellenverbinden">
+<table id="tbl_id3154636">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153996" xml-lang="en-US" l10n="E">
+<image id="img_id3154002" src="res/commandimagelist/sc_mergecells.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154002" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3150662" xml-lang="en-US" l10n="U" oldref="81">Merge Cells</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+<section id="teilenz">
+<paragraph role="paragraph" id="par_id3154024" xml-lang="en-US" l10n="U" oldref="82">Choose <emph>Table - Split Cells</emph>
+</paragraph>
+<paragraph role="paragraph" id="par_id3154042" xml-lang="en-US" l10n="U" oldref="83">On the <emph>Table</emph> Bar, click</paragraph>
+<section id="syzellenteilen">
+<table id="tbl_id3149972">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3147270" xml-lang="en-US" l10n="E">
+<image id="img_id3147275" src="res/commandimagelist/sc_splitcell.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147275" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3150616" xml-lang="en-US" l10n="U" oldref="84">Split Cells</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+=======
+>>>>>>> .merge-right.r265757
<paragraph role="paragraph" id="par_id3149617" xml-lang="en-US" l10n="U" oldref="85"><variable id="schtzenze">In the context menu of a cell, choose <emph>Cell - Protect</emph>
</variable></paragraph>
<section id="schutzaufhz">
@@ -200,7 +247,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3145222" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3145228" src="res/commandimagelist/sc_setoptimalrowheight.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145228" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3145228" src="res/commandimagelist/sc_setoptimalrowheight.png" width="0.423cm" height="0.423cm"><alt id="alt_id3145228" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -211,6 +262,29 @@
</section>
</section>
+<<<<<<< .working
+<section id="verteilenzeile">
+<paragraph role="paragraph" id="par_id3153569" xml-lang="en-US" l10n="U" oldref="92">Choose <emph>Table - Autofit - Distribute Rows Equally</emph>
+</paragraph>
+<paragraph role="paragraph" id="par_id3153755" xml-lang="en-US" l10n="U" oldref="93">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
+<section id="syverteilenzeile">
+<table id="tbl_id3154064">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3145297" xml-lang="en-US" l10n="E">
+<image id="img_id3155994" src="res/commandimagelist/sc_distributerows.png" width="0.2228in" height="0.2228in"><alt id="alt_id3155994" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153206" xml-lang="en-US" l10n="U" oldref="94">Distribute Rows Equally</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+=======
+>>>>>>> .merge-right.r265757
<paragraph role="paragraph" id="par_id3145095" xml-lang="en-US" l10n="U" oldref="95"><variable id="selektierenz">Choose <emph>Table - Select - Row</emph>
</variable></paragraph>
<section id="loschenz">
@@ -222,7 +296,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3147555" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3150361" src="res/commandimagelist/sc_deleterows.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150361" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3150361" src="res/commandimagelist/sc_deleterows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150361" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -247,7 +325,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3157881" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3157888" src="res/commandimagelist/sc_setoptimalcolumnwidthdirect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3157888" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3157888" src="res/commandimagelist/sc_setoptimalcolumnwidthdirect.png" width="0.423cm" height="0.423cm"><alt id="alt_id3157888" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -258,6 +340,29 @@
</section>
</section>
+<<<<<<< .working
+<section id="verteilenspalte">
+<paragraph role="paragraph" id="par_id3159219" xml-lang="en-US" l10n="U" oldref="107">Choose <emph>Table - Autofit - Distribute Columns Equally</emph>
+</paragraph>
+<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="108">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph>
+<section id="syverteilentext">
+<table id="tbl_id3148462">
+<tablerow>
+<tablecell>
+<paragraph role="paragraph" id="par_id3145179" xml-lang="en-US" l10n="E">
+<image id="img_id3145186" src="res/commandimagelist/sc_distributecolumns.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145186" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </image></paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="paragraph" id="par_id3151364" xml-lang="en-US" l10n="U" oldref="109">Space Columns Equally</paragraph>
+</tablecell>
+</tablerow>
+</table>
+
+</section>
+</section>
+=======
+>>>>>>> .merge-right.r265757
<paragraph role="paragraph" id="par_id3153172" xml-lang="en-US" l10n="U" oldref="110"><variable id="spaltesel">Choose <emph>Table - Select - Column</emph>
</variable></paragraph>
<section id="einfgens">
@@ -270,7 +375,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3150279" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3150286" src="res/commandimagelist/sc_insertcolumns.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150286" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3150286" src="res/commandimagelist/sc_insertcolumns.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150286" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -280,7 +389,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3150895" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3150902" src="res/commandimagelist/sc_insertrows.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150902" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3150902" src="res/commandimagelist/sc_insertrows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150902" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -299,7 +412,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3153600" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3153607" src="res/commandimagelist/sc_deletecolumns.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153607" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3153607" src="res/commandimagelist/sc_deletecolumns.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153607" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -311,14 +428,18 @@
</section>
</section>
<section id="objektformat">
-<paragraph role="paragraph" id="par_id3156355" xml-lang="en-US" l10n="CHG" oldref="117">Choose <emph>Format - Frame</emph>
+<paragraph role="paragraph" id="par_id3156355" xml-lang="en-US" l10n="CHG" oldref="117">Choose <emph>Format - Frame/Object</emph>
</paragraph>
<section id="syeigenschaftenobjekt">
<table id="tbl_id3153367">
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3151276" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3151283" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151283" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3151283" src="res/commandimagelist/sc_framedialog.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151283" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -334,7 +455,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3152973" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3152980" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152980" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3152980" src="res/commandimagelist/sc_framedialog.png" width="0.566cm" height="0.566cm"><alt id="alt_id3152980" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>