INTEGRATION: CWS hcshared06 (1.8.18); FILE MERGED

2006/10/25 13:48:28 ufi 1.8.18.1: bugfixing

1 files changed, 27 insertions, 44 deletions

diff --git a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
index 15de6dffca..cd12534001 100644
--- a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
@@ -2,56 +2,36 @@
 <!--
  ***********************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: insert_bitmap.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.9 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: rt $ $Date: 2006-12-01 16:56:49 $
  *
- *  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.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  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
+ *    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.
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
+ *    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
  *
  ************************************************************************
  -->
@@ -64,7 +44,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-06T14:20:08">converted from old format - fpe</lastedited>
+<lastedited date="2006-10-24T16:19:51">converted from old format - fpe</lastedited>
 </history>
 </meta>
 <body>
@@ -115,8 +95,9 @@
 <paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="2" l10n="U" oldref="10">Editing Bitmaps</paragraph>
 <paragraph role="paragraph" id="par_id3148552" xml-lang="en-US" l10n="CHG" oldref="11">When you select the bitmap image, the <emph>Picture</emph> Bar offers you the tools for editing the image. Only a local copy is edited in the document, even if you have inserted an image as a link.</paragraph>
 <paragraph role="note" id="par_id3159413" xml-lang="en-US" l10n="CHG" oldref="12">The <emph>Picture</emph> Bar may look slightly different depending to the module you are using.</paragraph>
-<paragraph role="paragraph" id="par_id3154124" xml-lang="en-US" l10n="CHG" oldref="13">A number of filters are located on the <link href="text/shared/02/24010000.xhp" name="Filter"><emph>Filter</emph></link> toolbar, which you can open with the icon on the <emph>Picture</emph> Bar.</paragraph>
-<paragraph role="paragraph" id="par_id3145273" xml-lang="en-US" l10n="U" oldref="14">Some of the filters open a dialog, which you can use to select, for example, the intensity of the filter.</paragraph>
+<paragraph role="paragraph" id="par_id3154124" xml-lang="en-US" l10n="CHG" oldref="13">A number of filters are located on the <link href="text/shared/02/24010000.xhp" name="Graphic Filter">Graphic <emph>Filter</emph></link> toolbar, which you can open with the icon on the <emph>Picture</emph> Bar. </paragraph>
+<paragraph role="paragraph" id="par_id7055574" xml-lang="en-US" l10n="NEW">The original picture file will not be changed by the filters. Filters are applied to a picture only inside the document. </paragraph>
+<paragraph role="paragraph" id="par_id3145273" xml-lang="en-US" l10n="CHG" oldref="14">Some of the filters open a dialog, which you can use to select, for example, the intensity of the filter. Most filters can be applied multiple times to increase the filter effect.</paragraph>
 <paragraph role="paragraph" id="par_id3150105" xml-lang="en-US" l10n="U" oldref="15">In $[officename] Draw and $[officename] Image, you can add text and graphics, select these objects together with the bitmap, and export the selection as a new bitmap image.</paragraph>
 <paragraph role="heading" id="hd_id3153574" xml-lang="en-US" level="2" l10n="U" oldref="16">Saving Bitmaps</paragraph>
 <paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="17">If you want to save in a format such as GIF, JPEG or TIFF, you must select and export the bitmap image. This is only possible in $[officename] Draw and $[officename] Impress.</paragraph>
@@ -126,6 +107,7 @@
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3148618" xml-lang="en-US" l10n="U" oldref="19">Choose <emph>File - Export</emph>. The <emph>Export</emph> dialog opens.</paragraph>
+<paragraph role="listitem" id="par_id3157139" xml-lang="en-US" l10n="NEW">The <emph>Export</emph> command writes the picture with all applied filter effects to a file. The <emph>Save as Picture</emph> command in the context menu saves the picture without any filter effects, if the picture was inserted as a linked picture. An embedded picture will always be saved or exported with filters applied.<comment>see i70055</comment></paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="20">In the <emph>File format</emph> field, select the file format you want, for example GIF or JPEG.</paragraph>
@@ -141,6 +123,7 @@
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
 <embed href="text/shared/guide/imagemap.xhp#imagemap"/>
+<paragraph role="paragraph" id="par_id1033051" xml-lang="en-US" l10n="NEW"><link href="text/shared/02/24010000.xhp">Graphic Filter Bar from the Picture Bar</link></paragraph>
 <switch select="appl">
 <case select="WRITER"><embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
 </case>