summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/swriter/main0105.xhp
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-10-05 13:18:18 +0000
committerKurt Zenker <kz@openoffice.org>2005-10-05 13:18:18 +0000
commit419d822dcdb369ceb0c27d6d32f4721c08217bf6 (patch)
tree77470d5063d9f2049514471fd17f3d34d2639fb4 /helpcontent2/source/text/swriter/main0105.xhp
parent99144fa85aa46f8cdc7aafca1b2e0533f22ff5c8 (diff)
INTEGRATION: CWS hc680pp1 (1.5.6); FILE MERGED
2005/09/30 21:21:48 ufi 1.5.6.2: RESYNC: (1.5-1.6); FILE MERGED 2005/07/20 08:41:19 ufi 1.5.6.1: before build
Diffstat (limited to 'helpcontent2/source/text/swriter/main0105.xhp')
-rw-r--r--helpcontent2/source/text/swriter/main0105.xhp9
1 files changed, 4 insertions, 5 deletions
diff --git a/helpcontent2/source/text/swriter/main0105.xhp b/helpcontent2/source/text/swriter/main0105.xhp
index 7e9b1eeb35..9e888d6e4a 100644
--- a/helpcontent2/source/text/swriter/main0105.xhp
+++ b/helpcontent2/source/text/swriter/main0105.xhp
@@ -5,9 +5,9 @@
*
* $RCSfile: main0105.xhp,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 01:11:08 $
+ * last change: $Author: kz $ $Date: 2005-10-05 14:18:18 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -42,7 +42,7 @@
</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-03-02T16:59:40">converted from old format - fpe</lastedited>
+<lastedited date="2005-07-15T13:49:06">converted from old format - fpe</lastedited>
</history>
</meta>
<body>
@@ -76,8 +76,7 @@
<embed href="text/shared/01/05250000.xhp#anordnung"/>
<embed href="text/shared/01/05240000.xhp#legende"/>
<embed href="text/shared/01/05290000.xhp#gruppe"/>
-<paragraph role="heading" id="hd_id3147330" xml-lang="en-US" level="2" l10n="U" oldref="9"><link href="text/swriter/01/05080000.xhp" name="Object">Object</link></paragraph>
-<embed href="text/swriter/01/05080000.xhp#objekttext"/>
+<embed href="text/swriter/01/format_object.xhp#object"/>
<paragraph role="heading" id="hd_id3149910" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/swriter/01/04130000.xhp" name="Frame">Frame</link></paragraph>
<embed href="text/swriter/01/04130000.xhp#rahm"/>
<paragraph role="heading" id="hd_id3149935" xml-lang="en-US" level="2" l10n="CHG" oldref="8"><link href="text/swriter/01/05060000.xhp" name="Picture">Picture</link></paragraph>