Unwind SotStorageRef typedef

Change-Id: I8d5363bb2ad813ef29b4078848914f4b0989b9f1

7 files changed, 12 insertions, 17 deletions

diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 4724843e3c40..91c515762629 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -175,10 +175,10 @@ class EDITENG_DLLPUBLIC SvxAutoCorrectLanguageLists
     bool IsFileChanged_Imp();
     void LoadXMLExceptList_Imp( SvStringsISortDtor*& rpLst,
                                 const sal_Char* pStrmName,
-                                SotStorageRef& rStg);
+                                tools::SvRef<SotStorage>& rStg);
     static void SaveExceptList_Imp( const SvStringsISortDtor& rLst,
                                 const sal_Char* pStrmName,
-                                SotStorageRef& rStg,
+                                tools::SvRef<SotStorage>& rStg,
                                 bool bConvert = false);
 
     bool MakeBlocklist_Imp( SotStorage& rStg );
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;
 };
 
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index 167a7d285be0..ae1890855442 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -161,10 +161,10 @@ protected:
 public:
     MSConvertOCXControls( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel );
     virtual ~MSConvertOCXControls();
-    bool ReadOCXStorage( SotStorageRef& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp );
+    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,
                                    sal_Int32 nPos, sal_Int32 nSize );
-    static bool WriteOCXStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, SotStorageRef &rSrc1, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,OUString &rName);
+    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 3c6f46ed8f5a..90a77e8cdfa9 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -214,11 +214,6 @@ public:
     static sal_Int32    GetVersion( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage );
 };
 
-#ifndef SOT_DECL_SOTSTORAGE_DEFINED
-#define SOT_DECL_SOTSTORAGE_DEFINED
-typedef tools::SvRef<SotStorage> SotStorageRef;
-#endif
-
 #endif // _SVSTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 2597870a5153..e956ea028e2e 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -98,7 +98,7 @@ private:
     GalleryObjectList           aObjectList;
     OUString                    m_aDestDir;
     bool                        m_bDestDirRelative;
-    SotStorageRef               aSvDrawStorageRef;
+    tools::SvRef<SotStorage>               aSvDrawStorageRef;
     Gallery*                    pParent;
     GalleryThemeEntry*          pThm;
     sal_uIntPtr                 mnThemeLockCount;
@@ -182,7 +182,7 @@ public:
     SAL_DLLPRIVATE void         AbortActualize() { bAbortActualize = true; }
 
     SAL_DLLPRIVATE Gallery*     GetParent() const { return pParent; }
-    SAL_DLLPRIVATE SotStorageRef GetSvDrawStorage() const { return aSvDrawStorageRef; }
+    SAL_DLLPRIVATE tools::SvRef<SotStorage> GetSvDrawStorage() const { return aSvDrawStorageRef; }
 
 public: