move OCX_Control ( and subclasses ) and OCX control export to oox

2 files changed, 8 insertions, 785 deletions

diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx
index 98c2f676ac6b..7fa196afda12 100644
--- a/filter/inc/filter/msfilter/msocximex.hxx
+++ b/filter/inc/filter/msfilter/msocximex.hxx
@@ -30,15 +30,8 @@
 
 #include <sot/storage.hxx>
 #include <tools/debug.hxx>
-#include <com/sun/star/graphic/XGraphicObject.hpp>
 
-//!! no such defines in global namespaces - it will break other existing code that uses the same define!!
-//#ifndef C2U
-//#define C2U(cChar)    rtl::OUString::createFromAscii(cChar)
-//#endif
 #include "filter/msfilter/msfilterdllapi.h"
-#include <vector>
-#include <boost/unordered_map.hpp>
 
 namespace com{namespace sun{namespace star{
         namespace drawing{
@@ -69,49 +62,20 @@ namespace com{namespace sun{namespace star{
         namespace uno{
                 class XComponentContext;
         }
+        namespace frame{
+                class XModel;
+        }
 
 }}}
 
-class OCX_Control;
 class SfxObjectShell;
-class SwPaM;
 
 class MSFILTER_DLLPUBLIC SvxMSConvertOCXControls
 {
 public:
-    SvxMSConvertOCXControls( SfxObjectShell *pDSh,SwPaM *pP );
+    SvxMSConvertOCXControls( const  ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
     virtual ~SvxMSConvertOCXControls();
 
-    //Reads a control from the given storage, constructed shape in pShapeRef
-    virtual sal_Bool ReadOCXStream( SotStorageRef& rSrc1,
-        com::sun::star::uno::Reference<
-        com::sun::star::drawing::XShape > *pShapeRef=0,
-        sal_Bool bFloatingCtrl=sal_False ) = 0;
-
-
-
-    //Writes the given Uno Control into the given storage
-
-    static sal_Bool WriteOCXStream(SotStorageRef &rSrc1,
-        const com::sun::star::uno::Reference<
-        com::sun::star::awt::XControlModel > &rControlModel,
-        const com::sun::star::awt::Size& rSize,String &rName);
-
-    //Excel has a nasty kludged mechanism for this, read
-    //the comments in the source to follow it
-    static sal_Bool WriteOCXExcelKludgeStream(SotStorageStreamRef& rContents,
-        const com::sun::star::uno::Reference<
-        com::sun::star::awt::XControlModel > &rControlModel,
-        const com::sun::star::awt::Size &rSize, String &rName);
-
-    //Generate an OCX converter based on the OLE2 name
-    static OCX_Control *OCX_Factory(const String &rId);
-
-    //Generate an OCX converter based on the StarOffice UNO id
-    static OCX_Control *OCX_Factory( const com::sun::star::uno::Reference<
-        com::sun::star::awt::XControlModel > &rControlModel,
-        String &rId,String &rName);
-
     virtual sal_Bool InsertControl(
         const com::sun::star::uno::Reference<
         com::sun::star::form::XFormComponent >& /*rFComp*/,
@@ -123,10 +87,6 @@ public:
     /*begin: Backwards compatability with office 95 import, modify later*/
     const com::sun::star::uno::Reference<
         com::sun::star::lang::XMultiServiceFactory > & GetServiceFactory();
-
-    sal_uInt16 GetEditNum() { return ++nEdit; }
-    sal_uInt16 GetCheckboxNum() { return ++nCheckbox; }
-    /*end: Backwards compatability*/
 protected:
     const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > &
         GetShapes();
@@ -134,8 +94,7 @@ protected:
     const com::sun::star::uno::Reference<
         com::sun::star::container::XIndexContainer > &  GetFormComps();
 
-    SfxObjectShell *pDocSh;
-    SwPaM *pPaM;
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel;
 
     // gecachte Interfaces
     com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >
@@ -148,746 +107,10 @@ protected:
     com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >
         xFormComps;
 
-    sal_uInt16 nEdit;
-    sal_uInt16 nCheckbox;
-
     virtual const com::sun::star::uno::Reference<
         com::sun::star::drawing::XDrawPage > & GetDrawPage();
 };
 
-class OCX_FontData
-{
-public:
-    OCX_FontData() : nFontNameLen(0), fBold(0), fItalic(0), fUnderline(0),
-        fStrike(0), nFontSize(12), nJustification(1), pFontName(0),
-        bHasAlign(sal_False), bHasFont(sal_True) {}
-    ~OCX_FontData()  {
-        if (pFontName)
-        delete [] pFontName;
-    }
-
-    sal_Bool Export(SotStorageStreamRef &rContent,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet);
-
-    sal_uInt16 nIdentifier;
-    sal_uInt16 nFixedAreaLen;
-    sal_uInt8 pBlockFlags[4];
-
-    sal_uInt32 nFontNameLen;
-
-    sal_uInt8   fBold:1;
-    sal_uInt8   fItalic:1;
-    sal_uInt8   fUnderline:1;
-    sal_uInt8   fStrike:1;
-    sal_uInt8   fUnknown1:4;
-
-    sal_uInt8   nUnknown2;
-    sal_uInt8   nUnknown3;
-    sal_uInt8   nUnknown4;
-
-    sal_uInt32  nFontSize;
-    sal_uInt16 nLanguageID;
-    sal_uInt8   nJustification;
-    sal_uInt16  nFontWeight;
-
-    char *pFontName;
-    void SetHasAlign(sal_Bool bIn) {bHasAlign=bIn;}
-    void SetHasFont(sal_Bool bIn) {bHasFont=bIn;}
-protected:
-    static sal_uInt16 nStandardId;
-    sal_uInt8 ExportAlign(sal_Int16 nAlign) const;
-private:
-    sal_Bool bHasAlign;
-    sal_Bool bHasFont;
-};
-
-class MSFILTER_DLLPUBLIC OCX_Control
-{
-public:
-    OCX_Control(UniString sN, OCX_Control* parent = NULL ) : nWidth( 0 ), nHeight( 0 ), mnLeft(0), mnTop(0),
-        mnStep(0), mnBackColor(0x8000000FL), mnForeColor(0), mnTabPos(0), mbVisible(true), sName(sN), pDocSh(0),
-        bSetInDialog(sal_False), mpParent( parent ) {}
-    //Export exports a control as an OLE style storage stream tree
-    virtual sal_Bool Export(SotStorageRef& /*rObj*/,
-    const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet>& /*rPropSet*/,
-        const com::sun::star::awt::Size& /*rSize*/) {return sal_False;}
-
-    //WriteContents writes the contents of a contents stream, for
-    //the Excel export you cannot use Export, only WriteContents instead
-    virtual sal_Bool WriteContents(SotStorageStreamRef& /*rObj*/,
-    const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet>& /*rPropSet*/,
-        const com::sun::star::awt::Size& /*rSize*/) {return sal_False;}
-    void SetInDialog(bool bState) { bSetInDialog = bState; }
-    bool GetInDialog() { return bSetInDialog; }
-
-    virtual ~OCX_Control() {}
-
-    static void FillSystemColors();
-
-    sal_uInt32 nWidth;
-    sal_uInt32 nHeight;
-        sal_Int32 mnLeft;
-        sal_Int32 mnTop;
-        sal_Int32 mnStep;
-    sal_Int32 mnBackColor;
-    sal_Int32 mnForeColor;
-        sal_uInt16 mnTabPos;
-    bool mbVisible;
-    UniString sName;
-    UniString msToolTip;
-    UniString msParentName;
-    OCX_FontData aFontData;
-    rtl::OUString msCtrlSource;
-    rtl::OUString msRowSource;
-        SfxObjectShell *pDocSh;
-    ::rtl::OUString sImageUrl;
-    com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicObject> mxGrfObj;
-protected:
-
-    sal_uInt32 ExportColor(sal_uInt32 nColorCode) const;
-    sal_uInt32 SwapColor(sal_uInt32 nColorCode) const;
-    sal_uInt8 ExportBorder(sal_uInt16 nBorder,sal_uInt8 &rBorderStyle) const;
-    bool bSetInDialog;
-    sal_uInt8 ExportSpecEffect( sal_Int16 nApiEffect ) const;
-    static sal_uInt16 nStandardId;
-    static sal_uInt8 const aObjInfo[4];
-    rtl::OUString msFormType;
-    rtl::OUString msDialogType;
-        OCX_Control* mpParent;
-private:
-    static sal_uInt32 pColor[25];
-};
-
-class OCX_ModernControl : public OCX_Control
-{
-public:
-    OCX_ModernControl(UniString sN) : OCX_Control(sN),
-    fEnabled(1), fLocked(0), fBackStyle(1), fColumnHeads(0), fIntegralHeight(1),
-    fMatchRequired(0), fAlignment(1), fDragBehaviour(0), fEnterKeyBehaviour(0),
-    fEnterFieldBehaviour(0), fTabKeyBehaviour(0), fWordWrap(1),
-    fSelectionMargin(1), fAutoWordSelect(1), fAutoSize(0), fHideSelection(1),
-    fAutoTab(0), fMultiLine(1), nMaxLength(0), nBorderStyle(0), nScrollBars(0),
-    nStyle(0), nMousePointer(0), nPasswordChar(0), nListWidth(0),
-    nBoundColumn(1), nTextColumn(-1), nColumnCount(1), nListRows(8),
-    nMatchEntry(2), nListStyle(0), nShowDropButtonWhen(0), nDropButtonStyle(1),
-    nMultiState(0), nValueLen(0), nCaptionLen(0), nVertPos(1), nHorzPos(7),
-    nSpecialEffect(2), nIcon(0), nPicture(0), nAccelerator(0), nGroupNameLen(0),
-    pValue(0), pCaption(0), pGroupName(0), nIconLen(0), pIcon(0),
-    nPictureLen(0) {}
-
-    ~OCX_ModernControl() {
-        if (pValue) delete[] pValue;
-        if (pCaption) delete[] pCaption;
-        if (pGroupName) delete[] pGroupName;
-        if (pIcon) delete[] pIcon;
-    }
-
-    /*sal_uInt8 for sal_uInt8 Word Struct*/
-    sal_uInt16  nIdentifier;
-    sal_uInt16  nFixedAreaLen;
-    sal_uInt8   pBlockFlags[8];
-
-    sal_uInt8   fUnknown1:1;
-    sal_uInt8   fEnabled:1;
-    sal_uInt8   fLocked:1;
-    sal_uInt8   fBackStyle:1;
-    sal_uInt8   fUnknown2:4;
-
-    sal_uInt8   fUnknown3:2;
-    sal_uInt8   fColumnHeads:1;
-    sal_uInt8   fIntegralHeight:1;
-    sal_uInt8   fMatchRequired:1;
-    sal_uInt8   fAlignment:1;
-    sal_uInt8   fUnknown4:2;
-
-    sal_uInt8   fUnknown5:3;
-    sal_uInt8   fDragBehaviour:1;
-    sal_uInt8   fEnterKeyBehaviour:1;
-    sal_uInt8   fEnterFieldBehaviour:1;
-    sal_uInt8   fTabKeyBehaviour:1;
-    sal_uInt8   fWordWrap:1;
-
-    sal_uInt8   fUnknown6:2;
-    sal_uInt8   fSelectionMargin:1;
-    sal_uInt8   fAutoWordSelect:1;
-    sal_uInt8   fAutoSize:1;
-    sal_uInt8   fHideSelection:1;
-    sal_uInt8   fAutoTab:1;
-    sal_uInt8   fMultiLine:1;
-
-    sal_uInt32  nMaxLength;
-    sal_uInt8   nBorderStyle;
-    sal_uInt8   nScrollBars;
-    sal_uInt8   nStyle;
-    sal_uInt8   nMousePointer;
-    sal_uInt8   nUnknown7;
-    sal_uInt8   nPasswordChar;
-    sal_uInt32  nListWidth;
-    sal_uInt16  nBoundColumn;
-    sal_Int16   nTextColumn;
-    sal_uInt16  nColumnCount;
-    sal_uInt16  nListRows;
-    sal_uInt16  nUnknown8;
-    sal_uInt8   nMatchEntry;
-    sal_uInt8   nListStyle;
-    sal_uInt8   nShowDropButtonWhen;
-    sal_uInt8   nDropButtonStyle;
-    sal_uInt8   nMultiState;
-    sal_uInt32  nValueLen;
-    sal_uInt32  nCaptionLen;
-
-    sal_uInt16 nVertPos;
-    sal_uInt16 nHorzPos;
-
-    sal_uInt32 nBorderColor;
-    sal_uInt8 nSpecialEffect;
-    sal_uInt16 nIcon;
-    sal_uInt16 nPicture;
-    sal_uInt8 nAccelerator;
-    sal_uInt8 nUnknown9;
-    sal_uInt32 nGroupNameLen;
-    sal_uInt32 nUnknown10;
-
-    char *pValue;
-    char *pCaption;
-    char *pGroupName;
-
-    sal_uInt8 pIconHeader[20];
-    sal_uInt32 nIconLen;
-    sal_uInt8 *pIcon;
-
-    sal_uInt8 pPictureHeader[20];
-    sal_uInt32 nPictureLen;
-
-};
-
-class OCX_Image : public OCX_Control
-{
-public:
-    OCX_Image() : OCX_Control(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Image" ))), fEnabled(1), fBackStyle(0), bPictureTiling(false), bAutoSize(false) {
-                msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DatabaseImageControl" ));
-        msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlImageControlModel" ));
-         }
-
-    ~OCX_Image() { }
-    /*sal_uInt8 for sal_uInt8 Word Struct*/
-    sal_uInt16  nIdentifier;
-    sal_uInt16  nFixedAreaLen;
-    sal_uInt8   pBlockFlags[4];
-
-    sal_uInt32  nBorderColor;
-    sal_uInt8   nBorderStyle;
-    sal_uInt8   nMousePointer;
-        sal_uInt8       nPictureSizeMode;
-
-
-           sal_uInt8    fUnknown1:1;
-    sal_uInt8   fEnabled:1;
-    sal_uInt8   fUnknown2:2;
-    sal_uInt8   fBackStyle:1;
-    sal_uInt8   fUnknown3:3;
-
-        sal_uInt8       nPictureAlignment;
-        bool            bPictureTiling;
-    sal_uInt8   nSpecialEffect;
-
-        bool bAutoSize;
-    sal_Bool Export(SotStorageRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-    sal_Bool WriteContents(SotStorageStreamRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-
-    static OCX_Control *Create() { return new OCX_Image;}
-};
-class OCX_OptionButton;
-
-class OCX_CheckBox : public OCX_ModernControl
-{
-public:
-    OCX_CheckBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CheckBox" ))){
-        msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CheckBox" ));
-        msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlCheckBoxModel" ));
-        mnBackColor = 0x80000005L;
-        mnForeColor = 0x80000008L;
-        aFontData.SetHasAlign(sal_True);
-    }
-
-    sal_Bool Export(SotStorageRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-    sal_Bool WriteContents(SotStorageStreamRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-    static OCX_Control *Create() { return new OCX_CheckBox;}
-};
-
-class OCX_OptionButton : public OCX_ModernControl
-{
-public:
-    OCX_OptionButton() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OptionButton" )))
-    {
-        msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ));
-        //msDialogType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel"));
-        msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ));
-        mnBackColor = 0x80000005L;
-        mnForeColor = 0x80000008L;
-        aFontData.SetHasAlign(sal_True);
-    }
-
-    sal_Bool Export(SotStorageRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-    sal_Bool WriteContents(SotStorageStreamRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-
-
-    static OCX_Control *Create() { return new OCX_OptionButton;}
-};
-
-class OCX_TextBox : public OCX_ModernControl
-{
-public:
-    OCX_TextBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextBox" ))) {
-        msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.TextField" ));
-        msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlEditModel" ));
-        mnBackColor = 0x80000005L;
-        mnForeColor = 0x80000008L;
-        nBorderColor = 0x80000006L;
-        aFontData.SetHasAlign(sal_True);
-    }
-
-    sal_Bool Export(SotStorageRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-    sal_Bool WriteContents(SotStorageStreamRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-    static OCX_Control *Create() { return new OCX_TextBox;}
-};
-
-class OCX_FieldControl: public OCX_ModernControl
-{
-public:
-    OCX_FieldControl() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextBox" ))) {
-        mnBackColor = 0x80000005L;
-        mnForeColor = 0x80000008L;
-        nBorderColor = 0x80000006L;
-    }
-    sal_Bool Export(SotStorageRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-    sal_Bool WriteContents(SotStorageStreamRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-    static OCX_Control *Create() { return new OCX_FieldControl;}
-};
-
-
-class OCX_ToggleButton : public OCX_ModernControl
-{
-public:
-    OCX_ToggleButton() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ToggleButton" ))) {
-                msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CommandButton" ));
-                msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlButtonModel" ));
-
-        mnBackColor = 0x8000000F;
-        mnForeColor = 0x80000012;
-        aFontData.SetHasAlign(sal_True);
-        aFontData.nJustification = 3;   // centered by default
-    }
-    static OCX_Control *Create() { return new OCX_ToggleButton;}
-
-    sal_Bool Export(SvStorageRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-    sal_Bool WriteContents(SvStorageStreamRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-};
-
-class OCX_ComboBox : public OCX_ModernControl
-{
-public:
-    OCX_ComboBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ComboBox" ))){
-        msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ComboBox" ));
-            msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ComboBox" ));
-        mnBackColor = 0x80000005;
-        mnForeColor = 0x80000008;
-        nBorderColor = 0x80000006;
-        aFontData.SetHasAlign(sal_True);
-    }
-    static OCX_Control *Create() { return new OCX_ComboBox;}
-    sal_Bool Export(SotStorageRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-    sal_Bool WriteContents(SotStorageStreamRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-};
-
-class OCX_ListBox : public OCX_ModernControl
-{
-public:
-    OCX_ListBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ))){
-        msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ));
-        //msDialogType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel"));
-        msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ));
-        mnBackColor = 0x80000005;
-        mnForeColor = 0x80000008;
-        nBorderColor = 0x80000006;
-        aFontData.SetHasAlign(sal_True);
-    }
-    static OCX_Control *Create() { return new OCX_ListBox;}
-    sal_Bool Export(SotStorageRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-    sal_Bool WriteContents(SotStorageStreamRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-
-};
-
-class OCX_CommandButton : public OCX_Control
-{
-public:
-    OCX_CommandButton() : OCX_Control(String::CreateFromAscii("CommandButton")),
-    fEnabled(1), fLocked(0), fBackStyle(1), fWordWrap(0), fAutoSize(0),
-        nCaptionLen(0), nVertPos(1), nHorzPos(7), nMousePointer(0), nPicture(0),
-        nAccelerator(0), nIcon(0), pCaption(0), nIconLen(0), pIcon(0), nPictureLen(0),
-        mbTakeFocus( true )
-    {
-            msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CommandButton" ));
-            msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlButtonModel" ));
-            mnForeColor = 0x80000012L;
-                mnBackColor = 0x8000000FL;
-    }
-
-    ~OCX_CommandButton() {
-        if (pCaption) delete[] pCaption;
-        if (pIcon) delete[] pIcon;
-    }
-
-    /*sal_uInt8 for sal_uInt8 Word Struct*/
-    sal_uInt16  nIdentifier;
-    sal_uInt16  nFixedAreaLen;
-    sal_uInt8   pBlockFlags[4];
-
-
-    sal_uInt8   fUnknown1:1;
-    sal_uInt8   fEnabled:1;
-    sal_uInt8   fLocked:1;
-    sal_uInt8   fBackStyle:1;
-    sal_uInt8   fUnknown2:4;
-
-    sal_uInt8   fUnknown3:8;
-
-    sal_uInt8   fUnknown4:7;
-    sal_uInt8   fWordWrap:1;
-
-    sal_uInt8   fUnknown5:4;
-    sal_uInt8   fAutoSize:1;
-    sal_uInt8   fUnknown6:3;
-
-    sal_uInt32  nCaptionLen;
-
-    sal_uInt16  nVertPos;
-    sal_uInt16  nHorzPos;
-
-    sal_uInt16  nMousePointer;
-    sal_uInt16  nPicture;
-    sal_uInt16  nAccelerator;
-    sal_uInt16  nIcon;
-
-    char *pCaption;
-
-    sal_uInt8 pIconHeader[20];
-    sal_uInt32  nIconLen;
-    sal_uInt8 *pIcon;
-
-    sal_uInt8 pPictureHeader[20];
-    sal_uInt32  nPictureLen;
-
-    bool        mbTakeFocus;
-
-    static OCX_Control *Create() { return new OCX_CommandButton;}
-    sal_Bool Export(SotStorageRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-    sal_Bool WriteContents(SotStorageStreamRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-
-};
-
-class OCX_ImageButton: public OCX_CommandButton
-{
-public:
-    OCX_ImageButton() {
-        aFontData.SetHasAlign(sal_False);
-        aFontData.SetHasFont(sal_False);
-    }
-    static OCX_Control *Create() { return new OCX_ImageButton;}
-    sal_Bool Export(SotStorageRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-    sal_Bool WriteContents(SotStorageStreamRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-
-};
-
-class OCX_GroupBox: public OCX_Control
-{
-public:
-    OCX_GroupBox() : OCX_Control(String::CreateFromAscii("GroupBox")) {}
-    static OCX_Control *Create() { return new OCX_GroupBox;}
-    sal_Bool Export(SotStorageRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-    sal_Bool WriteContents(SotStorageStreamRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-
-};
-
-class OCX_Label : public OCX_Control
-{
-public:
-    OCX_Label(OCX_Control* pParent = NULL ) : OCX_Control(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" )), pParent ), fEnabled(1),
-        fLocked(0),fBackStyle(1),fWordWrap(1),
-    fAutoSize(0),nCaptionLen(0),nVertPos(1),nHorzPos(7),nMousePointer(0),
-    nBorderColor(0x80000006),nBorderStyle(0),nSpecialEffect(0),
-    nPicture(0),nAccelerator(0),nIcon(0),pCaption(0),nIconLen(0),pIcon(0),
-    nPictureLen(0)
-    {
-        msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FixedText" ));
-        msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedTextModel" ));
-                mnForeColor = 0x80000008;
-                mnBackColor = 0x80000005;
-        aFontData.SetHasAlign(sal_True);
-    }
-
-    ~OCX_Label() {
-        if (pCaption) delete[] pCaption;
-        if (pIcon) delete[] pIcon;
-    }
-
-    /*sal_uInt8 for sal_uInt8 Word Struct*/
-    sal_uInt16 nIdentifier;
-    sal_uInt16 nFixedAreaLen;
-    sal_uInt8   pBlockFlags[4];
-
-
-    sal_uInt8   fUnknown1:1;
-    sal_uInt8   fEnabled:1;
-    sal_uInt8   fLocked:1;
-    sal_uInt8   fBackStyle:1;
-    sal_uInt8   fUnknown2:4;
-
-    sal_uInt8   fUnknown3:8;
-
-    sal_uInt8   fUnknown4:7;
-    sal_uInt8   fWordWrap:1;
-
-    sal_uInt8   fUnknown5:4;
-    sal_uInt8   fAutoSize:1;
-    sal_uInt8   fUnknown6:3;
-
-    sal_uInt32  nCaptionLen;
-    sal_uInt16  nVertPos;
-    sal_uInt16  nHorzPos;
-    sal_uInt8   nMousePointer;
-    sal_uInt32  nBorderColor;
-    sal_uInt16  nBorderStyle;
-    sal_uInt16  nSpecialEffect;
-    sal_uInt16  nPicture;
-    sal_uInt16  nAccelerator;
-    sal_uInt16  nIcon;
-
-    char *pCaption;
-
-    sal_uInt8 pIconHeader[20];
-    sal_uInt32  nIconLen;
-    sal_uInt8 *pIcon;
-
-    sal_uInt8 pPictureHeader[20];
-    sal_uInt32  nPictureLen;
-
-    static OCX_Control *Create() { return new OCX_Label;}
-
-    sal_Bool Export(SotStorageRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-    sal_Bool WriteContents(SotStorageStreamRef &rObj,
-        const com::sun::star::uno::Reference<
-        com::sun::star::beans::XPropertySet> &rPropSet,
-        const com::sun::star::awt::Size& rSize);
-
-};
-
-
-class OCX_ProgressBar : public OCX_Control
-{
-public:
-    explicit            OCX_ProgressBar();
-
-    static OCX_Control* Create();
-
-private:
-    sal_Int32   nMin;
-    sal_Int32   nMax;
-    bool        bFixedSingle;
-    bool        bEnabled;
-    bool        b3d;
-};
-
-class OCX_SpinButton : public OCX_Control
-{
-public:
-    explicit            OCX_SpinButton();
-
-    static OCX_Control* Create();
-
-    //Export exports a control as an OLE style storage stream tree
-    virtual sal_Bool    Export( SvStorageRef &rObj,
-                            const com::sun::star::uno::Reference<
-                                com::sun::star::beans::XPropertySet> &rPropSet,
-                                const com::sun::star::awt::Size& rSize );
-
-    //WriteContents writes the contents of a contents stream, for
-    //the Excel export you cannot use Export, only WriteContents instead
-    virtual sal_Bool    WriteContents( SvStorageStreamRef &rObj,
-                            const com::sun::star::uno::Reference<
-                                com::sun::star::beans::XPropertySet> &rPropSet,
-                                const com::sun::star::awt::Size& rSize );
-
-protected:
-    void                UpdateInt32Property(
-                            sal_Int32& rnCoreValue, sal_Int32 nNewValue,
-                            sal_Int32 nBlockFlag );
-
-    void                GetInt32Property(
-                            sal_Int32& rnCoreValue,
-                            const com::sun::star::uno::Reference<
-                                com::sun::star::beans::XPropertySet >& rxPropSet,
-                            const rtl::OUString& rPropName,
-                            sal_Int32 nBlockFlag );
-
-    void                UpdateBoolProperty(
-                            bool& rbCoreValue, bool bNewValue,
-                            sal_Int32 nBlockFlag );
-
-    void                GetBoolProperty(
-                            bool& rbCoreValue,
-                            const com::sun::star::uno::Reference<
-                                com::sun::star::beans::XPropertySet >& rxPropSet,
-                            const rtl::OUString& rPropName,
-                            sal_Int32 nBlockFlag );
-
-    /** Writes the data from own members to stream. */
-    sal_Bool            WriteData( SvStream& rStrm ) const;
-
-    sal_Int32           mnBlockFlags;
-    sal_Int32           mnValue;
-    sal_Int32           mnMin;
-    sal_Int32           mnMax;
-    sal_Int32           mnSmallStep;
-    sal_Int32           mnPageStep;
-    sal_Int32           mnOrient;
-    sal_Int32           mnDelay;
-    bool                mbEnabled;
-    bool                mbLocked;
-    bool                mbPropThumb;
-};
-
-class OCX_ScrollBar : public OCX_SpinButton
-{
-public:
-    explicit            OCX_ScrollBar();
-
-    static OCX_Control* Create();
-
-    //Export exports a control as an OLE style storage stream tree
-    virtual sal_Bool    Export( SvStorageRef &rObj,
-                            const com::sun::star::uno::Reference<
-                                com::sun::star::beans::XPropertySet> &rPropSet,
-                                const com::sun::star::awt::Size& rSize );
-
-    //WriteContents writes the contents of a contents stream, for
-    //the Excel export you cannot use Export, only WriteContents instead
-    virtual sal_Bool    WriteContents( SvStorageStreamRef &rObj,
-                            const com::sun::star::uno::Reference<
-                                com::sun::star::beans::XPropertySet> &rPropSet,
-                                const com::sun::star::awt::Size& rSize );
-};
-
-class HTML_Select : public OCX_ModernControl
-{
-public:
-    HTML_Select() : OCX_ModernControl(rtl::OUString::createFromAscii("TextBox")) {
-        msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.ListBox");
-        msDialogType = rtl::OUString::createFromAscii("com.sun.star.form.component.ListBox");
-        mnBackColor = 0x80000005L;
-        mnForeColor = 0x80000008L;
-        nBorderColor = 0x80000006L;
-        aFontData.SetHasAlign(sal_True);
-                fEnabled = true;
-                nMultiState =false;
-    }
-
-    static OCX_Control *Create() { return new HTML_Select;}
-
-        com::sun::star::uno::Sequence< rtl::OUString > msListData;
-        com::sun::star::uno::Sequence< sal_Int16 > msIndices;
-};
-
-class HTML_TextBox : public OCX_ModernControl
-{
-public:
-    HTML_TextBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextBox" ))) {
-        msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.TextField" ));
-        msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlEditModel" ));
-        mnBackColor = 0x80000005L;
-        mnForeColor = 0x80000008L;
-        nBorderColor = 0x80000006L;
-        aFontData.SetHasAlign(sal_True);
-    }
-
-    static OCX_Control *Create() { return new HTML_TextBox;}
-
-};
-
-
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx
index 3374699de3ba..6d2b8e0e8456 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -628,7 +628,7 @@ public:
                                 sal_uInt32* pTableArry,
                                 SvxMSDffSolverContainer*
                             );
-    virtual bool ReadFormControl( com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& rxInStrm, com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rFormComp ) const = 0;
+    virtual bool ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rFormComp ) const = 0;
 };
 
 struct PPTTextCharacterStyleAtomInterpreter
@@ -1258,8 +1258,8 @@ class PPTConvertOCXControls : public SvxMSConvertOCXControls
     com::sun::star::uno::Reference< com::sun::star::io::XInputStream > mxInStrm;
 public :
 
-    PPTConvertOCXControls( const SdrPowerPointImport* pPPTImporter, com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& rxInStrm, SfxObjectShell* pDSh, PptPageKind ePKind ) :
-        SvxMSConvertOCXControls ( pDSh, NULL ),
+    PPTConvertOCXControls( const SdrPowerPointImport* pPPTImporter, com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& rxInStrm, const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel, PptPageKind ePKind ) :
+        SvxMSConvertOCXControls ( rxModel ),
         ePageKind               ( ePKind ),
         mpPPTImporter           ( pPPTImporter ),
         mxInStrm                ( rxInStrm )