diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:16 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:16 +0100 |
commit | bc131c1ceaca2a227d4827f765e83faa0754a3f1 (patch) | |
tree | d275c8e57d62430153ca6ef21966f5033fd99cd9 /helpcontent2/source/text/shared/guide/pasting.xhp | |
parent | d55766ce22ef3ed771938e5ad60f6b776bab38ad (diff) | |
parent | 13e0998c215eb9419fce0ca6a4fc0d69a18356d5 (diff) |
Merge commit 'ooo/DEV300_m103'
Conflicts:
helpcontent2/helpers/hid.lst
helpcontent2/source/text/scalc/01/04050000.xhp
helpcontent2/source/text/scalc/guide/text_rotate.xhp
helpcontent2/source/text/shared/01/04110000.xhp
helpcontent2/source/text/shared/01/06040000.xhp
helpcontent2/source/text/shared/02/01170202.xhp
helpcontent2/source/text/shared/main0108.xhp
helpcontent2/source/text/shared/optionen/01030000.xhp
helpcontent2/source/text/swriter/01/05150101.xhp
helpcontent2/util/target.pmk
Diffstat (limited to 'helpcontent2/source/text/shared/guide/pasting.xhp')
-rwxr-xr-x | helpcontent2/source/text/shared/guide/pasting.xhp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/helpcontent2/source/text/shared/guide/pasting.xhp b/helpcontent2/source/text/shared/guide/pasting.xhp index 10f7c8df53..e8b8719002 100755 --- a/helpcontent2/source/text/shared/guide/pasting.xhp +++ b/helpcontent2/source/text/shared/guide/pasting.xhp @@ -5,7 +5,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,17 +29,13 @@ * ************************************************************************ --> - + <helpdocument version="1.0"> <meta> <topic id="textsharedguidepastingxml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Pasting Contents in Special Formats</title> <filename>/text/shared/guide/pasting.xhp</filename> </topic> -<history> -<created date="2004-04-30T12:25:55">UFI: new guide requested by users</created> -<lastedited date="2006-03-20T14:29:55">checked - yj</lastedited> -</history> </meta> <body> <bookmark xml-lang="en-US" branch="index" id="bm_id3620715"><bookmark_value>clipboard;pasting formatted/unformatted text</bookmark_value> @@ -52,6 +48,9 @@ </variable></paragraph> <paragraph role="paragraph" id="par_idN10743" xml-lang="en-US" l10n="NEW">Contents that are stored on the clipboard can be pasted into your document using different formats. In %PRODUCTNAME you can choose how to paste the contents using a dialog or a drop-down icon.</paragraph> <paragraph role="paragraph" id="par_idN10746" xml-lang="en-US" l10n="NEW">The available options depend on the contents of the clipboard.</paragraph> + +<paragraph xml-lang="en-US" id="hd_id3144547360" role="paragraph" l10n="NEW">In Writer text documents, you can press <switchinline select="sys"><caseinline select="MAC">Command+Option</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Shift+V to paste the contents of the clipboard as unformatted text.</paragraph> + <paragraph role="heading" id="par_idN10749" xml-lang="en-US" level="2" l10n="NEW">Pasting clipboard contents using an icon menu</paragraph> <list type="ordered"> <listitem> @@ -62,6 +61,7 @@ </listitem> </list> <paragraph role="paragraph" id="par_idN1075B" xml-lang="en-US" l10n="NEW">If you do not like the result, click the <emph>Undo</emph> icon and then paste again with another option.</paragraph> + <paragraph role="heading" id="par_idN10762" xml-lang="en-US" level="2" l10n="NEW">Pasting clipboard contents using a dialog</paragraph> <list type="ordered"> <listitem> |