summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared/guide/paintbrush.xhp
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/shared/guide/paintbrush.xhp')
-rwxr-xr-xhelpcontent2/source/text/shared/guide/paintbrush.xhp9
1 files changed, 9 insertions, 0 deletions
diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp
index 0ee5980242..3a01cb4a87 100755
--- a/helpcontent2/source/text/shared/guide/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp
@@ -60,7 +60,11 @@
<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
<paragraph role="tip" id="par_idN10663" xml-lang="en-US" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon
+<<<<<<< .working
+<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.2228in" height="0.2228in"><alt id="alt_id209967" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt id="alt_id209967" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image>. After you apply all the formatting, click the icon again.</paragraph>
</listitem>
<listitem>
@@ -108,8 +112,13 @@
<tablecell>
<paragraph role="tablecontent" id="par_idN106C5" xml-lang="en-US" l10n="NEW">Object is selected</paragraph>
</tablecell>
+<<<<<<< .working
+<tablecell>
+<paragraph role="tablecontent" id="par_idN106CB" xml-lang="en-US" l10n="NEW">Copies the object formatting that is defined in the Format - Graphics or Format - Drawing Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
+=======
<tablecell>
<paragraph role="tablecontent" id="par_idN106CB" xml-lang="en-US" l10n="NEW">Copies the object formatting that is defined in the Format - Graphics or Format - Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
+>>>>>>> .merge-right.r265757
</tablecell>
</tablerow>
<tablerow>