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

3 files changed, 4 insertions, 8 deletions

diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 123c337f21da..0c04214f60ac 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3171,8 +3171,8 @@ XclImpDffConverter::XclImpDffConvData::XclImpDffConvData(
 
 XclImpDffConverter::XclImpDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) :
     XclImpSimpleDffConverter( rRoot, rDffStrm ),
+    oox::ole::MSConvertOCXControls( rRoot.GetDocShell()->GetModel() ),
     maStdFormName( CREATE_OUSTRING( "Standard" ) ),
-    maFormCtrlHelper( GetMedium().GetInputStream(),  lcl_getUnoCtx(), GetDocShell()->GetModel() ),
     mnOleImpFlags( 0 )
 {
     const SvtFilterOptions& rFilterOpt = SvtFilterOptions::Get();
@@ -3330,15 +3330,14 @@ SdrObject* XclImpDffConverter::CreateSdrObject( const XclImpPictureObj& rPicObj,
                 /*  set controls form, needed in virtual function InsertControl()
                     called from ReadOCXExcelKludgeStream() */
                 InitControlForm();
-                // seek to stream position of the extra data for this control
-                mxCtlsStrm->Seek( rPicObj.GetCtlsStreamPos() );
+
                 // read from mxCtlsStrm into xShape, insert the control model into the form
                 Reference< XShape > xShape;
                 if( GetConvData().mxCtrlForm.is() )
                 {
                      Reference< XFormComponent >  xFComp;
                      com::sun::star::awt::Size aSz;  // not used in import
-                     maFormCtrlHelper.importFormControlFromCtls( xFComp, rPicObj.GetCtlsStreamPos(),  rPicObj.GetCtlsStreamSize() );
+                     ReadOCXCtlsStream( mxCtlsStrm, xFComp, rPicObj.GetCtlsStreamPos(),  rPicObj.GetCtlsStreamSize() );
                      // recreate the method formally known as
                      // ReadOCXExcelKludgeStream( )
                      if ( xFComp.is() )
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index 975dac9495b1..e7e2db587d5e 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -32,7 +32,6 @@
 #include <vector>
 #include <map>
 #include <filter/msfilter/msdffimp.hxx>
-#include <filter/msfilter/msocximex.hxx>
 #include <vcl/graph.hxx>
 #include "xlescher.hxx"
 #include "xiroot.hxx"
@@ -988,7 +987,7 @@ protected:
     contains core implementation of DFF stream import and OCX form control
     import.
  */
-class XclImpDffConverter : public XclImpSimpleDffConverter
+class XclImpDffConverter : public XclImpSimpleDffConverter, private oox::ole::MSConvertOCXControls
 {
 public:
     explicit            XclImpDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm );
@@ -1095,7 +1094,6 @@ private:
     typedef ::std::vector< XclImpDffConvDataRef >   XclImpDffConvDataStack;
 
     const ::rtl::OUString maStdFormName;    /// Standard name of control forms.
-    ::oox::ole::OleFormCtrlImportHelper   maFormCtrlHelper;
     SotStorageStreamRef mxCtlsStrm;         /// The 'Ctls' stream for OCX form controls.
     ScfProgressBarRef   mxProgress;         /// The progress bar used in ProcessObj().
     XclImpDffConvDataStack maDataStack;     /// Stack for registered drawing managers.
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index 89cda3e19eb9..cf60b12f1cc4 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -42,7 +42,6 @@
 #include <svx/svdoole2.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/fmglob.hxx>
-#include <filter/msfilter/msocximex.hxx>
 #include <vcl/outdev.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/ucbstreamhelper.hxx>