diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:38:50 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:38:50 +0200 |
commit | 112be98c928c38c5cc63c99e86e0b58b8d2dfe29 (patch) | |
tree | 053e3d7dfa670c6c1924d4095d9cfbe622b4b5ba /filter/inc/filter/msfilter/msocximex.hxx | |
parent | 03e6f1338cc18d047582fdb22787ebf0f693d8a2 (diff) | |
parent | d90e0b5999ff65ab9bceb4cbd5ecbd5af232ac3b (diff) |
resyncing to master
Diffstat (limited to 'filter/inc/filter/msfilter/msocximex.hxx')
-rw-r--r-- | filter/inc/filter/msfilter/msocximex.hxx | 10 |
1 files changed, 2 insertions, 8 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 |