summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/eppt/eppt.cxx8
-rw-r--r--sd/source/filter/eppt/epptso.cxx2
-rw-r--r--sd/source/filter/ppt/pptin.cxx6
-rw-r--r--sd/source/filter/ppt/pptin.hxx6
-rw-r--r--sd/source/filter/ppt/propread.cxx2
-rw-r--r--sd/source/filter/ppt/propread.hxx2
-rw-r--r--sd/source/filter/sdpptwrp.cxx4
-rw-r--r--sd/source/ui/app/sdmod.cxx2
8 files changed, 16 insertions, 16 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 8688b6126531..091d46c2c116 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1278,13 +1278,13 @@ void PPTWriter::ImplWriteOLE( )
::uno::Reference < embed::XEmbeddedObject > xObj( static_cast<SdrOle2Obj*>(pSdrObj)->GetObjRef() );
if( xObj.is() )
{
- SotStorageRef xTempStorage( new SvStorage( new SvMemoryStream(), true ) );
+ SotStorageRef xTempStorage( new SotStorage( new SvMemoryStream(), true ) );
aOleExport.ExportOLEObject( xObj, *xTempStorage );
//TODO/MBA: testing
OUString aPersistStream( SVEXT_PERSIST_STREAM );
SvMemoryStream aStream;
- SotStorageRef xCleanStorage( new SvStorage( false, aStream ) );
+ SotStorageRef xCleanStorage( new SotStorage( false, aStream ) );
xTempStorage->CopyTo( xCleanStorage );
// create a dummy content stream, the dummy content is necessary for ppt, but not for
// doc files, so we can't share code.
@@ -1311,7 +1311,7 @@ void PPTWriter::ImplWriteOLE( )
OUString aName;
//Initialize the graphic size which will be used on export
::com::sun::star::awt::Size aSize( pPtr->xShape->getSize() );
- SotStorageRef xDest( new SvStorage( new SvMemoryStream(), true ) );
+ SotStorageRef xDest( new SotStorage( new SvMemoryStream(), true ) );
bool bOk = oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xDest, pPtr->xControlModel, aSize, aName );
if ( bOk )
pStrm = xDest->CreateMemoryStream();
@@ -1462,7 +1462,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector<
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas )
{
- SotStorageRef xDest( new SvStorage( new SvMemoryStream(), true ) );
+ SotStorageRef xDest( new SotStorage( new SvMemoryStream(), true ) );
SvxImportMSVBasic aMSVBas( rDocShell, *xDest );
aMSVBas.SaveOrDelMSVBAStorage( true, OUString( "_MS_VBA_Overhead" ) );
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 248a2f314be5..7e0ba731b1d8 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2505,7 +2505,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
::com::sun::star::awt::Size aSize;
OUString aControlName;
- SotStorageRef xTemp( new SvStorage( new SvMemoryStream(), true ) );
+ SotStorageRef xTemp( new SotStorage( new SvMemoryStream(), true ) );
if ( oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xTemp, aXControlModel, aSize, aControlName ) )
{
OUString aUserName( xTemp->GetUserName() );
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 09dacec14653..f563563bd8be 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -96,7 +96,7 @@
using namespace ::com::sun::star;
-SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMedium )
+SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SotStorage& rStorage, SfxMedium& rMedium )
{
sal_uInt32 nImportFlags = 0;
@@ -165,7 +165,7 @@ SdPPTImport::~SdPPTImport()
delete pFilter;
}
-ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage_, SfxMedium& rMedium, PowerPointImportParam& rParam )
+ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SotStorage& rStorage_, SfxMedium& rMedium, PowerPointImportParam& rParam )
: SdrPowerPointImport(rParam, rMedium.GetBaseURL())
, mrMed(rMedium)
, mrStorage(rStorage_)
@@ -2678,7 +2678,7 @@ ImplSdPPTImport::ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Ref
// exported function
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT(
- SdDrawDocument* pDocument, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMedium )
+ SdDrawDocument* pDocument, SvStream& rDocStream, SotStorage& rStorage, SfxMedium& rMedium )
{
SdPPTImport* pImport = new SdPPTImport( pDocument, rDocStream, rStorage, rMedium );
bool bRet = pImport->Import();
diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx
index d9c0382b19b3..4c90a682c7f3 100644
--- a/sd/source/filter/ppt/pptin.hxx
+++ b/sd/source/filter/ppt/pptin.hxx
@@ -48,7 +48,7 @@ typedef std::vector< std::pair< SdrObject*, Ppt97AnimationPtr > > tAnimationVect
class ImplSdPPTImport : public SdrPowerPointImport
{
SfxMedium& mrMed;
- SvStorage& mrStorage;
+ SotStorage& mrStorage;
// SvStream* mpPicStream;
DffRecordHeader maDocHd;
std::vector<OUString> maSlideNameList;
@@ -74,7 +74,7 @@ public:
OUString ReadSound( sal_uInt32 nSoundRef ) const;
OUString ReadMedia( sal_uInt32 nMediaRef ) const;
- ImplSdPPTImport( SdDrawDocument* pDoc, SvStorage& rStorage, SfxMedium& rMed, PowerPointImportParam& );
+ ImplSdPPTImport( SdDrawDocument* pDoc, SotStorage& rStorage, SfxMedium& rMed, PowerPointImportParam& );
virtual ~ImplSdPPTImport();
bool Import();
@@ -87,7 +87,7 @@ class SdPPTImport
public:
- SdPPTImport( SdDrawDocument* pDoc, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMed );
+ SdPPTImport( SdDrawDocument* pDoc, SvStream& rDocStream, SotStorage& rStorage, SfxMedium& rMed );
~SdPPTImport();
bool Import();
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index 1c22e50b713f..e2864220ca63 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -500,7 +500,7 @@ Section& Section::operator=( const Section& rSection )
return *this;
}
-PropRead::PropRead( SvStorage& rStorage, const OUString& rName ) :
+PropRead::PropRead( SotStorage& rStorage, const OUString& rName ) :
mbStatus ( false ),
mnByteOrder ( 0xfffe ),
mnFormat ( 0 ),
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index 871118bc731c..29c71816627b 100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -151,7 +151,7 @@ class PropRead
void AddSection( Section& rSection );
public:
- PropRead( SvStorage& rSvStorage, const OUString& rName );
+ PropRead( SotStorage& rSvStorage, const OUString& rName );
PropRead& operator=( const PropRead& rPropRead );
const Section* GetSection( const sal_uInt8* pFMTID );
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index a4da29346f4e..85a2bf46d1f4 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -44,7 +44,7 @@ typedef sal_Bool ( SAL_CALL *ExportPPTPointer )( const std::vector< com::sun::st
Reference< XStatusIndicator > &,
SvMemoryStream*, sal_uInt32 nCnvrtFlags );
-typedef sal_Bool ( SAL_CALL *ImportPPTPointer )( SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& );
+typedef sal_Bool ( SAL_CALL *ImportPPTPointer )( SdDrawDocument*, SvStream&, SotStorage&, SfxMedium& );
typedef sal_Bool ( SAL_CALL *SaveVBAPointer )( SfxObjectShell&, SvMemoryStream*& );
@@ -55,7 +55,7 @@ extern "C" sal_Bool ExportPPT( const std::vector< com::sun::star::beans::Propert
Reference< XStatusIndicator > &,
SvMemoryStream*, sal_uInt32 nCnvrtFlags );
-extern "C" sal_Bool ImportPPT( SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& );
+extern "C" sal_Bool ImportPPT( SdDrawDocument*, SvStream&, SotStorage&, SfxMedium& );
extern "C" sal_Bool SaveVBA( SfxObjectShell&, SvMemoryStream*& );
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index d4177d68925c..14ed722069ed 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -191,7 +191,7 @@ SotStorageStreamRef SdModule::GetOptionStream( const OUString& rOptionName,
SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE );
if( pStm )
- xOptionStorage = new SvStorage( pStm, true );
+ xOptionStorage = new SotStorage( pStm, true );
}
OUString aStmName;
generated by cgit (git 2.34.1) at 2024-12-27 21:01:16 +0000