diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/ole/olehelper.hxx | 2 | ||||
| -rw-r--r-- | include/sot/storage.hxx | 5 | ||||
| -rw-r--r-- | include/svtools/transfer.hxx | 6 | ||||
| -rw-r--r-- | include/svx/galmisc.hxx | 4 | ||||
| -rw-r--r-- | include/svx/galtheme.hxx | 4 |
5 files changed, 8 insertions, 13 deletions
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx index ae1890855442..17e76e254a86 100644 --- a/include/oox/ole/olehelper.hxx +++ b/include/oox/ole/olehelper.hxx @@ -162,7 +162,7 @@ public: MSConvertOCXControls( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel ); virtual ~MSConvertOCXControls(); bool ReadOCXStorage( tools::SvRef<SotStorage>& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp ); - bool ReadOCXCtlsStream(SotStorageStreamRef& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp, + bool ReadOCXCtlsStream(tools::SvRef<SotStorageStream>& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp, sal_Int32 nPos, sal_Int32 nSize ); static bool WriteOCXStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, tools::SvRef<SotStorage> &rSrc1, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,OUString &rName); static bool WriteOCXExcelKludgeStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutStrm, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,OUString &rName); diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx index 90a77e8cdfa9..45593de08c0b 100644 --- a/include/sot/storage.hxx +++ b/include/sot/storage.hxx @@ -91,11 +91,6 @@ public: virtual sal_uInt64 remainingSize() SAL_OVERRIDE; }; -#ifndef SOT_DECL_SOTSTORAGESTREAM_DEFINED -#define SOT_DECL_SOTSTORAGESTREAM_DEFINED -typedef tools::SvRef<SotStorageStream> SotStorageStreamRef; -#endif - namespace ucbhelper { class Content; diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 0c86721d7cd5..c292b13d07ff 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -241,7 +241,7 @@ protected: virtual void AddSupportedFormats() = 0; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) = 0; - virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); virtual void DragFinished( sal_Int8 nDropAction ); virtual void ObjectReleased(); @@ -357,8 +357,8 @@ public: css::uno::Sequence<sal_Int8> GetSequence( SotClipboardFormatId nFormat, const OUString& rDestDoc ); css::uno::Sequence<sal_Int8> GetSequence( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ); - bool GetSotStorageStream( SotClipboardFormatId nFormat, SotStorageStreamRef& rStreamRef ); - bool GetSotStorageStream( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, SotStorageStreamRef& rStreamRef ); + bool GetSotStorageStream( SotClipboardFormatId nFormat, tools::SvRef<SotStorageStream>& rStreamRef ); + bool GetSotStorageStream( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, tools::SvRef<SotStorageStream>& rStreamRef ); css::uno::Reference<css::io::XInputStream> GetInputStream( SotClipboardFormatId nFormat, const OUString& rDestDoc ); css::uno::Reference<css::io::XInputStream> GetInputStream( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ); diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index c833b084eb2d..c0604ea80067 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -163,7 +163,7 @@ private: GalleryTheme* mpTheme; SgaObjKind meObjectKind; sal_uInt32 mnObjectPos; - SotStorageStreamRef mxModelStream; + tools::SvRef<SotStorageStream> mxModelStream; GraphicObject* mpGraphicObject; ImageMap* mpImageMap; INetURLObject* mpURL; @@ -178,7 +178,7 @@ protected: // TransferableHelper virtual void AddSupportedFormats() SAL_OVERRIDE; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; - virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; virtual void ObjectReleased() SAL_OVERRIDE; diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index e956ea028e2e..21ec91ffb67e 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -207,8 +207,8 @@ public: bool GetModel( sal_uIntPtr nPos, SdrModel& rModel, bool bProgress = false ); bool InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos = CONTAINER_APPEND ); - SAL_DLLPRIVATE bool GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rModelStreamRef, bool bProgress = false ); - SAL_DLLPRIVATE bool InsertModelStream( const SotStorageStreamRef& rModelStream, sal_uIntPtr nInsertPos = CONTAINER_APPEND ); + SAL_DLLPRIVATE bool GetModelStream( sal_uIntPtr nPos, tools::SvRef<SotStorageStream>& rModelStreamRef, bool bProgress = false ); + SAL_DLLPRIVATE bool InsertModelStream( const tools::SvRef<SotStorageStream>& rModelStream, sal_uIntPtr nInsertPos = CONTAINER_APPEND ); SAL_DLLPRIVATE bool GetURL( sal_uIntPtr nPos, INetURLObject& rURL, bool bProgress = false ); bool InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos = CONTAINER_APPEND ); |