INTEGRATION: CWS hcshared18 (1.8.2); FILE MERGED

2008/05/28 18:15:10 fpe 1.8.2.3: remove DOCTYPE headers from source files to avoid performance problems in installed help
2008/05/22 07:50:52 ufi 1.8.2.2: fixing empty help ids
2008/05/21 09:12:23 ufi 1.8.2.1: vor testbuild

1 files changed, 80 insertions, 100 deletions

diff --git a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
index dc7e2b37dc..c07e1d74e7 100755
--- a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
+++ b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
@@ -1,41 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<helpdocument version="1.0">
+	
 <!--
  ***********************************************************************
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- * OpenOffice.org - a multi-platform office productivity suite
+ *  $RCSfile: microsoft_terms.xhp,v $fileonly,v $
  *
- * $RCSfile: microsoft_terms.xhp,v $
- * $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- * This file is part of OpenOffice.org.
+ *  last change: $Author: vg $ $Date: 2008-06-03 09:00:05 $
  *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+ 
+	
 <meta>
-<topic id="textsharedguidemicrosoft_termsxml" indexer="include" status="PUBLISH">
+<topic id="textsharedguidemicrosoft_termsxml" indexer="include">
 <title id="tit" xml-lang="en-US">Comparing Microsoft Office and $[officename] Terms</title>
 <filename>/text/shared/guide/microsoft_terms.xhp</filename>
 </topic>
@@ -45,205 +51,179 @@
 </bookmark>
 <paragraph role="heading" id="hd_id3156136" xml-lang="en-US" level="1" l10n="U" oldref="50"><variable id="microsoft_terms"><link href="text/shared/guide/microsoft_terms.xhp" name="Comparing Microsoft Office and $[officename] Terms">Comparing Microsoft Office and $[officename] Terms</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="1">The following tables list Microsoft Office XP features and their $[officename] equivalents.</paragraph>
+<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="1">The following table lists Microsoft Office features and their $[officename] equivalents.</paragraph>
 <table id="tbl_id3147088">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablehead" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="2">Microsoft Office XP</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablehead" id="par_id3156346" xml-lang="en-US" l10n="U" oldref="3">$[officename]</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153252"><bookmark_value>AutoShapes feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="4">AutoShapes</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="5"><link href="text/shared/guide/gallery_insert.xhp" name="Gallery Objects">Gallery Objects</link><br/>Shapes are on the <emph>Drawing</emph> toolbar (menu <item type="menuitem">View - Toolbars - Drawing</item>)</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3157910"><bookmark_value>Change Case feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3157910" xml-lang="en-US" l10n="U" oldref="6">Change Case</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3153825" xml-lang="en-US" l10n="U" oldref="7"><link href="text/shared/01/05050000.xhp" name="Case/Characters">Case/Characters</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145674"><bookmark_value>comments feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3145674" xml-lang="en-US" l10n="U" oldref="8">Comments</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3144510" xml-lang="en-US" l10n="U" oldref="9"><link href="text/shared/01/04050000.xhp" name="Notes">Notes</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3148946"><bookmark_value>Compare and Merge feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="10">Compare and Merge Documents</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3153524" xml-lang="en-US" l10n="U" oldref="11"><link href="text/shared/guide/redlining_doccompare.xhp" name="Compare">Compare</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3151041"><bookmark_value>Document Map feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3151041" xml-lang="en-US" l10n="U" oldref="12">Document Map</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3156280" xml-lang="en-US" l10n="U" oldref="13"><link href="text/shared/guide/navigator_setcursor.xhp" name="Navigator">Navigator</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153768"><bookmark_value>Formula Auditing feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="14">Formula Auditing</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3154013" xml-lang="en-US" l10n="U" oldref="15"><link href="text/scalc/01/06030000.xhp" name="Detective">Detective</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153573"><bookmark_value>Lines and Page Breaks feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3153573" xml-lang="en-US" l10n="U" oldref="16">Lines and Page Breaks</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="17"><link href="text/swriter/01/05030200.xhp" name="Text Flow">Text Flow</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id6054567" xml-lang="en-US" l10n="NEW">Page setup</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id8584551" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/05040000.xhp">Format - Page</link></paragraph>
+<paragraph role="tablecontent" id="par_id0522200809491254" xml-lang="en-US" l10n="NEW">For spreadsheets see also <link href="text/scalc/01/03100000.xhp">View - Page Break Preview</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3159153"><bookmark_value>Mail Merge feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3159153" xml-lang="en-US" l10n="U" oldref="18">Mail Merge</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3145748" xml-lang="en-US" l10n="U" oldref="19"><link href="text/swriter/guide/form_letters_main.xhp" name="Form Letter">Form Letter</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3152940"><bookmark_value>Markup feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="20">Markup</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3147048" xml-lang="en-US" l10n="U" oldref="21"><link href="text/shared/01/02230200.xhp" name="Changes - Show">Changes - Show</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154942"><bookmark_value>Pivot tables feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3154942" xml-lang="en-US" l10n="U" oldref="51">PivotTable</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3156181" xml-lang="en-US" l10n="U" oldref="52"><link href="text/scalc/01/12090102.xhp" name="DataPilot">DataPilot</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153950"><bookmark_value>Refresh Data feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3153950" xml-lang="en-US" l10n="CHG" oldref="26">Refresh Data (in Excel)</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id4526200" xml-lang="en-US" l10n="NEW"><link href="text/scalc/01/12100000.xhp">Refresh Range</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145643"><bookmark_value>Replace text as you type feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3145643" xml-lang="en-US" l10n="U" oldref="28">Replace text as you type</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3152962" xml-lang="en-US" l10n="U" oldref="29"><link href="text/shared/optionen/01010400.xhp" name="AutoCorrect">AutoCorrect</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154755"><bookmark_value>Show/Hide feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3154755" xml-lang="en-US" l10n="U" oldref="30">Show/Hide</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3150045" xml-lang="en-US" l10n="U" oldref="31"><link href="text/swriter/01/03100000.xhp" name="Nonprinting Characters">Nonprinting Characters</link>, <link href="text/swriter/01/03140000.xhp" name="Hidden Paragraphs">Hidden Paragraphs</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3156373"><bookmark_value>Spelling and Grammar feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3156373" xml-lang="en-US" l10n="U" oldref="34">Spelling and Grammar</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3150297" xml-lang="en-US" l10n="U" oldref="35"><link href="text/shared/01/06010000.xhp" name="Spellcheck">Spellcheck</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154205"><bookmark_value>Track changes feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3154205" xml-lang="en-US" l10n="U" oldref="38">Track changes</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3146810" xml-lang="en-US" l10n="U" oldref="39"><link href="text/shared/01/02230000.xhp" name="Changes - Record">Changes - Record</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3151214"><bookmark_value>Validation feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3151214" xml-lang="en-US" l10n="U" oldref="40">Validation</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3156138" xml-lang="en-US" l10n="U" oldref="41"><link href="text/scalc/01/12120000.xhp" name="Validity">Validity</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3166431"><bookmark_value>Workbook feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3166431" xml-lang="en-US" l10n="U" oldref="46">Workbook</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3155379" xml-lang="en-US" l10n="U" oldref="47"><link href="text/scalc/main0503.xhp" name="Spreadsheet">Spreadsheet</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
-<tablecell colspan="" rowspan="">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153228"><bookmark_value>Worksheet feature in Microsoft Office</bookmark_value>
-</bookmark>
+<tablecell>
 <paragraph role="tablecontent" id="par_id3153228" xml-lang="en-US" l10n="U" oldref="48">Worksheet</paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="tablecontent" id="par_id3148593" xml-lang="en-US" l10n="U" oldref="49"><link href="text/scalc/01/04050000.xhp" name="Sheet">Sheet</link></paragraph>
 </tablecell>
 </tablerow>
+<tablerow>
+<tablecell>
+<paragraph role="tablecontent" id="par_id0522200809491330" xml-lang="en-US" l10n="NEW">Shared Workbooks</paragraph>
+</tablecell>
+<tablecell>
+<paragraph role="tablecontent" id="par_id0522200809491320" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/collab.xhp">Collaboration</link></paragraph>
+</tablecell>
+</tablerow>
 </table>
+
 <section id="relatedtopics">
 <embed href="text/shared/guide/ms_user.xhp#ms_user"/>
 </section>