From ddbbbe1cf97990bfe76535b3735df125d9712901 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Fri, 23 Nov 2007 16:31:37 +0000
Subject: [PATCH] INTEGRATION: CWS hcshared12 (1.5.242); FILE MERGED 2007/09/25
 13:34:45 ufi 1.5.242.1: vor resync

---
 .../source/text/shared/guide/activex.xhp      | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/helpcontent2/source/text/shared/guide/activex.xhp b/helpcontent2/source/text/shared/guide/activex.xhp
index 37fe7cb047..633d8a62fa 100755
--- a/helpcontent2/source/text/shared/guide/activex.xhp
+++ b/helpcontent2/source/text/shared/guide/activex.xhp
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
+
+<!--
+ ***********************************************************************
  *
  *  OpenOffice.org - a multi-platform office productivity suite
  *
- *  $RCSfile: activex.xhp,v $
+ *  $RCSfile: activex.xhp,v $fileonly,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 22:52:40 $
+ *  last change: $Author: ihi $ $Date: 2007-11-23 17:31:37 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -32,18 +34,16 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *    MA  02111-1307  USA
  *
- ************************************************************************-->
-	
-<helpdocument version="1.0">
+ ************************************************************************
+ -->
+
+
+		<helpdocument version="1.0">
 <meta>
 <topic id="textsharedguideactivexxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">ActiveX Control to Display Documents in Internet Explorer</title>
 <filename>/text/shared/guide/activex.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-10T12:38:40">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3143267"><bookmark_value>ActiveX control</bookmark_value>
@@ -100,10 +100,7 @@
 <paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Edit the copy of the document.</paragraph>
 </listitem>
 </list>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_idN1078F" xml-lang="en-US" l10n="NEW" localize="false">
-<embedvar href="text/shared/optionen/01020400.xhp#mozilla"/>
-</paragraph>
+<section id="relatedtopics"><comment>replaced embedvar by embed. Embedvar doesnt work</comment><embed href="text/shared/optionen/01020400.xhp#mozilla"/>
 <embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
 <embed href="text/shared/guide/doc_open.xhp#doc_open"/>
 <embed href="text/shared/guide/import_ms.xhp#import_ms"/>
