diff options
author | Noel Power <noel.power@novell.com> | 2011-07-12 10:07:52 +0100 |
---|---|---|
committer | Noel Power <noel.power@novell.com> | 2011-07-12 10:07:52 +0100 |
commit | 92eafe7218694f16cfe8a66f7fcd3d53187e2665 (patch) | |
tree | 88976c2eb13c555fb2e70408fde726b82f489086 /filter/inc | |
parent | fad50e6a8c95412aeb4a2490ceab0c8d4f402919 (diff) |
use oox filter for *all* control import
Diffstat (limited to 'filter/inc')
-rw-r--r-- | filter/inc/filter/msfilter/msocximex.hxx | 10 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/svdfppt.hxx | 14 |
2 files changed, 13 insertions, 11 deletions
diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx index 5e1915d0406f..31b3732dbfdd 100644 --- a/filter/inc/filter/msfilter/msocximex.hxx +++ b/filter/inc/filter/msfilter/msocximex.hxx @@ -96,18 +96,12 @@ public: virtual ~SvxMSConvertOCXControls(); //Reads a control from the given storage, constructed shape in pShapeRef - sal_Bool ReadOCXStream( SotStorageRef& rSrc1, + virtual sal_Bool ReadOCXStream( SotStorageRef& rSrc1, com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShapeRef=0, - sal_Bool bFloatingCtrl=sal_False ); + sal_Bool bFloatingCtrl=sal_False ) = 0; - //Excel has a nasty kludged mechanism for this, read - //the comments in the source to follow it - sal_Bool ReadOCXExcelKludgeStream(SotStorageStreamRef& rSrc1, - com::sun::star::uno::Reference < - com::sun::star::drawing::XShape > *pShapeRef,sal_Bool bFloatingCtrl); - //Writes the given Uno Control into the given storage diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx index d9f52434b101..57ab915cec71 100644 --- a/filter/inc/filter/msfilter/svdfppt.hxx +++ b/filter/inc/filter/msfilter/svdfppt.hxx @@ -633,6 +633,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; }; struct PPTTextCharacterStyleAtomInterpreter @@ -1258,13 +1259,20 @@ class PPTConvertOCXControls : public SvxMSConvertOCXControls { virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > & GetDrawPage(); PptPageKind ePageKind; + const SdrPowerPointImport* mpPPTImporter; + com::sun::star::uno::Reference< com::sun::star::io::XInputStream > mxInStrm; public : - PPTConvertOCXControls( SfxObjectShell* pDSh, PptPageKind ePKind ) : + PPTConvertOCXControls( const SdrPowerPointImport* pPPTImporter, com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& rxInStrm, SfxObjectShell* pDSh, PptPageKind ePKind ) : SvxMSConvertOCXControls ( pDSh, NULL ), - ePageKind ( ePKind ) + ePageKind ( ePKind ), + mpPPTImporter ( pPPTImporter ), + mxInStrm ( rxInStrm ) {}; - + virtual sal_Bool ReadOCXStream( SotStorageRef& rSrc1, + com::sun::star::uno::Reference< + com::sun::star::drawing::XShape > *pShapeRef=0, + sal_Bool bFloatingCtrl=sal_False ); virtual sal_Bool InsertControl( const com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > &rFComp, const com::sun::star::awt::Size& rSize, |