diff options
Diffstat (limited to 'patches/dev300/writer-doc-comparison-help.diff')
| -rw-r--r-- | patches/dev300/writer-doc-comparison-help.diff | 158 |
1 files changed, 0 insertions, 158 deletions
diff --git a/patches/dev300/writer-doc-comparison-help.diff b/patches/dev300/writer-doc-comparison-help.diff deleted file mode 100644 index 413532c74..000000000 --- a/patches/dev300/writer-doc-comparison-help.diff +++ /dev/null @@ -1,158 +0,0 @@ -From e020b833ba411fafd820035f717b4793760dd392 Mon Sep 17 00:00:00 2001 -From: Jan Holesovsky <kendy@suse.cz> -Date: Fri, 14 May 2010 17:06:45 +0200 -Subject: [PATCH 641/768] writer-doc-comparison-help.diff - ---- - helpcontent2/source/text/shared/00/00000406.xhp | 2 + - .../source/text/shared/optionen/01040000.xhp | 1 + - .../source/text/shared/optionen/comparisonopt.xhp | 77 ++++++++++++++++++++ - .../source/text/shared/optionen/makefile.mk | 3 +- - helpcontent2/util/swriter/makefile.mk | 1 + - 5 files changed, 83 insertions(+), 1 deletions(-) - create mode 100644 helpcontent2/source/text/shared/optionen/comparisonopt.xhp - -diff --git helpcontent2/source/text/shared/00/00000406.xhp helpcontent2/source/text/shared/00/00000406.xhp -index a6ac734..0749bcb 100644 ---- helpcontent2/source/text/shared/00/00000406.xhp -+++ helpcontent2/source/text/shared/00/00000406.xhp -@@ -294,6 +294,8 @@ - </variable></paragraph> - <paragraph xml-lang="en-US" id="par_id3147005" role="paragraph" l10n="U" oldref="101"><variable id="registeraenderungen">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Changes</emph> - </variable></paragraph> -+ <paragraph xml-lang="en-US" id="par_id3147006" role="paragraph" l10n="U"><variable id="comparisonoptions">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Comparison</emph> -+</variable></paragraph> - <paragraph xml-lang="en-US" id="par_id3159333" role="paragraph" l10n="U" oldref="48"><variable id="webbrowser1">Open an HTML document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web</emph> - </variable></paragraph> - <paragraph xml-lang="en-US" id="par_id3149448" role="paragraph" l10n="U" oldref="139"><variable id="hinter">Open an HTML document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - Background</emph> -diff --git helpcontent2/source/text/shared/optionen/01040000.xhp helpcontent2/source/text/shared/optionen/01040000.xhp -index 8d889c7..7143222 100644 ---- helpcontent2/source/text/shared/optionen/01040000.xhp -+++ helpcontent2/source/text/shared/optionen/01040000.xhp -@@ -62,6 +62,7 @@ - <embed href="text/shared/optionen/01040400.xhp#drucken"/> - <embed href="text/shared/optionen/01040500.xhp#tabelle"/> - <embed href="text/shared/optionen/01040700.xhp#aenderungen"/> -+<embed href="text/shared/optionen/comparisonopt.xhp#comparison"/> - <embed href="text/shared/optionen/01041000.xhp#compatibility"/> - <embed href="text/shared/optionen/01041100.xhp#autocaption"/> - <embed href="text/shared/optionen/mailmerge.xhp#mailmerge"/> -diff --git helpcontent2/source/text/shared/optionen/comparisonopt.xhp helpcontent2/source/text/shared/optionen/comparisonopt.xhp -new file mode 100644 -index 0000000..e904ef7 ---- /dev/null -+++ helpcontent2/source/text/shared/optionen/comparisonopt.xhp -@@ -0,0 +1,77 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+ -+ -+<!-- -+ *********************************************************************** -+ * -+ * 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 -+ * -+ * $RCSfile: comparisonopt.xhp,v $ -+ * $Revision: 1.0 $ -+ * -+ * This file is part of OpenOffice.org. -+ * -+ * 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. -+ * -+ * 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. -+ * -+ ************************************************************************ -+ --> -+ -+<helpdocument version="1.0"> -+<meta> -+<topic id="textsharedoptionencomparexml" indexer="include" status="PUBLISH"> -+<title id="tit" xml-lang="en-US">Comparison</title> -+<filename>/text/shared/optionen/comparisonopt.xhp</filename> -+</topic> -+<history> -+<created date="2009-08-04T00:00:00">New file created</created> -+<lastedited date="2009-08-04T16:30:58">...</lastedited> -+</history> -+</meta> -+<body> -+<section id="comparison"> -+<bookmark xml-lang="en-US" branch="hid/HID_COMPARISON_OPT" id="bm_id3149795" localize="false"/> -+<paragraph role="heading" id="hd_id3153823" xml-lang="en-US" level="1" l10n="U"><link href="text/shared/optionen/comparisonopt.xhp" name="Comparison">Comparison</link></paragraph> -+<paragraph role="paragraph" id="par_id3149416" xml-lang="en-US" l10n="U"><ahelp hid="HID_COMPARISON_OPT">Specifies the settings for comparing two documents.</ahelp></paragraph> -+</section> -+<paragraph role="paragraph" id="par_id3156153" xml-lang="en-US" l10n="U">To compare the current document with another one choose <link href="text/shared/01/02240000.xhp" name="Edit - Compare Document"><emph>Edit - Compare Document</emph></link>.</paragraph> -+<section id="howtoget"> -+ <embed href="text/shared/00/00000406.xhp#comparisonoptions"/> -+</section> -+<paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="2" l10n="U">Compare Documents</paragraph> -+<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="U">Specifies the mode for comparing two documents.</paragraph> -+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_AUTO" id="bm_id3153896" localize="false"/> -+<paragraph role="heading" id="hd_id3148550" xml-lang="en-US" level="3" l10n="U">Auto</paragraph> -+<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U"><ahelp hid="SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_AUTO">Use the most appropriate comparison settings for the current document.</ahelp></paragraph> -+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_CHAR" id="bm_id3150358" localize="false"/> -+<paragraph role="heading" id="hd_id3152812" xml-lang="en-US" level="3" l10n="U">By word</paragraph> -+<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U"><ahelp hid="SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_CHAR">Compare documents with a word as the basic unit.</ahelp></paragraph> -+<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_WORD" id="bm_id3149203" localize="false"/> -+<paragraph role="heading" id="hd_id3148674" xml-lang="en-US" level="3" l10n="U">By character</paragraph> -+<paragraph role="paragraph" id="par_id3151042" xml-lang="en-US" l10n="U"><ahelp hid="SW:RADIOBUTTON:TP_COMPARISON_OPT:RB_WORD">Compare documents with a character as the basic unit.</ahelp></paragraph> -+<paragraph role="heading" id="hd_id3145607" xml-lang="en-US" level="2" l10n="U">Settings</paragraph> -+<paragraph role="paragraph" id="par_id3149562" xml-lang="en-US" l10n="U">Specifies more comparison settings if the chosen mode is not Auto.</paragraph> -+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_COMPARISON_OPT:CB_RSID" id="bm_id3161831" localize="false"/> -+<paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="3" l10n="U">Use RSID</paragraph> -+<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="U"><ahelp hid="SW:CHECKBOX:TP_COMPARISON_OPT:CB_RSID">Specifies that RSIDs are used when the documents are compared. This has an effect only if both documents have RSIDs and their root RSIDs are the same.</ahelp></paragraph> -+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_COMPARISON_OPT:CB_IGNORE" id="bm_id3148618" localize="false"/> -+<paragraph role="heading" id="hd_id3163713" xml-lang="en-US" level="3" l10n="U">Ignore isolated pieces of length</paragraph> -+<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U"><ahelp hid="SW:CHECKBOX:TP_COMPARISON_OPT:CB_IGNORE">Specifies that matched sequences of words or characters (depending on the chosen compare mode) of length equal to or less than the entered one will be ignored and will be shown as inserted/deleted.</ahelp></paragraph> -+</body> -+</helpdocument> -diff --git helpcontent2/source/text/shared/optionen/makefile.mk helpcontent2/source/text/shared/optionen/makefile.mk -index db6e7b7..b0781dd 100644 ---- helpcontent2/source/text/shared/optionen/makefile.mk -+++ helpcontent2/source/text/shared/optionen/makefile.mk -@@ -113,6 +113,7 @@ XHPFILES = \ - 01160100.xhp \ - 01160200.xhp \ - 01160201.xhp \ -+ comparisonopt.xhp \ - improvement.xhp \ - java.xhp \ - javaclasspath.xhp \ -@@ -127,7 +128,7 @@ XHPFILES = \ - viewcertificate.xhp \ - viewcertificate_c.xhp \ - viewcertificate_d.xhp \ -- viewcertificate_g.xhp -+ viewcertificate_g.xhp - - # --- Targets ------------------------------------------------------ - -diff --git helpcontent2/util/swriter/makefile.mk helpcontent2/util/swriter/makefile.mk -index 02509d4..bef2c1f 100644 ---- helpcontent2/util/swriter/makefile.mk -+++ helpcontent2/util/swriter/makefile.mk -@@ -1332,6 +1332,7 @@ LINKLINKFILES= \ - text$/shared$/optionen$/01160100.xhp \ - text$/shared$/optionen$/01160200.xhp \ - text$/shared$/optionen$/01160201.xhp \ -+ text$/shared$/optionen$/comparisonopt.xhp \ - text$/shared$/optionen$/improvement.xhp \ - text$/shared$/optionen$/java.xhp \ - text$/shared$/optionen$/javaclasspath.xhp \ --- -1.7.0.1 - |