summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx4
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx6
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx6
-rw-r--r--sw/source/filter/ww8/ww8glsy.hxx2
-rw-r--r--sw/source/filter/ww8/ww8par.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par.hxx4
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx12
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx4
-rw-r--r--sw/source/filter/xml/xmlimp.hxx2
9 files changed, 22 insertions, 22 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 3a9d1b405235..729d7f2f02de 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -3159,7 +3159,7 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrUnoObj& rFo
aSize.Height = TWIPS_TO_MM(aRect.Bottom());
//Open the ObjectPool
- SvStorageRef xObjPool = rWW8Wrt.GetWriter().GetStorage().OpenSotStorage(
+ SotStorageRef xObjPool = rWW8Wrt.GetWriter().GetStorage().OpenSotStorage(
OUString(SL::aObjectPool), STREAM_READWRITE |
StreamMode::SHARE_DENYALL);
@@ -3167,7 +3167,7 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrUnoObj& rFo
OUStringBuffer sStorageName;
sal_uInt32 nObjId = GenerateObjectID();
sStorageName.append('_').append( static_cast<sal_Int64>( nObjId ));
- SvStorageRef xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear(),
+ SotStorageRef xOleStg = xObjPool->OpenSotStorage(sStorageName.makeStringAndClear(),
STREAM_READWRITE|StreamMode::SHARE_DENYALL);
if (!xOleStg.Is())
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index b15f28294021..8aa4c37a859b 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -959,7 +959,7 @@ protected:
WW8AttributeOutput *m_pAttrOutput; ///< Converting attributes to stream data
private:
- SvStorageRef xEscherStg; /// memory leak #i120098#, to hold the reference to unnamed SotStorage obj
+ SotStorageRef xEscherStg; /// memory leak #i120098#, to hold the reference to unnamed SotStorage obj
public:
/// Access to the attribute output class.
@@ -1049,8 +1049,8 @@ public:
void StartCommentOutput( const OUString& rName );
void EndCommentOutput( const OUString& rName );
void OutGrf(const sw::Frame &rFrame);
- bool TestOleNeedsGraphic(const SwAttrSet& rSet, SvStorageRef xOleStg,
- SvStorageRef xObjStg, OUString &rStorageName, SwOLENode *pOLENd);
+ bool TestOleNeedsGraphic(const SwAttrSet& rSet, SotStorageRef xOleStg,
+ SotStorageRef xObjStg, OUString &rStorageName, SwOLENode *pOLENd);
virtual void AppendBookmarks( const SwTxtNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) SAL_OVERRIDE;
virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) SAL_OVERRIDE;
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index aa19fd7956ca..5ac3aada3e15 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -94,7 +94,7 @@ void WW8Export::OutputGrfNode( const SwGrfNode& /*rNode*/ )
}
bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet,
- SvStorageRef xOleStg, SvStorageRef xObjStg, OUString &rStorageName,
+ SotStorageRef xOleStg, SotStorageRef xObjStg, OUString &rStorageName,
SwOLENode *pOLENd)
{
bool bGraphicNeeded = false;
@@ -227,7 +227,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
}
pDataAdr = pSpecOLE + 2; //WW6 sprm is 1 but has 1 byte len as well.
- SvStorageRef xObjStg = GetWriter().GetStorage().OpenSotStorage(
+ SotStorageRef xObjStg = GetWriter().GetStorage().OpenSotStorage(
OUString(SL::aObjectPool), STREAM_READWRITE |
StreamMode::SHARE_DENYALL );
@@ -250,7 +250,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
Set_UInt32(pDataAdr, nPictureId);
OUString sStorageName('_');
sStorageName += OUString::number( nPictureId );
- SvStorageRef xOleStg = xObjStg->OpenSotStorage( sStorageName,
+ SotStorageRef xOleStg = xObjStg->OpenSotStorage( sStorageName,
STREAM_READWRITE| StreamMode::SHARE_DENYALL );
if( xOleStg.Is() )
{
diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx
index 17a1633d8905..dd4dd376c68c 100644
--- a/sw/source/filter/ww8/ww8glsy.hxx
+++ b/sw/source/filter/ww8/ww8glsy.hxx
@@ -67,7 +67,7 @@ private:
WW8GlossaryFib *pGlossary;
SotStorageStreamRef xTableStream;
SotStorageStreamRef &rStrm;
- SvStorageRef xStg;
+ SotStorageRef xStg;
sal_uInt16 nStrings;
static bool MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, bool bSaveRelFile,
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 1f9f2b34a698..c70366319822 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -578,7 +578,7 @@ SdrObject* SwMSDffManager::ImportOLE( long nOLEId,
uno::Reference < embed::XStorage > xDstStg;
if( GetOLEStorageName( nOLEId, sStorageName, xSrcStg, xDstStg ))
{
- SvStorageRef xSrc = xSrcStg->OpenSotStorage( sStorageName,
+ SotStorageRef xSrc = xSrcStg->OpenSotStorage( sStorageName,
STREAM_READWRITE| StreamMode::SHARE_DENYALL );
OSL_ENSURE(rReader.m_pFormImpl, "No Form Implementation!");
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape;
@@ -6149,7 +6149,7 @@ bool WW8Reader::ReadGlossaries(SwTextBlocks& rBlocks, bool bSaveRelFiles) const
}
bool SwMSDffManager::GetOLEStorageName(long nOLEId, OUString& rStorageName,
- SvStorageRef& rSrcStorage, uno::Reference < embed::XStorage >& rDestStorage) const
+ SotStorageRef& rSrcStorage, uno::Reference < embed::XStorage >& rDestStorage) const
{
bool bRet = false;
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index b82dd130b7f2..66ae20fb98d3 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -761,7 +761,7 @@ private:
std::map<sal_uInt32,OString> aOldEscherBlipCache;
virtual bool GetOLEStorageName( long nOLEId, OUString& rStorageName,
- SvStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const SAL_OVERRIDE;
+ SotStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const SAL_OVERRIDE;
virtual bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos ) const SAL_OVERRIDE;
// #i32596# - new parameter <_nCalledByGroup>, which
// indicates, if the OLE object is imported inside a group object
@@ -1889,7 +1889,7 @@ public: // eigentlich private, geht aber leider nur public
static bool GetPictGrafFromStream(Graphic& rGraphic, SvStream& rSrc);
static void PicRead( SvStream *pDataStream, WW8_PIC *pPic, bool bVer67);
- static bool ImportOleWMF( SvStorageRef xSrc1, GDIMetaFile &rWMF,
+ static bool ImportOleWMF( SotStorageRef xSrc1, GDIMetaFile &rWMF,
long &rX, long &rY);
static ColorData GetCol(sal_uInt8 nIco);
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index bb5359aab99b..bddb76b1ad8e 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -67,7 +67,7 @@ struct OLE_MFP
using namespace ::com::sun::star;
-static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1)
+static bool SwWw8ReadScaling(long& rX, long& rY, SotStorageRef& rSrc1)
{
// Skalierungsfaktoren holen:
// Informationen in PIC-Stream ( durch ausprobieren )
@@ -125,7 +125,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1)
}
static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
- SvStorageRef& rSrc1)
+ SotStorageRef& rSrc1)
{
SotStorageStreamRef xSrc2 = rSrc1->OpenSotStream( OUString("\3META"),
STREAM_STD_READ | StreamMode::NOCREATE);
@@ -179,7 +179,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
return true;
}
-static bool SwWw6ReadMacPICTStream(Graphic& rGraph, SvStorageRef& rSrc1)
+static bool SwWw6ReadMacPICTStream(Graphic& rGraph, SotStorageRef& rSrc1)
{
// 03-META-Stream nicht da. Vielleicht ein 03-PICT ?
SotStorageStreamRef xSrc4 = rSrc1->OpenSotStream(OUString("\3PICT"));
@@ -309,7 +309,7 @@ SwFrmFmt* SwWW8ImplReader::ImportOle(const Graphic* pGrf,
return pFmt;
}
-bool SwWW8ImplReader::ImportOleWMF(SvStorageRef xSrc1,GDIMetaFile &rWMF,
+bool SwWW8ImplReader::ImportOleWMF(SotStorageRef xSrc1,GDIMetaFile &rWMF,
long &rX,long &rY)
{
bool bOk = false;
@@ -349,8 +349,8 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
// ergibt Name "_4711"
aSrcStgName += OUString::number( m_nObjLocFc );
- SvStorageRef xSrc0 = m_pStg->OpenSotStorage(OUString(SL::aObjectPool));
- SvStorageRef xSrc1 = xSrc0->OpenSotStorage( aSrcStgName,
+ SotStorageRef xSrc0 = m_pStg->OpenSotStorage(OUString(SL::aObjectPool));
+ SotStorageRef xSrc1 = xSrc0->OpenSotStorage( aSrcStgName,
STREAM_READWRITE| StreamMode::SHARE_DENYALL );
if (pGrf)
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 4ff82eb834e2..cdc629fd9ca3 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -605,8 +605,8 @@ sal_uInt16 SwWW8ImplReader::End_Field()
OUString sOleId('_');
sOleId += OUString::number( m_aFieldStack.back().mnObjLocFc );
- SvStorageRef xSrc0 = m_pStg->OpenSotStorage(OUString(SL::aObjectPool));
- SvStorageRef xSrc1 = xSrc0->OpenSotStorage( sOleId, StreamMode::READ );
+ SotStorageRef xSrc0 = m_pStg->OpenSotStorage(OUString(SL::aObjectPool));
+ SotStorageRef xSrc1 = xSrc0->OpenSotStorage( sOleId, StreamMode::READ );
// Store it now!
uno::Reference< embed::XStorage > xDocStg = GetDoc().GetDocStorage();
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 74588f1b91b6..1da2d5c2416e 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -63,7 +63,7 @@ class SwXMLImport: public SvXMLImport
SvXMLItemMapEntriesRef xTableColItemMap;
SvXMLItemMapEntriesRef xTableRowItemMap;
SvXMLItemMapEntriesRef xTableCellItemMap;
- SvStorageRef xPackage;
+ SotStorageRef xPackage;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
xLateInitSettings;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 23:49:48 +0000