writegraphic optional in original format and not general as JPG

4 files changed, 35 insertions, 17 deletions

diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 20dee5665631..9e40117b682c 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: css1atr.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mib $ $Date: 2000-12-12 09:39:59 $
+ *  last change: $Author: jp $ $Date: 2000-12-21 16:21:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -3094,7 +3094,8 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
             if( pTempFileName )
                 sGrfNm = *pTempFileName;
             USHORT nErr = XOutBitmap::WriteGraphic( *pGrf, sGrfNm,
-                        String::CreateFromAscii("JPG") );
+                        String::CreateFromAscii("JPG"),
+                        XOUTBMP_USE_NATIVE_IF_POSSIBLE );
             if( !nErr )     // fehlerhaft, da ist nichts auszugeben
             {
                 sGrfNm = URIHelper::SmartRelToAbs( sGrfNm );
@@ -3494,6 +3495,9 @@ SwAttrFnTab aCSS1AttrFnTab = {
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.5  2000/12/12 09:39:59  mib
+      #70821#: Don't export empty frames as spacer if they have a background
+
       Revision 1.4  2000/11/20 09:39:36  jp
       new para attributes - expand para range
 
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 833406514e56..c515411620c3 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: htmlfly.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mib $ $Date: 2000-12-12 09:39:59 $
+ *  last change: $Author: jp $ $Date: 2000-12-21 16:21:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1284,7 +1284,8 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
                     rGrfName = *rHTMLWrt.GetOrigFileName();
                 USHORT nErr = XOutBitmap::WriteGraphic( *pGrf,  rGrfName,
                         String::CreateFromAscii("JPG"),
-                        XOUTBMP_USE_GIF_IF_SENSIBLE);
+                        (XOUTBMP_USE_GIF_IF_SENSIBLE |
+                         XOUTBMP_USE_NATIVE_IF_POSSIBLE));
                 if( !nErr )
                 {
                     rGrfName = URIHelper::SmartRelToAbs( rGrfName );
@@ -1610,7 +1611,8 @@ static Writer & OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     if( aGrf.GetType() == GRAPHIC_NONE ||
         XOutBitmap::WriteGraphic( aGrf, aGrfNm,
                                   String::CreateFromAscii( "JPG" ),
-                                  XOUTBMP_USE_GIF_IF_POSSIBLE ) != 0 )
+                                  (XOUTBMP_USE_GIF_IF_POSSIBLE|
+                                   XOUTBMP_USE_NATIVE_IF_POSSIBLE) ) != 0 )
     {
         // leer oder fehlerhaft, da ist nichts auszugeben
         rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
@@ -1650,7 +1652,8 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
             aGrfNm = *rHTMLWrt.GetOrigFileName();
         pGrfNd->SwapIn( TRUE );
 
-        ULONG nFlags = XOUTBMP_USE_GIF_IF_SENSIBLE;
+        ULONG nFlags = XOUTBMP_USE_GIF_IF_SENSIBLE |
+                       XOUTBMP_USE_NATIVE_IF_POSSIBLE;
         switch( rMirror.GetValue() )
         {
         case RES_MIRROR_GRF_VERT:   nFlags = XOUTBMP_MIRROR_HORZ; break;
@@ -1961,11 +1964,14 @@ BOOL SwHTMLPosFlyFrm::operator<( const SwHTMLPosFlyFrm& rFrm ) const
 
       Source Code Control System - Header
 
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/html/htmlfly.cxx,v 1.4 2000-12-12 09:39:59 mib Exp $
+      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/html/htmlfly.cxx,v 1.5 2000-12-21 16:21:48 jp Exp $
 
       Source Code Control System - Update
 
       $Log: not supported by cvs2svn $
+      Revision 1.4  2000/12/12 09:39:59  mib
+      #70821#: Don't export empty frames as spacer if they have a background
+
       Revision 1.3  2000/11/01 19:23:14  jp
       export of mail graphics removed
 
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 9f6389728353..3c91b545dbb9 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: htmlplug.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-01 19:23:14 $
+ *  last change: $Author: jp $ $Date: 2000-12-21 16:21:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1294,7 +1294,8 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
 
         USHORT nErr = XOutBitmap::WriteGraphic( aGrf, aGrfNm,
                                     String::CreateFromAscii("JPG"),
-                                    XOUTBMP_USE_GIF_IF_POSSIBLE );
+                                    (XOUTBMP_USE_GIF_IF_POSSIBLE |
+                                     XOUTBMP_USE_NATIVE_IF_POSSIBLE) );
         if( nErr )              // fehlerhaft, da ist nichts auszugeben
         {
             rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE;
@@ -1315,11 +1316,14 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
 
       Source Code Control System - Header
 
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/html/htmlplug.cxx,v 1.3 2000-11-01 19:23:14 jp Exp $
+      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/html/htmlplug.cxx,v 1.4 2000-12-21 16:21:48 jp Exp $
 
       Source Code Control System - Update
 
       $Log: not supported by cvs2svn $
+      Revision 1.3  2000/11/01 19:23:14  jp
+      export of mail graphics removed
+
       Revision 1.2  2000/10/20 13:43:09  jp
       use correct INetURL-Decode enum
 
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index d0096d4f0b60..29584b03167a 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wrthtml.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mib $ $Date: 2000-12-14 09:28:31 $
+ *  last change: $Author: jp $ $Date: 2000-12-21 16:21:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1222,7 +1222,8 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem,
             if(pTempFileName)
                 rEmbGrfNm = *pTempFileName;
             sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, rEmbGrfNm,
-                    String::CreateFromAscii( "JPG" ) );
+                    String::CreateFromAscii( "JPG" ),
+                    XOUTBMP_USE_NATIVE_IF_POSSIBLE );
             if( !nErr )     // fehlerhaft, da ist nichts auszugeben
             {
                 rEmbGrfNm = URIHelper::SmartRelToAbs( rEmbGrfNm );
@@ -1399,11 +1400,14 @@ void GetHTMLWriter( const String&, WriterRef& xRet )
 
       Source Code Control System - Header
 
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/html/wrthtml.cxx,v 1.5 2000-12-14 09:28:31 mib Exp $
+      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/html/wrthtml.cxx,v 1.6 2000-12-21 16:21:48 jp Exp $
 
       Source Code Control System - Update
 
       $Log: not supported by cvs2svn $
+      Revision 1.5  2000/12/14 09:28:31  mib
+      #80006#: Export using utf-8 encoding
+
       Revision 1.4  2000/12/12 13:11:13  mib
       #80296#: Export start value if a list is continued