some optimizations, (removing support for device dependent cgm's)

10 files changed, 201 insertions, 481 deletions

diff --git a/goodies/source/filter.vcl/icgm/actimpr.cxx b/goodies/source/filter.vcl/icgm/actimpr.cxx
index d861b52114c9..c3d2f80fe570 100644
--- a/goodies/source/filter.vcl/icgm/actimpr.cxx
+++ b/goodies/source/filter.vcl/icgm/actimpr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: actimpr.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:13 $
+ *  last change: $Author: sj $ $Date: 2000-12-15 12:21:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -156,16 +156,6 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XMod
                 maXServiceManagerSC = utl::getProcessServiceFactory();
                 if ( maXServiceManagerSC.is() )
                 {
-
-                    maXMultiServiceFactory = ::com::sun::star::uno::Reference< lang::XMultiServiceFactory >
-                            ( maXServiceManagerSC, ::com::sun::star::uno::UNO_QUERY );
-                    if ( maXMultiServiceFactory.is() )
-                    {
-                        maXDrawPage = *(uno::Reference< drawing::XDrawPage > *)maXDrawPages->getByIndex( 0 ).getValue();
-                        if ( ImplInitPage() )
-                            bStatRet = sal_True;
-                    }
-/*
                     uno::Any aAny( rModel->queryInterface( ::getCppuType((const uno::Reference< lang::XMultiServiceFactory >*)0) ));
                     if( aAny >>= maXMultiServiceFactory )
                     {
@@ -173,7 +163,6 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XMod
                         if ( ImplInitPage() )
                             bStatRet = sal_True;
                     }
-*/
                 }
             }
         }
diff --git a/goodies/source/filter.vcl/icgm/bitmap.cxx b/goodies/source/filter.vcl/icgm/bitmap.cxx
index c89cdb8c4e3c..77067ce82ae0 100644
--- a/goodies/source/filter.vcl/icgm/bitmap.cxx
+++ b/goodies/source/filter.vcl/icgm/bitmap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bitmap.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:13 $
+ *  last change: $Author: sj $ $Date: 2000-12-15 12:22:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -333,43 +333,34 @@ sal_Bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc )
     sal_uInt32 nHeaderSize = 2 + 3 * nPrecision + 3 * mpCGM->ImplGetPointSize();
     rDesc.mnScanSize = ( ( rDesc.mnX * rDesc.mnDstBitsPerPixel + 7 ) >> 3 );
 
-    if ( ( mpCGM->mnMode & CGM_IMPORT_IM ) && ( rDesc.mnLocalColorPrecision & 0x8000 ) )
-    {                                                       // if (sal_uInt16)precision is negative the color cell
-        rDesc.mnScanSize = ( rDesc.mnScanSize + 3 ) &~3;    // array doesn't include data - instead it is just
-        rDesc.mpBuf = (sal_uInt8*)mpCGM->ImplGetUI( 4 );            // a 4 Byte pointer to the data
-        mpCGM->mnElementSize = mpCGM->mnParaSize;
-    }
-    else
+    sal_uInt32  nScanSize;
+    nScanSize = rDesc.mnScanSize;
+    if ( ( nScanSize * rDesc.mnY + nHeaderSize ) != mpCGM->mnElementSize )  // try a scansize without dw alignment
     {
-        sal_uInt32  nScanSize;
-        nScanSize = rDesc.mnScanSize;
-        if ( ( nScanSize * rDesc.mnY + nHeaderSize ) != mpCGM->mnElementSize )  // try a scansize without dw alignment
+        nScanSize = ( rDesc.mnScanSize + 1 ) & ~1;
+        if ( ( nScanSize * rDesc.mnY + nHeaderSize ) != mpCGM->mnElementSize )  // then we'll try word alignment
         {
-            nScanSize = ( rDesc.mnScanSize + 1 ) & ~1;
-            if ( ( nScanSize * rDesc.mnY + nHeaderSize ) != mpCGM->mnElementSize )  // then we'll try word alignment
+            nScanSize = ( rDesc.mnScanSize + 3 ) & ~3;
+            if ( ( nScanSize * rDesc.mnY + nHeaderSize ) != mpCGM->mnElementSize )  // and last we'll try dword alignment
             {
-                nScanSize = ( rDesc.mnScanSize + 3 ) & ~3;
-                if ( ( nScanSize * rDesc.mnY + nHeaderSize ) != mpCGM->mnElementSize )  // and last we'll try dword alignment
+                nScanSize = ( rDesc.mnScanSize + 1 ) & ~1;          // and LAST BUT NOT LEAST we'll try word alignment without aligning the last line
+                if ( ( nScanSize * ( rDesc.mnY - 1 ) + rDesc.mnScanSize + nHeaderSize ) != mpCGM->mnElementSize )
                 {
-                    nScanSize = ( rDesc.mnScanSize + 1 ) & ~1;          // and LAST BUT NOT LEAST we'll try word alignment without aligning the last line
+                    nScanSize = ( rDesc.mnScanSize + 3 ) & ~3;
                     if ( ( nScanSize * ( rDesc.mnY - 1 ) + rDesc.mnScanSize + nHeaderSize ) != mpCGM->mnElementSize )
                     {
-                        nScanSize = ( rDesc.mnScanSize + 3 ) & ~3;
-                        if ( ( nScanSize * ( rDesc.mnY - 1 ) + rDesc.mnScanSize + nHeaderSize ) != mpCGM->mnElementSize )
-                        {
-                            mpCGM->mnParaSize = 0;                              // this format is corrupt
-                            rDesc.mbStatus = sal_False;
-                        }
+                        mpCGM->mnParaSize = 0;                              // this format is corrupt
+                        rDesc.mbStatus = sal_False;
                     }
                 }
             }
         }
-        rDesc.mnScanSize = nScanSize;
-        if ( rDesc.mbStatus )
-        {
-            rDesc.mpBuf = mpCGM->mpSource + mpCGM->mnParaSize;  // mpBuf now points to the first scanline
-            mpCGM->mnParaSize += rDesc.mnScanSize * rDesc.mnY;
-        }
+    }
+    rDesc.mnScanSize = nScanSize;
+    if ( rDesc.mbStatus )
+    {
+        rDesc.mpBuf = mpCGM->mpSource + mpCGM->mnParaSize;  // mpBuf now points to the first scanline
+        mpCGM->mnParaSize += rDesc.mnScanSize * rDesc.mnY;
     }
     return rDesc.mbStatus;
 }
diff --git a/goodies/source/filter.vcl/icgm/cgm.cxx b/goodies/source/filter.vcl/icgm/cgm.cxx
index b145264869d4..3fa35a8b5c18 100644
--- a/goodies/source/filter.vcl/icgm/cgm.cxx
+++ b/goodies/source/filter.vcl/icgm/cgm.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cgm.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: sj $ $Date: 2000-11-10 09:33:25 $
+ *  last change: $Author: sj $ $Date: 2000-12-15 12:23:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -255,16 +255,7 @@ sal_uInt32 CGM::ImplGetUI16( sal_uInt32 nAlign )
 {
     sal_uInt8* pSource = mpSource + mnParaSize;
     mnParaSize += 2;
-    if ( nAlign && ( mnMode & CGM_IMPORT_IM ) )
-    {
-        nAlign--;
-        mnParaSize += nAlign;
-        mnParaSize &=~nAlign;
-    }
-    if ( mnMode & CGM_BIG_ENDIAN )
-        return ( pSource[ 0 ] << 8 ) +  pSource[ 1 ];
-    else
-        return ( pSource[ 1 ] << 8 ) +  pSource[ 0 ];
+    return ( pSource[ 0 ] << 8 ) +  pSource[ 1 ];
 };
 
 // ---------------------------------------------------------------
@@ -289,25 +280,16 @@ long CGM::ImplGetI( sal_uInt32 nPrecision )
 
         case 2 :
         {
-            if ( mnMode & CGM_BIG_ENDIAN )
-                return (sal_Int16)( ( pSource[ 0 ] << 8 ) | pSource[ 1 ] );
-            else
-                return (sal_Int16)( ( pSource[ 1 ] << 8 ) | pSource[ 0 ] );
+            return (sal_Int16)( ( pSource[ 0 ] << 8 ) | pSource[ 1 ] );
         }
 
         case 3 :
         {
-            if ( mnMode & CGM_BIG_ENDIAN )
-                return ( ( pSource[ 0 ] << 24 ) | ( pSource[ 1 ] << 16 ) | pSource[ 2 ] << 8 ) >> 8;
-            else
-                return ( ( pSource[ 2 ] << 24 ) | ( pSource[ 1 ] << 16 ) | pSource[ 0 ] << 8 ) >> 8;
+            return ( ( pSource[ 0 ] << 24 ) | ( pSource[ 1 ] << 16 ) | pSource[ 2 ] << 8 ) >> 8;
         }
         case 4:
         {
-            if ( mnMode & CGM_BIG_ENDIAN )
-                return (sal_Int32)( ( pSource[ 0 ] << 24 ) | ( pSource[ 1 ] << 16 ) | ( pSource[ 2 ] << 8 ) | ( pSource[ 3 ] ) );
-            else
-                return (sal_Int32)( ( pSource[ 3 ] << 24 ) | ( pSource[ 2 ] << 16 ) | ( pSource[ 1 ] << 8 ) | ( pSource[ 0 ] ) );
+            return (sal_Int32)( ( pSource[ 0 ] << 24 ) | ( pSource[ 1 ] << 16 ) | ( pSource[ 2 ] << 8 ) | ( pSource[ 3 ] ) );
         }
         default:
             mbStatus = sal_False;
@@ -327,24 +309,15 @@ sal_uInt32 CGM::ImplGetUI( sal_uInt32 nPrecision )
             return  (sal_Int8)*pSource;
         case 2 :
         {
-            if ( mnMode & CGM_BIG_ENDIAN )
-                return (sal_uInt16)( ( pSource[ 0 ] << 8 ) | pSource[ 1 ] );
-            else
-                return (sal_uInt16)( ( pSource[ 1 ] << 8 ) | pSource[ 0 ] );
+            return (sal_uInt16)( ( pSource[ 0 ] << 8 ) | pSource[ 1 ] );
         }
         case 3 :
         {
-            if ( mnMode & CGM_BIG_ENDIAN )
-                return ( pSource[ 0 ] << 16 ) | ( pSource[ 1 ] << 8 ) | pSource[ 2 ];
-            else
-                return ( pSource[ 2 ] << 16 ) | ( pSource[ 1 ] << 8 ) | pSource[ 0 ];
+            return ( pSource[ 0 ] << 16 ) | ( pSource[ 1 ] << 8 ) | pSource[ 2 ];
         }
         case 4:
         {
-            if ( mnMode & CGM_BIG_ENDIAN )
-                return (sal_uInt32)( ( pSource[ 0 ] << 24 ) | ( pSource[ 1 ] << 16 ) | ( pSource[ 2 ] << 8 ) | ( pSource[ 3 ] ) );
-            else
-                return (sal_uInt32)( ( pSource[ 3 ] << 24 ) | ( pSource[ 2 ] << 16 ) | ( pSource[ 1 ] << 8 ) | ( pSource[ 0 ] ) );
+            return (sal_uInt32)( ( pSource[ 0 ] << 24 ) | ( pSource[ 1 ] << 16 ) | ( pSource[ 2 ] << 8 ) | ( pSource[ 3 ] ) );
         }
         default:
             mbStatus = sal_False;
@@ -384,14 +357,8 @@ double CGM::ImplGetFloat( RealPrecision eRealPrecision, sal_uInt32 nRealSize )
     float   fFloatBuf;
 
 #ifdef __BIGENDIAN
-    if ( mnMode & CGM_BIG_ENDIAN )
         bCompatible = sal_True;
-    else
-        bCompatible = sal_False;
 #else
-    if ( mnMode & CGM_LITTLE_ENDIAN )
-        bCompatible = sal_True;
-    else
         bCompatible = sal_False;
 #endif
     if ( bCompatible )
@@ -456,12 +423,7 @@ sal_uInt32 CGM::ImplGetPointSize()
     if ( pElement->eVDCType == VDC_INTEGER )
         return pElement->nVDCIntegerPrecision << 1;
     else
-    {
-        if ( mnMode & CGM_IMPORT_IM )
-            return pElement->nVDCRealSize * 3;
-        else
-            return pElement->nVDCRealSize << 1;
-    }
+        return pElement->nVDCRealSize << 1;
 }
 
 // ---------------------------------------------------------------
@@ -505,8 +467,6 @@ void CGM::ImplGetPoint( FloatPoint& rFloatPoint, sal_Bool bMap )
     {
         rFloatPoint.X = ImplGetFX();
         rFloatPoint.Y = ImplGetFY();
-        if ( mnMode & CGM_IMPORT_IM )
-            mnParaSize += 8;
     }
     if ( bMap )
         ImplMapPoint( rFloatPoint );
@@ -527,12 +487,8 @@ void CGM::ImplGetRectangle( FloatRect& rFloatRect, sal_Bool bMap )
     {
         rFloatRect.Left = ImplGetFX();
         rFloatRect.Bottom = ImplGetFY();
-        if ( mnMode & CGM_IMPORT_IM )
-            mnParaSize += 8;
         rFloatRect.Right = ImplGetFX();
         rFloatRect.Top = ImplGetFY();
-        if ( mnMode & CGM_IMPORT_IM )
-            mnParaSize += 8;
     }
     if ( bMap )
     {
@@ -559,12 +515,8 @@ void CGM::ImplGetRectangleNS( FloatRect& rFloatRect )
     {
         rFloatRect.Left = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
         rFloatRect.Bottom = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-        if ( mnMode & CGM_IMPORT_IM )
-            mnParaSize += 8;
         rFloatRect.Right = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
         rFloatRect.Top = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-        if ( mnMode & CGM_IMPORT_IM )
-            mnParaSize += 8;
     }
 }
 
@@ -891,7 +843,7 @@ void CGM::ImplDefaultReplacement()
                 nCount += mnParaSize;
                 mnParaSize = 0;
                 mpSource = pBuf + nCount;
-                if ( (!( mnMode & CGM_NO_PAD_BYTE ) ) && ( mnElementSize & 1 ) )
+                if ( mnElementSize & 1 )
                     nCount++;
                 nCount += mnElementSize;
                 if ( ( mnElementClass != 1 ) || ( mnElementID != 0xc ) )    // rekursion hier nicht moeglich!!
@@ -932,7 +884,7 @@ sal_Bool CGM::Write( SvStream& rIStm )
     if ( mnElementSize )
         rIStm.Read( mpSource + mnParaSize, mnElementSize );
 
-    if ( (!( mnMode & CGM_NO_PAD_BYTE ) ) && ( mnElementSize & 1 ) )
+    if ( mnElementSize & 1 )
         rIStm.SeekRel( 1 );
     ImplDoClass();
 
@@ -951,28 +903,16 @@ sal_Bool CGM::Write( SvStream& rIStm )
 
 sal_Bool CGM::Write( sal_uInt8* pSource )
 {
-    if ( mnMode & CGM_IMPORT_IM )
-    {
-        mnElementID = pSource[ 0 ];
-        mnElementClass = pSource[ 1 ];
-        mnElementSize = *( (long*)pSource + 1  );
-        mpSource = pSource + 16;
-        mnParaSize = 0;
-        ImplDoClass();
-    }
-    else
-    {
-        mpSource = pSource;
-        mnEscape = ImplGetUI16();
-        mnElementClass = mnEscape >> 12;
-        mnElementID = ( mnEscape & 0x0fe0 ) >> 5;
-        mnElementSize = mnEscape & 0x1f;
-        if ( mnElementSize == 31 )
-            mnElementSize = ImplGetUI16();
-        mpSource += mnParaSize;
-        mnParaSize = 0;
-        ImplDoClass();
-    }
+    mpSource = pSource;
+    mnEscape = ImplGetUI16();
+    mnElementClass = mnEscape >> 12;
+    mnElementID = ( mnEscape & 0x0fe0 ) >> 5;
+    mnElementSize = mnEscape & 0x1f;
+    if ( mnElementSize == 31 )
+        mnElementSize = ImplGetUI16();
+    mpSource += mnParaSize;
+    mnParaSize = 0;
+    ImplDoClass();
 
 #ifdef CGM_USER_BREAKPOINT
 #ifdef WNT
diff --git a/goodies/source/filter.vcl/icgm/cgm.hxx b/goodies/source/filter.vcl/icgm/cgm.hxx
index 1a8f959010c0..f3788ce3a032 100644
--- a/goodies/source/filter.vcl/icgm/cgm.hxx
+++ b/goodies/source/filter.vcl/icgm/cgm.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cgm.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:14 $
+ *  last change: $Author: sj $ $Date: 2000-12-15 12:24:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,16 +70,11 @@
 #undef CGM_USER_BREAKPOINT
 
 #define CGM_IMPORT_CGM      0x00000001
-#define CGM_IMPORT_IM       0x00000002
 
 #define CGM_EXPORT_IMPRESS  0x00000100
 #define CGM_EXPORT_META     0x00000200
 //#define CGM_EXPORT_COMMENT    0x00000400
 
-#define CGM_NO_PAD_BYTE     0x00010000
-#define CGM_BIG_ENDIAN      0x00020000
-#define CGM_LITTLE_ENDIAN   0x00040000
-
 // ---------------------------------------------------------------
 
 #include <tools/solar.h>
@@ -204,9 +199,7 @@ class CGM
                             CGM( sal_uInt32 nMode );
                             ~CGM();
 
-#ifdef CGM_EXPORT_IMPRESS
                             CGM( sal_uInt32 nMode, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rModel );
-#endif
 #ifdef CGM_EXPORT_META
         VirtualDevice*      mpVirDev;
         GDIMetaFile*        mpGDIMetaFile;
diff --git a/goodies/source/filter.vcl/icgm/class1.cxx b/goodies/source/filter.vcl/icgm/class1.cxx
index 63f3d694dd94..86664f72a1ff 100644
--- a/goodies/source/filter.vcl/icgm/class1.cxx
+++ b/goodies/source/filter.vcl/icgm/class1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: class1.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:14 $
+ *  last change: $Author: sj $ $Date: 2000-12-15 12:25:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,22 +87,14 @@ void CGM::ImplDoClass1()
         break;
         case 0x04 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Integer Precision" )
         {
-            if ( mnMode & CGM_IMPORT_IM )
+            nInteger = ImplGetI( pElement->nIntegerPrecision );
+            switch ( nInteger )
             {
-                nInteger = ImplGetI( 2 );                           // MEGA PATCH
-                pElement->nIntegerPrecision = 4;
-            }
-            else
-            {
-                nInteger = ImplGetI( pElement->nIntegerPrecision );
-                switch ( nInteger )
-                {
-                    case 32 :
-                    case 24 :
-                    case 16 :
-                    case 8 : pElement->nIntegerPrecision = nInteger >> 3; break;
-                    default : mbStatus = sal_False; break;
-                }
+                case 32 :
+                case 24 :
+                case 16 :
+                case 8 : pElement->nIntegerPrecision = nInteger >> 3; break;
+                default : mbStatus = sal_False; break;
             }
         }
         break;
@@ -150,64 +142,40 @@ void CGM::ImplDoClass1()
         break;
         case 0x06 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Index Precision" )
         {
-            if ( mnMode & CGM_IMPORT_IM )
+            nInteger = ImplGetI( pElement->nIntegerPrecision );
+            switch ( nInteger )
             {
-                nInteger = ImplGetI( 2 );                           // MEGA PATCH
-                pElement->nIndexPrecision = 4;
-            }
-            else
-            {
-                nInteger = ImplGetI( pElement->nIntegerPrecision );
-                switch ( nInteger )
-                {
-                    case 32 :
-                    case 24 :
-                    case 16 :
-                    case 8 : pElement->nIndexPrecision = nInteger >> 3; break;
-                    default : mbStatus = sal_False; break;
-                }
+                case 32 :
+                case 24 :
+                case 16 :
+                case 8 : pElement->nIndexPrecision = nInteger >> 3; break;
+                default : mbStatus = sal_False; break;
             }
         }
         break;
         case 0x07 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Color Precision" )
         {
-            if ( mnMode & CGM_IMPORT_IM )
-            {
-                nInteger = ImplGetI( 2 );                           // MEGA PATCH
-                pElement->nColorPrecision = 1;
-            }
-            else
+            nInteger = ImplGetI( pElement->nIntegerPrecision );
+            switch ( nInteger )
             {
-                nInteger = ImplGetI( pElement->nIntegerPrecision );
-                switch ( nInteger )
-                {
-                    case 32 :
-                    case 24 :
-                    case 16 :
-                    case 8 : pElement->nColorPrecision = nInteger >> 3; break;
-                    default : mbStatus = sal_False; break;
-                }
+                case 32 :
+                case 24 :
+                case 16 :
+                case 8 : pElement->nColorPrecision = nInteger >> 3; break;
+                default : mbStatus = sal_False; break;
             }
         }
         break;
         case 0x08 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Color Index Precision" )
         {
-            if ( mnMode & CGM_IMPORT_IM )
+            nInteger = ImplGetI( pElement->nIntegerPrecision );
+            switch ( nInteger )
             {
-                nInteger = ImplGetI( 2 );                           // MEGA PATCH
-                pElement->nColorIndexPrecision = 4;
-            }
-            else
-            {
-                nInteger = ImplGetI( pElement->nIntegerPrecision );
-                switch ( nInteger )
-                {
-                    case 32 :
-                    case 24 :
-                    case 16 :
-                    case 8 : pElement->nColorIndexPrecision = nInteger >> 3; break;
-                    default : mbStatus = sal_False; break;
-                }
+                case 32 :
+                case 24 :
+                case 16 :
+                case 8 : pElement->nColorIndexPrecision = nInteger >> 3; break;
+                default : mbStatus = sal_False; break;
             }
         }
         break;
@@ -229,7 +197,7 @@ void CGM::ImplDoClass1()
             }
             for ( nI0 = 0; nI0 < nI1; nI0++ )
             {
-                pElement->nColorValueExtent[ nI0 ] = (sal_Int8)ImplGetUI( pElement->nColorPrecision );
+                pElement->nColorValueExtent[ nI0 ] = (sal_uInt8)ImplGetUI( pElement->nColorPrecision );
             }
         }
         break;
@@ -254,12 +222,7 @@ void CGM::ImplDoClass1()
             while ( mnParaSize < mnElementSize )
             {
                 sal_uInt32 nSize;
-                if ( mnMode & CGM_IMPORT_IM )
-                {
-                    nSize = ImplGetUI( 4 );
-                }
-                else
-                    nSize = ImplGetUI( 1 );
+                nSize = ImplGetUI( 1 );
                 pElement->aFontList.InsertName( mpSource + mnParaSize, nSize );
                 mnParaSize += nSize;
             }
@@ -271,18 +234,8 @@ void CGM::ImplDoClass1()
             {
                 sal_uInt32 nCharSetType;
                 sal_uInt32 nSize;
-                if ( mnMode & CGM_IMPORT_IM )
-                {
-                    ALIGN2( mnParaSize );
-                    nCharSetType = ImplGetUI16();
-                    ALIGN4( mnParaSize );
-                    nSize = ImplGetUI( 4 );
-                }
-                else
-                {
-                    nCharSetType = ImplGetUI16();
-                    nSize = ImplGetUI( 1 );
-                }
+                nCharSetType = ImplGetUI16();
+                nSize = ImplGetUI( 1 );
                 pElement->aFontList.InsertCharSet( (CharSetType)nCharSetType, mpSource + mnParaSize, nSize );
                 mnParaSize += nSize;
             }
diff --git a/goodies/source/filter.vcl/icgm/class3.cxx b/goodies/source/filter.vcl/icgm/class3.cxx
index 102a9acd217b..c885b074584d 100644
--- a/goodies/source/filter.vcl/icgm/class3.cxx
+++ b/goodies/source/filter.vcl/icgm/class3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: class3.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:14 $
+ *  last change: $Author: sj $ $Date: 2000-12-15 12:25:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,8 +83,6 @@ void CGM::ImplDoClass3()
         case 0x02 : ComOut( CGM_LEVEL1, "VDC Real Precision" )
         {
             nUInteger = ImplGetUI16();
-            if ( mnMode & CGM_IMPORT_IM )
-                ALIGN4( mnParaSize );
             nI0 = ImplGetI( pElement->nIntegerPrecision );  // exponent
             nI1 = ImplGetI( pElement->nIntegerPrecision );  // mantisse
             switch( nUInteger )
@@ -127,8 +125,6 @@ void CGM::ImplDoClass3()
         case 0x03 : ComOut( CGM_LEVEL1, "Auxiliary Colour" )
         {
             pElement->nAuxiliaryColor = ImplGetBitmapColor();
-            if ( mnMode & CGM_IMPORT_IM )                                       // PATCH
-                mnParaSize = mnElementSize;
         }
         break;
         case 0x04 : ComOut( CGM_LEVEL1, "Transparency" )
diff --git a/goodies/source/filter.vcl/icgm/class4.cxx b/goodies/source/filter.vcl/icgm/class4.cxx
index 6b61b1e8b5ab..b4c6ca085597 100644
--- a/goodies/source/filter.vcl/icgm/class4.cxx
+++ b/goodies/source/filter.vcl/icgm/class4.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: class4.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:14 $
+ *  last change: $Author: sj $ $Date: 2000-12-15 12:26:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -226,13 +226,7 @@ void CGM::ImplDoClass4()
 
                 ImplGetPoint ( aFloatPoint, sal_True );
                 nType = ImplGetUI16( 4 );
-                if ( mnMode & CGM_IMPORT_IM )
-                {
-                    nSize = ImplGetUI( 4 );
-                }
-                else
-                    nSize = ImplGetUI( 1 );
-
+                nSize = ImplGetUI( 1 );
                 mpSource[ mnParaSize + nSize ] = 0;
 
                 ComOut( CGM_DESCRIPTION, (char*)mpSource + mnParaSize );
@@ -270,12 +264,7 @@ void CGM::ImplDoClass4()
 
                 ImplGetPoint ( aFloatPoint, sal_True );
                 nType = ImplGetUI16( 4 );
-                if ( mnMode & CGM_IMPORT_IM )
-                {
-                    nSize = ImplGetUI( 4 );
-                }
-                else
-                    nSize = ImplGetUI( 1 );
+                nSize = ImplGetUI( 1 );
 
                 mpSource[ mnParaSize + nSize ] = 0;
 
@@ -295,13 +284,7 @@ void CGM::ImplDoClass4()
                 sal_uInt32 nSize;
                 sal_uInt32 nType = ImplGetUI16( 4 );
 
-                if ( mnMode & CGM_IMPORT_IM )
-                {
-                    nSize = ImplGetUI( 4 );
-                }
-                else
-                    nSize = ImplGetUI( 1 );
-
+                nSize = ImplGetUI( 1 );
                 mpSource[ mnParaSize + nSize ] = 0;
 
                 ComOut( CGM_DESCRIPTION, (char*)mpSource + mnParaSize );
@@ -386,107 +369,6 @@ void CGM::ImplDoClass4()
             {
                 long    nIdentifier = ImplGetI( pElement->nIntegerPrecision );
                 sal_uInt32  nNumberOfPoints = ImplGetUI( pElement->nIntegerPrecision );
-                if ( mnMode & CGM_IMPORT_IM )
-                {
-                    switch ( nIdentifier )
-                    {
-                        case -1 : ComOut( CGM_DESCRIPTION, "POLYBEZIER" )
-                        {
-                            sal_uInt32 i;
-                            Polygon aPolygon( nNumberOfPoints );
-                            for ( i = 0; i < nNumberOfPoints; i++)
-                            {
-                                FloatPoint  aFloatPoint;
-                                ImplGetPoint( aFloatPoint, sal_True );
-                                aPolygon.SetPoint( Point ( (long)( aFloatPoint.X ), (long)( aFloatPoint.Y ) ), i );
-                            }
-                            sal_uInt32 nOrder = ImplGetI( pElement->nIntegerPrecision );
-                            if ( nOrder & 4 )
-                            {
-                                for ( i = 0; i < nNumberOfPoints; i++ )
-                                {
-                                    if ( ( i % 3 ) == 0 )
-                                        aPolygon.SetFlags( i, POLY_NORMAL );
-                                    else
-                                        aPolygon.SetFlags( i, POLY_CONTROL );
-                                }
-                            }
-                            else
-                            {
-                                for ( i = 0; i < nNumberOfPoints; i++ )
-                                {
-                                    switch ( i & 3 )
-                                    {
-                                        case 0 :
-                                        case 3 : aPolygon.SetFlags( i, POLY_NORMAL ); break;
-                                        default : aPolygon.SetFlags( i, POLY_CONTROL ); break;
-                                    }
-                                }
-                            }
-                            if ( mbFigure )
-                                mpOutAct->RegPolyLine( aPolygon );
-                            else
-                                mpOutAct->DrawPolybezier( aPolygon );
-                            mnParaSize = mnElementSize;
-                        }
-                        break;
-                        case -2 : ComOut( CGM_DESCRIPTION, "SHARP POLYBEZIER" )
-                        {
-                            if ( mbFigure )
-                                mpOutAct->CloseRegion();
-                        }
-                        break;
-                        case -3 : ComOut( CGM_DESCRIPTION, "POLYSPLINE" )
-                        {
-                            if ( mbFigure )
-                                mpOutAct->CloseRegion();
-                        }
-                        break;
-                        case -4 : ComOut( CGM_DESCRIPTION, "ROUNDED RECTANGLE" )
-                        {
-                            if ( mbFigure )
-                                mpOutAct->CloseRegion();
-                        }
-                        break;
-                        case -5 : ComOut( CGM_DESCRIPTION, "BEGIN CELL ARRAY" )
-                        {
-                            if ( mbFigure )
-                                mpOutAct->CloseRegion();
-                        }
-                        break;
-                        case -6 : ComOut( CGM_DESCRIPTION, "END CELL ARRAY" )
-                        {
-                            if ( mbFigure )
-                                mpOutAct->CloseRegion();
-                        }
-                        break;
-                        case -7 : ComOut( CGM_DESCRIPTION, "INSERT FILE" )
-                        {
-                            if ( mbFigure )
-                                mpOutAct->CloseRegion();
-                        }
-                        break;
-                        case -8 : ComOut( CGM_DESCRIPTION, "BLOCK TEXT" )
-                        {
-                            if ( mbFigure )
-                                mpOutAct->CloseRegion();
-                        }
-                        break;
-                        case -9 : ComOut( CGM_DESCRIPTION, "VARIABLE WIDTH POLYLINE" )
-                        {
-                            if ( mbFigure )
-                                mpOutAct->CloseRegion();
-                        }
-                        break;
-                        case -15: ComOut( CGM_DESCRIPTION, "HYPERLINK DEFINITION" )
-                        {
-                            if ( mbFigure )
-                                mpOutAct->CloseRegion();
-                        }
-                        break;
-                        default : ComOut( CGM_DESCRIPTION, "??????????????????????????????" ) break;
-                    }
-                }
                 mnParaSize = mnElementSize;
             }
             break;
diff --git a/goodies/source/filter.vcl/icgm/class5.cxx b/goodies/source/filter.vcl/icgm/class5.cxx
index 4b7596848740..e28154135054 100644
--- a/goodies/source/filter.vcl/icgm/class5.cxx
+++ b/goodies/source/filter.vcl/icgm/class5.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: class5.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:14 $
+ *  last change: $Author: sj $ $Date: 2000-12-15 12:26:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -112,8 +112,6 @@ void CGM::ImplDoClass5()
                 pElement->pLineBundle->SetColor( ImplGetBitmapColor() );
             else
                 pElement->aLineBundle.SetColor( ImplGetBitmapColor() );
-            if ( mnMode & CGM_IMPORT_IM )                                       // PATCH
-                mnParaSize = mnElementSize;
         }
         break;
         case 0x05 : ComOut( CGM_LEVEL1, "Marker Bundle Index" )
@@ -151,8 +149,6 @@ void CGM::ImplDoClass5()
                 pElement->pMarkerBundle->SetColor( ImplGetBitmapColor() );
             else
                 pElement->aMarkerBundle.SetColor( ImplGetBitmapColor() );
-            if ( mnMode & CGM_IMPORT_IM )                                       // PATCH
-                mnParaSize = mnElementSize;
         }
         break;
         case 0x09 : ComOut( CGM_LEVEL1, "Text Bundle Index" )
@@ -204,8 +200,6 @@ void CGM::ImplDoClass5()
                 pElement->pTextBundle->SetColor( ImplGetBitmapColor() );
             else
                 pElement->aTextBundle.SetColor( ImplGetBitmapColor() );
-            if ( mnMode & CGM_IMPORT_IM )                                       // PATCH
-                mnParaSize = mnElementSize;
         }
         break;
         case 0x0f : ComOut( CGM_LEVEL1, "Character Height" )
@@ -279,8 +273,6 @@ void CGM::ImplDoClass5()
                 pElement->pFillBundle->SetColor( ImplGetBitmapColor() );
             else
                 pElement->aFillBundle.SetColor( ImplGetBitmapColor() );
-            if ( mnMode & CGM_IMPORT_IM )                                       // PATCH
-                mnParaSize = mnElementSize;
         }
         break;
         case 0x18 : ComOut( CGM_LEVEL1, "Fill Hatch Index" )
@@ -335,8 +327,6 @@ void CGM::ImplDoClass5()
                 pElement->pEdgeBundle->SetColor( ImplGetBitmapColor() );
             else
                 pElement->aEdgeBundle.SetColor( ImplGetBitmapColor() );
-            if ( mnMode & CGM_IMPORT_IM )                                       // PATCH
-                mnParaSize = mnElementSize;
         }
         break;
         case 0x1e : ComOut( CGM_LEVEL1, "Edge Visibility" )
diff --git a/goodies/source/filter.vcl/icgm/classx.cxx b/goodies/source/filter.vcl/icgm/classx.cxx
index a5d7312c36c7..19f0ddafd1d8 100644
--- a/goodies/source/filter.vcl/icgm/classx.cxx
+++ b/goodies/source/filter.vcl/icgm/classx.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: classx.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:14 $
+ *  last change: $Author: sj $ $Date: 2000-12-15 12:26:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,9 +75,7 @@
         case 8 : pElement->eUnderlineMode = UM_OVERSCORE; break;\
         default: pElement->eUnderlineMode = UM_OFF; break;      \
     }                                                           \
-    pElement->nUnderlineColor = ImplGetBitmapColor();           \
-    if ( mnMode & CGM_IMPORT_IM )                               \
-        mnParaSize = mnElementSize;
+    pElement->nUnderlineColor = ImplGetBitmapColor();
 
 // ---------------------------------------------------------------
 
@@ -87,118 +85,114 @@ void CGM::ImplDoClass6()
     {
         case 0x01 : ComOut( CGM_LEVEL1, "Escape" )
         {
-//          if ( mnMode & CGM_IMPORT_IM )           // IMAGE MARK ONLY ????
+            long    nIdentifier = ImplGetI( pElement->nIntegerPrecision );
+            switch ( nIdentifier )
             {
-                long    nIdentifier = ImplGetI( pElement->nIntegerPrecision );
-                switch ( nIdentifier )
+                case 0 : ComOut( CGM_DESCRIPTION, "inquire function support" ) break;
+                case -1 : ComOut( CGM_DESCRIPTION, "set underline mode" )
                 {
-                    case 0 : ComOut( CGM_DESCRIPTION, "inquire function support" ) break;
-                    case -1 : ComOut( CGM_DESCRIPTION, "set underline mode" )
-                    {
-                        ImplSetUnderlineMode()
-                    }
-                    break;
-                    case -2 : ComOut( CGM_DESCRIPTION, "set script mode" ) break;
-                    case -3 : ComOut( CGM_DESCRIPTION, "set shadow mode" ) break;
-                    case -6 : ComOut( CGM_DESCRIPTION, "inquire origin offset" ) break;
-                    case -8 : ComOut( CGM_DESCRIPTION, "set media size" ) break;
-                    case -10 : ComOut( CGM_DESCRIPTION, "set character mode" ) break;
-                    case -14 : ComOut( CGM_DESCRIPTION, "resolution mode" ) break;
-                    case -17 : ComOut( CGM_DESCRIPTION, "line cap" ) break;
-                    case -18 : ComOut( CGM_DESCRIPTION, "line join" ) break;
-                    case -19 : ComOut( CGM_DESCRIPTION, "edge join" ) break;
-                    case -30 : ComOut( CGM_DESCRIPTION, "media type" ) break;
-                    case -31 : ComOut( CGM_DESCRIPTION, "number of copies" ) break;
-                    case -32 : ComOut( CGM_DESCRIPTION, "orientation" ) break;
-                    case -33 : ComOut( CGM_DESCRIPTION, "device color representation" ) break;
-                    case -34 : ComOut( CGM_DESCRIPTION, "device font list" ) break;
-                    case -35 : ComOut( CGM_DESCRIPTION, "color reversal mode" ) break;
-                    case -36 : ComOut( CGM_DESCRIPTION, "line cap attributes" ) break;
-                    case -37 : ComOut( CGM_DESCRIPTION, "begin effect" ) break;
-                    case -38 : ComOut( CGM_DESCRIPTION, "end effect" ) break;
-                    case -39 : ComOut( CGM_DESCRIPTION, "begin effect definition" ) break;
-                    case -40 : ComOut( CGM_DESCRIPTION, "end effect definition" ) break;
-                    case -41 : ComOut( CGM_DESCRIPTION, "end style definition" ) break;
-                    case -42 : ComOut( CGM_DESCRIPTION, "begin eps data" ) break;
-                    case -43 : ComOut( CGM_DESCRIPTION, "eps data" ) break;
-                    case -44 : ComOut( CGM_DESCRIPTION, "end eps data" ) break;
-                    case -45 : ComOut( CGM_DESCRIPTION, "set background style" ) break;
-                    case -46 : ComOut( CGM_DESCRIPTION, "set eps mode" ) break;
-                    case -47 : ComOut( CGM_DESCRIPTION, "fill mode" ) break;
-                    case -48 : ComOut( CGM_DESCRIPTION, "begin symbol" ) break;
-                    case -49 : ComOut( CGM_DESCRIPTION, "end symbol" ) break;
-                    case -50 : ComOut( CGM_DESCRIPTION, "begin layer" ) break;
-                    case -51 : ComOut( CGM_DESCRIPTION, "end layer" ) break;
-                    case -52 : ComOut( CGM_DESCRIPTION, "layer visibility" ) break;
-                    case -53 : ComOut( CGM_DESCRIPTION, "inquire foreign data" ) break;
-                    case -54 : ComOut( CGM_DESCRIPTION, "set text offset" ) break;
-                    case -55 : ComOut( CGM_DESCRIPTION, "begin group" ) break;
-                    case -56 : ComOut( CGM_DESCRIPTION, "end group" ) break;
-                    case -100 : ComOut( CGM_DESCRIPTION, "begin patch" ) break;
-                    case -101 : ComOut( CGM_DESCRIPTION, "end patch" ) break;
-                    case -102 : ComOut( CGM_DESCRIPTION, "begin block text region" ) break;
-                    case -103 : ComOut( CGM_DESCRIPTION, "end block text region" ) break;
-                    case -120 : ComOut( CGM_DESCRIPTION, "region margins" ) break;
-                    case -121 : ComOut( CGM_DESCRIPTION, "region expansions" ) break;
-                    case -122 : ComOut( CGM_DESCRIPTION, "region anchor" ) break;
-                    case -123 : ComOut( CGM_DESCRIPTION, "paragraph horizontal align" ) break;
-                    case -124 : ComOut( CGM_DESCRIPTION, "paragraph vertical align" ) break;
-                    case -125 : ComOut( CGM_DESCRIPTION, "region line flow" ) break;
-                    case -130 : ComOut( CGM_DESCRIPTION, "paragraph spacing" ) break;
-                    case -131 : ComOut( CGM_DESCRIPTION, "paragraph identation" ) break;
-                    case -132 : ComOut( CGM_DESCRIPTION, "paragraph tabs" ) break;
-                    case -133 : ComOut( CGM_DESCRIPTION, "paragraph bullet" ) break;
-                    case -134 : ComOut( CGM_DESCRIPTION, "paragraph bulet level" ) break;
-                    case -135 : ComOut( CGM_DESCRIPTION, "line horuzontal align" ) break;
-                    case -136 : ComOut( CGM_DESCRIPTION, "line vertical align" ) break;
-                    case -137 : ComOut( CGM_DESCRIPTION, "line spacing" ) break;
-                    case -138 : ComOut( CGM_DESCRIPTION, "word wrap" ) break;
-                    case -150 : ComOut( CGM_DESCRIPTION, "forward advance distance" ) break;
-                    case -151 : ComOut( CGM_DESCRIPTION, "word spacing" ) break;
-                    case -152 : ComOut( CGM_DESCRIPTION, "external leading" ) break;
-                    case -160 : ComOut( CGM_DESCRIPTION, "set gradient offset" ) break;
-                    case -161 : ComOut( CGM_DESCRIPTION, "set gradient edge" ) break;
-                    case -162 : ComOut( CGM_DESCRIPTION, "set gradient angle" ) break;
-                    case -163 : ComOut( CGM_DESCRIPTION, "set gradient description" ) break;
-                    case -164 : ComOut( CGM_DESCRIPTION, "set gradient style" ) break;
-                    case -165 : ComOut( CGM_DESCRIPTION, "set back ground style" ) break;
-                    case -170 : ComOut( CGM_DESCRIPTION, "geometric pattern draw style" ) break;
-                    case -190 : ComOut( CGM_DESCRIPTION, "set character width" ) break;
-                    case -191 : ComOut( CGM_DESCRIPTION, "hyperlink definitions" ) break;
-                    case -192 : ComOut( CGM_DESCRIPTION, "set color name for pantone" ) break;
-                    case -32746 : ComOut( CGM_DESCRIPTION, "set text font" ) break;
-                    case -32747 : ComOut( CGM_DESCRIPTION, "font selection mode" ) break;
-                    case -32752 : ComOut( CGM_DESCRIPTION, "connecting edge" ) break;
-                    case -32753 : ComOut( CGM_DESCRIPTION, "set drawing mode" ) break;
-                    case -32754 : ComOut( CGM_DESCRIPTION, "inquire clip rectangle" ) break;
-                    case -32755 : ComOut( CGM_DESCRIPTION, "protection region indicator" ) break;
-                    case -32756 : ComOut( CGM_DESCRIPTION, "end protection region" ) break;
-                    case -32757 : ComOut( CGM_DESCRIPTION, "begin protection region" ) break;
-                    case -32758 : ComOut( CGM_DESCRIPTION, "geometric pattern definition" ) break;
-                    case -32759 : ComOut( CGM_DESCRIPTION, "hatch style definition" ) break;
-                    case -32760 : ComOut( CGM_DESCRIPTION, "close figure" ) break;
-                    case -32761 : ComOut( CGM_DESCRIPTION, "end figure" )
-                    {
-                        mpOutAct->EndFigure();
-                        mbFigure = sal_False;
-                    }
-                    break;
-                    case -32762 : ComOut( CGM_DESCRIPTION, "begin figure" )
-                    {
-                        mbFigure = sal_True;
-                        mpOutAct->BeginFigure();
-                    }
-                    break;
-                    case -32763 : ComOut( CGM_DESCRIPTION, "pop transformatin" ) break;
-                    case -32764 : ComOut( CGM_DESCRIPTION, "push transformation" ) break;
-                    case -32765 : ComOut( CGM_DESCRIPTION, "copy segment" ) break;
-                    case -32766 : ComOut( CGM_DESCRIPTION, "endseg" ) break;
-                    case -32767 : ComOut( CGM_DESCRIPTION, "begin segment" ) break;
-                    default : ComOut( CGM_DESCRIPTION, "????????????????????????????????" ) break;
+                    ImplSetUnderlineMode()
                 }
-                mnParaSize = mnElementSize;
-
+                break;
+                case -2 : ComOut( CGM_DESCRIPTION, "set script mode" ) break;
+                case -3 : ComOut( CGM_DESCRIPTION, "set shadow mode" ) break;
+                case -6 : ComOut( CGM_DESCRIPTION, "inquire origin offset" ) break;
+                case -8 : ComOut( CGM_DESCRIPTION, "set media size" ) break;
+                case -10 : ComOut( CGM_DESCRIPTION, "set character mode" ) break;
+                case -14 : ComOut( CGM_DESCRIPTION, "resolution mode" ) break;
+                case -17 : ComOut( CGM_DESCRIPTION, "line cap" ) break;
+                case -18 : ComOut( CGM_DESCRIPTION, "line join" ) break;
+                case -19 : ComOut( CGM_DESCRIPTION, "edge join" ) break;
+                case -30 : ComOut( CGM_DESCRIPTION, "media type" ) break;
+                case -31 : ComOut( CGM_DESCRIPTION, "number of copies" ) break;
+                case -32 : ComOut( CGM_DESCRIPTION, "orientation" ) break;
+                case -33 : ComOut( CGM_DESCRIPTION, "device color representation" ) break;
+                case -34 : ComOut( CGM_DESCRIPTION, "device font list" ) break;
+                case -35 : ComOut( CGM_DESCRIPTION, "color reversal mode" ) break;
+                case -36 : ComOut( CGM_DESCRIPTION, "line cap attributes" ) break;
+                case -37 : ComOut( CGM_DESCRIPTION, "begin effect" ) break;
+                case -38 : ComOut( CGM_DESCRIPTION, "end effect" ) break;
+                case -39 : ComOut( CGM_DESCRIPTION, "begin effect definition" ) break;
+                case -40 : ComOut( CGM_DESCRIPTION, "end effect definition" ) break;
+                case -41 : ComOut( CGM_DESCRIPTION, "end style definition" ) break;
+                case -42 : ComOut( CGM_DESCRIPTION, "begin eps data" ) break;
+                case -43 : ComOut( CGM_DESCRIPTION, "eps data" ) break;
+                case -44 : ComOut( CGM_DESCRIPTION, "end eps data" ) break;
+                case -45 : ComOut( CGM_DESCRIPTION, "set background style" ) break;
+                case -46 : ComOut( CGM_DESCRIPTION, "set eps mode" ) break;
+                case -47 : ComOut( CGM_DESCRIPTION, "fill mode" ) break;
+                case -48 : ComOut( CGM_DESCRIPTION, "begin symbol" ) break;
+                case -49 : ComOut( CGM_DESCRIPTION, "end symbol" ) break;
+                case -50 : ComOut( CGM_DESCRIPTION, "begin layer" ) break;
+                case -51 : ComOut( CGM_DESCRIPTION, "end layer" ) break;
+                case -52 : ComOut( CGM_DESCRIPTION, "layer visibility" ) break;
+                case -53 : ComOut( CGM_DESCRIPTION, "inquire foreign data" ) break;
+                case -54 : ComOut( CGM_DESCRIPTION, "set text offset" ) break;
+                case -55 : ComOut( CGM_DESCRIPTION, "begin group" ) break;
+                case -56 : ComOut( CGM_DESCRIPTION, "end group" ) break;
+                case -100 : ComOut( CGM_DESCRIPTION, "begin patch" ) break;
+                case -101 : ComOut( CGM_DESCRIPTION, "end patch" ) break;
+                case -102 : ComOut( CGM_DESCRIPTION, "begin block text region" ) break;
+                case -103 : ComOut( CGM_DESCRIPTION, "end block text region" ) break;
+                case -120 : ComOut( CGM_DESCRIPTION, "region margins" ) break;
+                case -121 : ComOut( CGM_DESCRIPTION, "region expansions" ) break;
+                case -122 : ComOut( CGM_DESCRIPTION, "region anchor" ) break;
+                case -123 : ComOut( CGM_DESCRIPTION, "paragraph horizontal align" ) break;
+                case -124 : ComOut( CGM_DESCRIPTION, "paragraph vertical align" ) break;
+                case -125 : ComOut( CGM_DESCRIPTION, "region line flow" ) break;
+                case -130 : ComOut( CGM_DESCRIPTION, "paragraph spacing" ) break;
+                case -131 : ComOut( CGM_DESCRIPTION, "paragraph identation" ) break;
+                case -132 : ComOut( CGM_DESCRIPTION, "paragraph tabs" ) break;
+                case -133 : ComOut( CGM_DESCRIPTION, "paragraph bullet" ) break;
+                case -134 : ComOut( CGM_DESCRIPTION, "paragraph bulet level" ) break;
+                case -135 : ComOut( CGM_DESCRIPTION, "line horuzontal align" ) break;
+                case -136 : ComOut( CGM_DESCRIPTION, "line vertical align" ) break;
+                case -137 : ComOut( CGM_DESCRIPTION, "line spacing" ) break;
+                case -138 : ComOut( CGM_DESCRIPTION, "word wrap" ) break;
+                case -150 : ComOut( CGM_DESCRIPTION, "forward advance distance" ) break;
+                case -151 : ComOut( CGM_DESCRIPTION, "word spacing" ) break;
+                case -152 : ComOut( CGM_DESCRIPTION, "external leading" ) break;
+                case -160 : ComOut( CGM_DESCRIPTION, "set gradient offset" ) break;
+                case -161 : ComOut( CGM_DESCRIPTION, "set gradient edge" ) break;
+                case -162 : ComOut( CGM_DESCRIPTION, "set gradient angle" ) break;
+                case -163 : ComOut( CGM_DESCRIPTION, "set gradient description" ) break;
+                case -164 : ComOut( CGM_DESCRIPTION, "set gradient style" ) break;
+                case -165 : ComOut( CGM_DESCRIPTION, "set back ground style" ) break;
+                case -170 : ComOut( CGM_DESCRIPTION, "geometric pattern draw style" ) break;
+                case -190 : ComOut( CGM_DESCRIPTION, "set character width" ) break;
+                case -191 : ComOut( CGM_DESCRIPTION, "hyperlink definitions" ) break;
+                case -192 : ComOut( CGM_DESCRIPTION, "set color name for pantone" ) break;
+                case -32746 : ComOut( CGM_DESCRIPTION, "set text font" ) break;
+                case -32747 : ComOut( CGM_DESCRIPTION, "font selection mode" ) break;
+                case -32752 : ComOut( CGM_DESCRIPTION, "connecting edge" ) break;
+                case -32753 : ComOut( CGM_DESCRIPTION, "set drawing mode" ) break;
+                case -32754 : ComOut( CGM_DESCRIPTION, "inquire clip rectangle" ) break;
+                case -32755 : ComOut( CGM_DESCRIPTION, "protection region indicator" ) break;
+                case -32756 : ComOut( CGM_DESCRIPTION, "end protection region" ) break;
+                case -32757 : ComOut( CGM_DESCRIPTION, "begin protection region" ) break;
+                case -32758 : ComOut( CGM_DESCRIPTION, "geometric pattern definition" ) break;
+                case -32759 : ComOut( CGM_DESCRIPTION, "hatch style definition" ) break;
+                case -32760 : ComOut( CGM_DESCRIPTION, "close figure" ) break;
+                case -32761 : ComOut( CGM_DESCRIPTION, "end figure" )
+                {
+                    mpOutAct->EndFigure();
+                    mbFigure = sal_False;
+                }
+                break;
+                case -32762 : ComOut( CGM_DESCRIPTION, "begin figure" )
+                {
+                    mbFigure = sal_True;
+                    mpOutAct->BeginFigure();
+                }
+                break;
+                case -32763 : ComOut( CGM_DESCRIPTION, "pop transformatin" ) break;
+                case -32764 : ComOut( CGM_DESCRIPTION, "push transformation" ) break;
+                case -32765 : ComOut( CGM_DESCRIPTION, "copy segment" ) break;
+                case -32766 : ComOut( CGM_DESCRIPTION, "endseg" ) break;
+                case -32767 : ComOut( CGM_DESCRIPTION, "begin segment" ) break;
+                default : ComOut( CGM_DESCRIPTION, "????????????????????????????????" ) break;
             }
+            mnParaSize = mnElementSize;
         }
         break;
         case 0x02 : ComOut( CGM_LEVEL1, "Get Escape" ) break;
diff --git a/goodies/source/filter.vcl/icgm/elements.cxx b/goodies/source/filter.vcl/icgm/elements.cxx
index 05c546a971db..ccf1b9faa319 100644
--- a/goodies/source/filter.vcl/icgm/elements.cxx
+++ b/goodies/source/filter.vcl/icgm/elements.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: elements.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:14 $
+ *  last change: $Author: sj $ $Date: 2000-12-15 12:27:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -195,17 +195,9 @@ CGMElements& CGMElements::operator=( CGMElements& rSource )
 void CGMElements::Init()
 {
 
-    if ( mpCGM->mnMode & CGM_IMPORT_IM )            // IMAGE MARK is device dependent !!!
-    {
-        nIntegerPrecision = nIndexPrecision = nColorIndexPrecision = 4;
-        nRealSize = nVDCRealSize = 8;
-    }
-    else
-    {
-        nIntegerPrecision = nIndexPrecision = 2;
-        nRealSize = nVDCRealSize = 4;
-        nColorIndexPrecision = 1;
-    }
+    nIntegerPrecision = nIndexPrecision = 2;
+    nRealSize = nVDCRealSize = 4;
+    nColorIndexPrecision = 1;
     nColorPrecision = 1;
     nVDCIntegerPrecision = 2;
     eRealPrecision = eVDCRealPrecision = RP_FIXED;      //RP_FLOAT;