diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-06 16:33:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-07 11:05:04 +0200 |
| commit | dc47b2e5136f0f767273dc5fdba5c822575e194b (patch) | |
| tree | 128ac4f7f3aca38d0928b76e529ae7fae021f7c3 /include/filter | |
| parent | e14b7660f622a83fe97635649674ade05fe1eb72 (diff) | |
Unwind SotStorageRef typedef
Change-Id: I8d5363bb2ad813ef29b4078848914f4b0989b9f1
Diffstat (limited to 'include/filter')
| -rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 6 | ||||
| -rw-r--r-- | include/filter/msfilter/svdfppt.hxx | 4 | ||||
| -rw-r--r-- | include/filter/msfilter/svxmsbas.hxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 6c8d0625fbf4..34834adcdf5e 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -507,7 +507,7 @@ protected : // the following method needs to be overridden for the import of OLE objects virtual bool GetOLEStorageName( long nOLEId, OUString& rStorageName, - SotStorageRef& rSrcStorage, + tools::SvRef<SotStorage>& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg ) const; @@ -606,7 +606,7 @@ public: static bool ConvertToOle2( SvStream& rStm, sal_uInt32 nLen, const GDIMetaFile*, - const SotStorageRef & rDest ); + const tools::SvRef<SotStorage> & rDest ); void SetModel(SdrModel* pModel, long nApplicationScale); SdrModel* GetModel() const { return pSdrModel; } @@ -705,7 +705,7 @@ public: sal_uInt32 GetConvertFlags() const { return nSvxMSDffOLEConvFlags; } static SdrOle2Obj* CreateSdrOLEFromStorage( const OUString& rStorageName, - SotStorageRef& rSrcStorage, + tools::SvRef<SotStorage>& rSrcStorage, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg, const Graphic& rGraf, const Rectangle& rBoundRect, diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index d820b17c6cad..82f3a0a7fb58 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -632,7 +632,7 @@ public: sal_uInt32* pTableArry, SvxMSDffSolverContainer* ); - virtual bool ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rFormComp ) const = 0; + virtual bool ReadFormControl( tools::SvRef<SotStorage>& rSrc1, com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rFormComp ) const = 0; }; struct PPTTextCharacterStyleAtomInterpreter @@ -1305,7 +1305,7 @@ public : mpPPTImporter ( pPPTImporter ), mxInStrm ( rxInStrm ) {}; - bool ReadOCXStream( SotStorageRef& rSrc1, + bool ReadOCXStream( tools::SvRef<SotStorage>& rSrc1, com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShapeRef=0, bool bFloatingCtrl=false ); diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx index 24db778a98aa..d379750e3d8e 100644 --- a/include/filter/msfilter/svxmsbas.hxx +++ b/include/filter/msfilter/svxmsbas.hxx @@ -64,7 +64,7 @@ public: static OUString GetMSBasicStorageName(); private: - SotStorageRef xRoot; + tools::SvRef<SotStorage> xRoot; SfxObjectShell &rDocSh; }; |