writerfilter07: merged DEV300_m75

1864 files changed, 67386 insertions, 31944 deletions

diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc
index 60d626379b1b..4bea3330f617 100644
--- a/filter/inc/filter.hrc
+++ b/filter/inc/filter.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: filter.hrc,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,10 +30,7 @@
 
 // include ---------------------------------------------------------------
 
-
-#ifndef _SOLAR_HRC
 #include <svl/solar.hrc>
-#endif
 
 // Help-Ids --------------------------------------------------------------
 
@@ -46,8 +40,20 @@
 #define RID_XSLT_DIALOG_END         (RID_FILTER_START +  69)
 #define RID_PDF_OLD_EXPORT_DLG      (RID_FILTER_START +  70)
 
-// warning, next range is RID_FILTER_START + 100 !
+#define DLG_EXPORT_EPCT                 (RID_GOODIES_START+ 0)
+#define DLG_EXPORT_GIF                  (RID_GOODIES_START+ 1)
+#define DLG_EXPORT_EMET                 (RID_GOODIES_START+ 2)
+#define DLG_EXPORT_JPG                  (RID_GOODIES_START+ 3)
+#define DLG_IMPORT_PCD                  (RID_GOODIES_START+ 4)
+#define DLG_EXPORT_EPNG                 (RID_GOODIES_START+ 5)
+#define DLG_EXPORT_EPS                  (RID_GOODIES_START+ 8)
+#define DLG_EXPORT_EPBM                 (RID_GOODIES_START+ 9)
+#define DLG_EXPORT_EPGM                 (RID_GOODIES_START+ 10)
+#define DLG_EXPORT_EPPM                 (RID_GOODIES_START+ 11)
+#define DLG_SSL_NEWCERT                 (RID_GOODIES_START+ 12)
+#define DLG_SSL_INFCERT                 (RID_GOODIES_START+ 13)
 
+// warning, next range is RID_FILTER_START + 100 !
 
 #define HID_FILTER_XSLT_START       (HID_FILTER_START +   0) // see source/xsltdialog/xmlfilterhelpids.hrc for range
 #define HID_FILTER_XSLT_END         (HID_FILTER_START +  99)
diff --git a/filter/inc/filter/msfilter/countryid.hxx b/filter/inc/filter/msfilter/countryid.hxx
index 0c66f1bf546c..f33b2fe6b5ac 100644
--- a/filter/inc/filter/msfilter/countryid.hxx
+++ b/filter/inc/filter/msfilter/countryid.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: countryid.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/filter/msfilter/escherex.hxx b/filter/inc/filter/msfilter/escherex.hxx
index fc36208d1207..b98f5dc85147 100644
--- a/filter/inc/filter/msfilter/escherex.hxx
+++ b/filter/inc/filter/msfilter/escherex.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: escherex.hxx,v $
- * $Revision: 1.6.146.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,13 +28,15 @@
 #ifndef _SVX_ESCHEREX_HXX
 #define _SVX_ESCHEREX_HXX
 
+#include <memory>
 #include <vector>
+#include <boost/shared_ptr.hpp>
 #include <tools/solar.h>
 #include <tools/gen.hxx>
 #include <tools/list.hxx>
 #include <tools/stream.hxx>
 #include <com/sun/star/uno/Reference.h>
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
@@ -948,13 +947,13 @@ enum ESCHER_LineCap
 
 #define ESCHER_Persist_PrivateEntry         0x80000000
 #define ESCHER_Persist_Dgg                  0x00010000
-#define ESCHER_Persist_Dgg_FIDCL            0x00010001
 #define ESCHER_Persist_Dg                   0x00020000
-#define ESCHER_Persist_BlibStoreContainer   0x00030000
 #define ESCHER_Persist_CurrentPosition      0x00040000
 #define ESCHER_Persist_Grouping_Snap        0x00050000
 #define ESCHER_Persist_Grouping_Logic       0x00060000
 
+const sal_uInt32 DFF_DGG_CLUSTER_SIZE       = 0x00000400;   /// Shape IDs per cluster in DGG atom.
+
 // ---------------------------------------------------------------------------------------------
 
 namespace com { namespace sun { namespace star {
@@ -964,6 +963,7 @@ namespace com { namespace sun { namespace star {
     namespace drawing {
         struct EnhancedCustomShapeAdjustmentValue;
         class XShape;
+        class XShapes;
     }
 }}}
 
@@ -1033,13 +1033,11 @@ struct EscherPersistEntry
 
 // ---------------------------------------------------------------------------------------------
 
-class SvMemoryStream;
 class EscherBlibEntry
 {
 
         friend class EscherGraphicProvider;
         friend class EscherEx;
-        friend class _EscherEx;
 
     protected:
 
@@ -1347,52 +1345,137 @@ public:
 };
 
 
+// ============================================================================
+
+/** Instance for global DFF data, shared through various instances of EscherEx. */
+class MSFILTER_DLLPUBLIC EscherExGlobal : public EscherGraphicProvider
+{
+public:
+    explicit            EscherExGlobal( sal_uInt32 nGraphicProvFlags = _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES );
+    virtual             ~EscherExGlobal();
+
+    /** Returns a new drawing ID for a new drawing container (DGCONTAINER). */
+    sal_uInt32          GenerateDrawingId();
+    /** Creates and returns a new shape identifier, updates the internal shape
+        counters and registers the identifier in the DGG cluster table.
+        @param nDrawingId  Drawing identifier has to be passed to be able to
+            generate shape identifiers for multiple drawings simultaniously. */
+    sal_uInt32          GenerateShapeId( sal_uInt32 nDrawingId, bool bIsInSpgr );
+    /** Returns the number of shapes in the current drawing, based on number of
+        calls to the GenerateShapeId() function. */
+    sal_uInt32          GetDrawingShapeCount( sal_uInt32 nDrawingId ) const;
+    /** Returns the last shape identifier generated by the GenerateShapeId()
+        function. */
+    sal_uInt32          GetLastShapeId( sal_uInt32 nDrawingId ) const;
+
+    /** Sets the flag indicating that the DGGCONTAINER exists. */
+    inline void         SetDggContainer() { mbHasDggCont = true; }
+    /** Sets the flag indicating that the DGGCONTAINER exists. */
+    inline bool         HasDggContainer() const { return mbHasDggCont; }
+    /** Returns the total size of the DGG atom (including header). */
+    sal_uInt32          GetDggAtomSize() const;
+    /** Writes the complete DGG atom to the passed stream (overwrites existing data!). */
+    void                WriteDggAtom( SvStream& rStrm ) const;
+
+    /** Called if a picture shall be written and no picture stream is set at
+        class ImplEscherExSdr.
+
+        On first invokation, this function calls the virtual member function
+        ImplQueryPictureStream(). The return value will be cached internally
+        for subsequent calls and for the GetPictureStream() function.
+     */
+    SvStream*           QueryPictureStream();
+
+    /** Returns the picture stream if existing (queried), otherwise null. */
+    inline SvStream*    GetPictureStream() { return mpPicStrm; }
+
+private:
+    /** Derived classes may implement to create a new stream used to store the
+        picture data.
+
+        The implementation has to take care about lifetime of the returned
+        stream (it will not be destructed automatically). This function is
+        called exactly once. The return value will be cached internally for
+        repeated calls of the public QueryPictureStream() function.
+     */
+    virtual SvStream*   ImplQueryPictureStream();
+
+private:
+    struct ClusterEntry
+    {
+        sal_uInt32          mnDrawingId;        /// Identifier of drawing this cluster belongs to (one-based index into maDrawingInfos).
+        sal_uInt32          mnNextShapeId;      /// Next free shape identifier in this cluster.
+        inline explicit     ClusterEntry( sal_uInt32 nDrawingId ) : mnDrawingId( nDrawingId ), mnNextShapeId( 0 ) {}
+    };
+    typedef ::std::vector< ClusterEntry > ClusterTable;
+
+    struct DrawingInfo
+    {
+        sal_uInt32          mnClusterId;        /// Currently used cluster (one-based index into maClusterTable).
+        sal_uInt32          mnShapeCount;       /// Current number of shapes in this drawing.
+        sal_uInt32          mnLastShapeId;      /// Last shape identifier generated for this drawing.
+        inline explicit     DrawingInfo( sal_uInt32 nClusterId ) : mnClusterId( nClusterId ), mnShapeCount( 0 ), mnLastShapeId( 0 ) {}
+    };
+    typedef ::std::vector< DrawingInfo > DrawingInfoVector;
+
+    ClusterTable        maClusterTable;     /// List with cluster IDs (used object IDs in drawings).
+    DrawingInfoVector   maDrawingInfos;     /// Data about all used drawings.
+    SvStream*           mpPicStrm;          /// Cached result of ImplQueryPictureStream().
+    bool                mbHasDggCont;       /// True = the DGGCONTAINER has been initialized.
+    bool                mbPicStrmQueried;   /// True = ImplQueryPictureStream() has been called.
+};
+
+typedef ::boost::shared_ptr< EscherExGlobal > EscherExGlobalRef;
+
 // ---------------------------------------------------------------------------------------------
 
 class SdrObject;
 class SdrPage;
 class ImplEscherExSdr;
-class Color;
-
-class Graphic;
-class SvMemoryStream;
-class SvStream;
 
-class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGraphicProvider
+class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable
 {
-    protected :
+    protected:
+        typedef ::std::auto_ptr< ImplEscherExSdr > ImplEscherExSdrPtr;
 
+        EscherExGlobalRef       mxGlobal;
+        ImplEscherExSdrPtr      mpImplEscherExSdr;
         SvStream*               mpOutStrm;
-        ImplEscherExSdr*        mpImplEscherExSdr;
         UINT32                  mnStrmStartOfs;
         std::vector< sal_uInt32 > mOffsets;
         std::vector< sal_uInt16 > mRecTypes;
 
-        UINT32                  mnDrawings;
-        UINT32                  mnFIDCLs;                   // anzahl der cluster ID's
-
         UINT32                  mnCurrentDg;
-        UINT32                  mnCurrentShapeID;           // die naechste freie ID
-        UINT32                  mnCurrentShapeMaximumID;    // die hoechste und auch benutzte ID
-        UINT32                  mnTotalShapesDg;            // anzahl der shapes im Dg
-        UINT32                  mnTotalShapeIdUsedDg;       // anzahl der benutzten shape Id's im Dg
-        UINT32                  mnTotalShapesDgg;           // anzahl der shapes im Dgg
         UINT32                  mnCountOfs;
 
         UINT32                  mnGroupLevel;
         UINT16                  mnHellLayerId;
 
         BOOL                    mbEscherSpgr;
-        BOOL                    mbEscherDgg;
         BOOL                    mbEscherDg;
         BOOL                    mbOleEmf;                   // OLE is EMF instead of WMF
 
 
         virtual BOOL DoSeek( UINT32 nKey );
 
-    public:
+public:
+    explicit            EscherEx( const EscherExGlobalRef& rxGlobal, SvStream& rOutStrm );
+    virtual             ~EscherEx();
+
+    /** Creates and returns a new shape identifier, updates the internal shape
+        counters and registers the identifier in the DGG cluster table. */
+    inline sal_uInt32   GenerateShapeId() { return mxGlobal->GenerateShapeId( mnCurrentDg, mbEscherSpgr ); }
+
+    /** Returns the graphic provider from the global object that has been
+        passed to the constructor.
+     */
+    inline EscherGraphicProvider&
+                        GetGraphicProvider() { return *mxGlobal; }
 
-                EscherEx( SvStream& rOut, UINT32 nDrawings );
+    /** Called if a picture shall be written and no picture stream is set at
+        class ImplEscherExSdr.
+     */
+    inline SvStream*    QueryPictureStream() { return mxGlobal->QueryPictureStream(); }
 
                 /// Fuegt in den EscherStream interne Daten ein, dieser Vorgang
                 /// darf und muss nur einmal ausgefuehrt werden.
@@ -1401,14 +1484,29 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGrap
                 /// gemerged, wie es fuer Excel (und Word?) benoetigt wird.
         virtual void Flush( SvStream* pPicStreamMergeBSE = NULL );
 
-    virtual     ~EscherEx();
+    /** Inserts the passed number of bytes at the current position of the
+        output stream.
 
-                // Application may overload this function to maintain an offset
-                // table for specific regions but MUST call this function too.
-    virtual void    InsertAtCurrentPos( UINT32 nBytes, BOOL bCont = FALSE );// es werden nBytes an der aktuellen Stream Position eingefuegt,
-                                                                    // die PersistantTable und interne Zeiger angepasst
+        Inserts dummy bytes and moves all following stream data, and updates
+        all internal stream offsets stored in the PersistTable and the affected
+        container sizes, which makes this operation very expensive. (!)
+
+        @param nBytes  The number of bytes to be inserted into the stream.
+
+        @param bExpandEndOfAtom  If set to true, an atom that currently ends
+            exactly at the current stream position will be expanded to include
+            the inserted data. If set to false, an atom that currently ends
+            exactly at the current stream position will not be expanded to
+            include the inserted data (used to insert e.g. a new atom after an
+            existing atom). Note that containers that end exactly at the
+            current stream position are always expanded to include the inserted
+            data.
+     */
+    void                InsertAtCurrentPos( sal_uInt32 nBytes, bool bExpandEndOfAtom );
 
         void    InsertPersistOffset( UINT32 nKey, UINT32 nOffset ); // Es wird nicht geprueft, ob sich jener schluessel schon in der PersistantTable befindet
+        void    ReplacePersistOffset( UINT32 nKey, UINT32 nOffset );
+        UINT32  GetPersistOffset( UINT32 nKey );
         BOOL    SeekToPersistOffset( UINT32 nKey );
         virtual BOOL InsertAtPersistOffset( UINT32 nKey, UINT32 nValue );// nValue wird im Stream an entrsprechender Stelle eingefuegt(overwrite modus), ohne dass sich die
                                                                     // aktuelle StreamPosition aendert
@@ -1443,21 +1541,16 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGrap
 
                 // ein ESCHER_Sp wird geschrieben ( Ein ESCHER_DgContainer muss dazu geoeffnet sein !!)
         virtual void AddShape( UINT32 nShpInstance, UINT32 nFlagIds, UINT32 nShapeID = 0 );
-                // reserviert eine ShapeId
-        UINT32  GetShapeID();
 
         virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect );
 
         UINT32  GetColor( const UINT32 nColor, BOOL bSwap = TRUE );
         UINT32  GetColor( const Color& rColor, BOOL bSwap = TRUE );
 
-                // OLE is written as EMF instead of WMF (default WMF)
-        void    SetOleEmf( BOOL bVal )      { mbOleEmf = bVal; }
-        BOOL    IsOleEmf() const            { return mbOleEmf; }
-
                 // ...Sdr... implemented in eschesdo.cxx
 
         void    AddSdrPage( const SdrPage& rPage );
+        void    AddUnoShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes );
 
                 /// returns the ShapeID
         UINT32  AddSdrObject( const SdrObject& rObj );
@@ -1470,7 +1563,9 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGrap
                 /// Called before a shape is written, application supplies
                 /// ClientRecords. May set AppData::bDontWriteShape so the
                 /// shape is ignored.
-        virtual EscherExHostAppData* StartShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rShape );
+    virtual EscherExHostAppData* StartShape(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rShape,
+                            const Rectangle* pChildAnchor );
 
                 /// Called after a shape is written to inform the application
                 /// of the resulted shape type and ID.
@@ -1494,10 +1589,6 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGrap
                 ///   the same functionality as an ordinary recursive group.
     virtual EscherExHostAppData*    EnterAdditionalTextGroup();
 
-                /// Called if a picture shall be written and no PicStream is
-                /// set at ImplEscherExSdr
-    virtual SvStream*   QueryPicStream();
-
                 /// Called if an ESCHER_Prop_lTxid shall be written
     virtual UINT32  QueryTextID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >&, UINT32 nShapeId );
             // add an dummy rectangle shape into the escher stream
@@ -1507,6 +1598,14 @@ class MSFILTER_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGrap
 
     void SetHellLayerId( UINT16 nId )       { mnHellLayerId = nId; }
     UINT16 GetHellLayerId() const           { return mnHellLayerId; }
+
+private:
+                        EscherEx( const EscherEx& );
+    EscherEx&           operator=( const EscherEx& );
+
+    // prevent C-style cast to former base class EscherGraphicProvider
+    operator EscherGraphicProvider&();
+    operator EscherGraphicProvider const&();
 };
 
 
diff --git a/filter/inc/filter/msfilter/mscodec.hxx b/filter/inc/filter/msfilter/mscodec.hxx
index a42e360d0f96..7bad8af6b788 100644
--- a/filter/inc/filter/msfilter/mscodec.hxx
+++ b/filter/inc/filter/msfilter/mscodec.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: mscodec.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index eadb6328b1de..4f11a4c2fab9 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: msdffimp.hxx,v $
- * $Revision: 1.4.214.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/filter/msfilter/msfilterdllapi.h b/filter/inc/filter/msfilter/msfilterdllapi.h
index ada4c8e853a9..28985f0c500f 100644
--- a/filter/inc/filter/msfilter/msfilterdllapi.h
+++ b/filter/inc/filter/msfilter/msfilterdllapi.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: dllapi.h,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/filter/msfilter/msfiltertracer.hxx b/filter/inc/filter/msfilter/msfiltertracer.hxx
index 13417175dc52..3b103e5be422 100644
--- a/filter/inc/filter/msfilter/msfiltertracer.hxx
+++ b/filter/inc/filter/msfilter/msfiltertracer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: msfiltertracer.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx
index cf06e8378541..173835495b12 100644
--- a/filter/inc/filter/msfilter/msocximex.hxx
+++ b/filter/inc/filter/msfilter/msocximex.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: msocximex.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/filter/msfilter/msoleexp.hxx b/filter/inc/filter/msfilter/msoleexp.hxx
index 8053928780f4..3cdbab6a9235 100644
--- a/filter/inc/filter/msfilter/msoleexp.hxx
+++ b/filter/inc/filter/msfilter/msoleexp.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: msoleexp.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/filter/msfilter/msvbahelper.hxx b/filter/inc/filter/msfilter/msvbahelper.hxx
deleted file mode 100644
index 93f2de413291..000000000000
--- a/filter/inc/filter/msfilter/msvbahelper.hxx
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************
- *
- * 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:
- * $Revision:
- *
- * 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.
- *
- ************************************************************************/
-#ifndef _MSVBAHELPER_HXX
-#define _MSVBAHELPER_HXX
-
-#include <sfx2/objsh.hxx>
-#include "filter/msfilter/msfilterdllapi.h"
-
-namespace ooo { namespace vba
-{
-    class MSFILTER_DLLPUBLIC VBAMacroResolvedInfo
-    {
-        SfxObjectShell* mpDocContext;
-        bool mbFound;
-        String msResolvedMacro;
-        public:
-        VBAMacroResolvedInfo() : mpDocContext(NULL), mbFound( false ){}
-        void SetResolved( bool bRes ) { mbFound = bRes; }
-        bool IsResolved() { return mbFound; }
-        void SetMacroDocContext(SfxObjectShell* pShell )  { mpDocContext = pShell; }
-        SfxObjectShell* MacroDocContext() { return mpDocContext; }
-        String ResolvedMacro() { return msResolvedMacro; }
-        void SetResolvedMacro(const String& sMacro ) { msResolvedMacro = sMacro; }
-    };
-
-    MSFILTER_DLLPUBLIC String makeMacroURL( const String& sMacroName );
-    MSFILTER_DLLPUBLIC  VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& sMod, bool bSearchGlobalTemplates = false );
-    MSFILTER_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller );
-} }
-
-#endif
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx
index 8d9b85c7301f..796ecc18cd3a 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svdfppt.hxx,v $
- * $Revision: 1.7.6.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,14 +36,14 @@
 #include <tools/gen.hxx>
 #include <tools/color.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/numitem.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/editdata.hxx>
 #include <filter/msfilter/msdffimp.hxx>         //  Escher-Grafikimport
 #include <filter/msfilter/msocximex.hxx>
 #include <filter/msfilter/msfiltertracer.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #define ITEMID_FIELD EE_FEATURE_FIELD
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
 #undef ITEMID_FIELD
 #include "filter/msfilter/msfilterdllapi.h"
 #include <vcl/font.hxx>
diff --git a/filter/inc/filter/msfilter/svxmsbas.hxx b/filter/inc/filter/msfilter/svxmsbas.hxx
index 641d71e3ac2d..f488017e4804 100644
--- a/filter/inc/filter/msfilter/svxmsbas.hxx
+++ b/filter/inc/filter/msfilter/svxmsbas.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svxmsbas.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/makefile.mk b/filter/inc/makefile.mk
index ccb616d8e94c..ae44f91ba667 100644
--- a/filter/inc/makefile.mk
+++ b/filter/inc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/pch/precompiled_filter.cxx b/filter/inc/pch/precompiled_filter.cxx
index a118d543d0bb..c2c7f32127b9 100644
--- a/filter/inc/pch/precompiled_filter.cxx
+++ b/filter/inc/pch/precompiled_filter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_filter.cxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/inc/pch/precompiled_filter.hxx b/filter/inc/pch/precompiled_filter.hxx
index c68e8c3a32e5..3220aa3f6e4c 100644
--- a/filter/inc/pch/precompiled_filter.hxx
+++ b/filter/inc/pch/precompiled_filter.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: precompiled_filter.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/prj/build.lst b/filter/prj/build.lst
index a497bf4c3715..b4be1c83e63e 100644
--- a/filter/prj/build.lst
+++ b/filter/prj/build.lst
@@ -1,4 +1,4 @@
-fl	filter	:    l10n svtools unotools goodies xmloff cppu tools cppuhelper sal svx javaunohelper XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt NULL
+fl      filter  :    vbahelper l10n svtools unotools xmloff cppu tools cppuhelper sal svx javaunohelper XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt NULL
 fl	filter									usr1	-	all	fl_mkout			NULL
 fl	filter\prj								get		-	all	fl_prj				NULL
 fl	filter\inc								nmake	-	all	fl_inc				NULL
@@ -16,6 +16,28 @@ fl	filter\source\xsltvalidate				nmake	-	all fl_xsltvalidate fl_xsltfilter	fl_in
 fl	filter\source\xsltdialog				nmake	-	all fl_xsltdialog fl_flash		fl_inc NULL
 fl  filter\source\docbook                   nmake   -   all fl_docbook          fl_inc NULL
 fl  filter\source\t602                      nmake   -   all fl_t602             fl_inc NULL
+fl	filter\source\graphicfilter\eos2met		nmake	-	all	g_vfeom fl_inc NULL
+fl	filter\source\graphicfilter\ios2met		nmake	-	all	g_vfiom fl_inc NULL
+fl	filter\source\graphicfilter\epict			nmake	-	all	g_vfept fl_inc NULL
+fl	filter\source\graphicfilter\egif			nmake	-	all	g_vfegf fl_inc NULL
+fl	filter\source\graphicfilter\ipcd			nmake	-	all	g_vfipc fl_inc NULL
+fl	filter\source\graphicfilter\ipcx			nmake	-	all	g_vfipx fl_inc NULL
+fl	filter\source\graphicfilter\ipict			nmake	-	all	g_vfipt fl_inc NULL
+fl	filter\source\graphicfilter\idxf			nmake	-	all	g_vfidx fl_inc NULL
+fl	filter\source\graphicfilter\itiff			nmake	-	all	g_vfitf fl_inc NULL
+fl	filter\source\graphicfilter\ipbm			nmake	-	all	g_vfpbm fl_inc NULL
+fl	filter\source\graphicfilter\epbm			nmake	-	all	g_epbm fl_inc NULL
+fl	filter\source\graphicfilter\epgm			nmake	-	all	g_epgm fl_inc NULL
+fl	filter\source\graphicfilter\eppm			nmake	-	all	g_eppm fl_inc NULL
+fl	filter\source\graphicfilter\iras			nmake	-	all	g_iras fl_inc NULL
+fl	filter\source\graphicfilter\expm			nmake	-	all	g_expm fl_inc NULL
+fl	filter\source\graphicfilter\eras			nmake	-	all	g_eras fl_inc NULL
+fl	filter\source\graphicfilter\etiff			nmake	-	all	g_etiff fl_inc NULL
+fl	filter\source\graphicfilter\eps			nmake	-	all	g_eps fl_inc NULL
+fl	filter\source\graphicfilter\itga			nmake	-	all	g_itga fl_inc NULL
+fl	filter\source\graphicfilter\ipsd			nmake	-	all	g_ipsd fl_inc NULL
+fl	filter\source\graphicfilter\ieps			nmake	-	all	g_ieps fl_inc NULL
+fl	filter\source\graphicfilter\icgm			nmake	-	all	g_icgm fl_inc NULL
 fl  filter\source\config\cache              nmake   -   all fl_config           fl_inc NULL
 fl  filter\source\config\fragments\types    nmake   -   all fl_fcfg_fragments_types  fl_inc NULL
 fl  filter\source\config\fragments\filters  nmake   -   all fl_fcfg_fragments_filters  fl_inc NULL
diff --git a/filter/qa/complex/filter/detection/typeDetection/Helper.java b/filter/qa/complex/filter/detection/typeDetection/Helper.java
index 713d0befe98c..4c282f55182e 100644
--- a/filter/qa/complex/filter/detection/typeDetection/Helper.java
+++ b/filter/qa/complex/filter/detection/typeDetection/Helper.java
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Helper.java,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
index 423d6fe166d1..f706c4136118 100644
--- a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
+++ b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: TypeDetection.java,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/qa/complex/filter/detection/typeDetection/makefile.mk b/filter/qa/complex/filter/detection/typeDetection/makefile.mk
index dea5044fb60c..bbc25efa3c29 100644
--- a/filter/qa/complex/filter/detection/typeDetection/makefile.mk
+++ b/filter/qa/complex/filter/detection/typeDetection/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9.102.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java b/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
index 9c2384887a80..e32b81caa85b 100644
--- a/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
+++ b/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: FinalizedMandatoryTest.java,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/qa/complex/filter/misc/makefile.mk b/filter/qa/complex/filter/misc/makefile.mk
index 0dd1c433b28c..2792b2438b6e 100755
--- a/filter/qa/complex/filter/misc/makefile.mk
+++ b/filter/qa/complex/filter/misc/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7.102.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index c1f61eb6948b..800876ce1abd 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basecontainer.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx
index 66d2ba4873ff..e3730ce662e4 100644
--- a/filter/source/config/cache/basecontainer.hxx
+++ b/filter/source/config/cache/basecontainer.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basecontainer.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx
index c06bb3c53cc1..c752516df10f 100644
--- a/filter/source/config/cache/cacheitem.cxx
+++ b/filter/source/config/cache/cacheitem.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cacheitem.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx
index 3a24fcfa02ce..793a5f370cf9 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cacheitem.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx
index fe262661912c..90bd89c9d864 100644
--- a/filter/source/config/cache/cacheupdatelistener.cxx
+++ b/filter/source/config/cache/cacheupdatelistener.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cacheupdatelistener.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx
index 8cec199718e9..8e75e4304bf2 100644
--- a/filter/source/config/cache/cacheupdatelistener.hxx
+++ b/filter/source/config/cache/cacheupdatelistener.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cacheupdatelistener.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx
index 6efc0912386f..e97df2a7f40d 100644
--- a/filter/source/config/cache/configflush.cxx
+++ b/filter/source/config/cache/configflush.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: configflush.cxx,v $
- * $Revision: 1.5 $
- *