summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-06 16:28:08 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-07 11:05:02 +0200
commitbb2174d86728a3aead640032745b1e781d7f818b (patch)
tree3e5cd53ea67a740d114eff3a0fef1acbc641120c /sd
parentcd5e167bef00f823e3d1bc3dcf82acc3820d6f6a (diff)
Remove SvStorageStreamRef alias
Change-Id: Ic25c39adf8796bb433fa7746f53a68e3e2bfd228
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/sdmod.hxx2
-rw-r--r--sd/source/filter/eppt/eppt.cxx2
-rw-r--r--sd/source/filter/eppt/epptso.cxx2
-rw-r--r--sd/source/filter/ppt/propread.hxx2
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx2
-rw-r--r--sd/source/ui/app/sdmod.cxx4
-rw-r--r--sd/source/ui/dlg/morphdlg.cxx4
-rw-r--r--sd/source/ui/dlg/vectdlg.cxx4
8 files changed, 11 insertions, 11 deletions
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index c99acded1fa4..cda5f9c78fba 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -98,7 +98,7 @@ public:
void GetState(SfxItemSet&);
SdOptions* GetSdOptions(DocumentType eDocType);
- SD_DLLPUBLIC SvStorageStreamRef GetOptionStream( const OUString& rOptionName, SdOptionStreamMode eMode );
+ SD_DLLPUBLIC SotStorageStreamRef GetOptionStream( const OUString& rOptionName, SdOptionStreamMode eMode );
bool GetWaterCan() const { return bWaterCan; }
void SetWaterCan( bool bWC ) { bWaterCan = bWC; }
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 7ce4bf48d9f4..9e54c56bc59c 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1472,7 +1472,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocS
SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( OUString( "_MS_VBA_Overhead") );
if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) )
{
- SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( OUString( "_MS_VBA_Overhead2") );
+ SotStorageStreamRef xTemp = xOverhead2->OpenSotStream( OUString( "_MS_VBA_Overhead2") );
if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) )
{
sal_uInt32 nLen = xTemp->GetSize();
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 5f1d5bbb2a1e..a04bc548f135 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2512,7 +2512,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
OUString aOleIdentifier;
if ( !aUserName.isEmpty() )
{
- SvStorageStreamRef xCompObj = xTemp->OpenSotStream(
+ SotStorageStreamRef xCompObj = xTemp->OpenSotStream(
OUString( "\1CompObj" ),
StreamMode::READ | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL );
sal_uInt32 const nStreamLen = xCompObj->remainingSize();
diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx
index ed968bca3ff2..fbd619d771aa 100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -139,7 +139,7 @@ class Section
class PropRead
{
bool mbStatus;
- SvStorageStreamRef mpSvStream;
+ SotStorageStreamRef mpSvStream;
sal_uInt16 mnByteOrder;
sal_uInt16 mnFormat;
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index e746db3dfa5d..300c35cb2cd9 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -586,7 +586,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
// get the input stream (storage or stream)
- SvStorageStreamRef xDocStream;
+ SotStorageStreamRef xDocStream;
Reference<io::XInputStream> xInputStream;
uno::Reference < embed::XStorage > xStorage = mrMedium.GetStorage();
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 422e2a89153b..d4177d68925c 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -172,11 +172,11 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType)
* if the stream is opened for reading but does not exist, an 'empty'
* RefObject is returned
*/
-SvStorageStreamRef SdModule::GetOptionStream( const OUString& rOptionName,
+SotStorageStreamRef SdModule::GetOptionStream( const OUString& rOptionName,
SdOptionStreamMode eMode )
{
::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() );
- SvStorageStreamRef xStm;
+ SotStorageStreamRef xStm;
if( pDocSh )
{
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index ebd28b18dad1..b3dc63b2b30e 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -79,7 +79,7 @@ void MorphDlg::dispose()
void MorphDlg::LoadSettings()
{
- SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) ,
+ SotStorageStreamRef xIStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) ,
SD_OPTION_LOAD ) );
sal_uInt16 nSteps;
bool bOrient, bAttrib;
@@ -103,7 +103,7 @@ void MorphDlg::LoadSettings()
void MorphDlg::SaveSettings() const
{
- SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) ,
+ SotStorageStreamRef xOStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) ,
SD_OPTION_STORE ) );
if( xOStm.Is() )
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index cf69318f7e6e..7d8245e78e56 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -312,7 +312,7 @@ IMPL_LINK_NOARG(SdVectorizeDlg, ModifyHdl)
void SdVectorizeDlg::LoadSettings()
{
- SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream(
+ SotStorageStreamRef xIStm( SD_MOD()->GetOptionStream(
OUString( SD_OPTION_VECTORIZE ) ,
SD_OPTION_LOAD ) );
sal_uInt16 nLayers;
@@ -343,7 +343,7 @@ void SdVectorizeDlg::LoadSettings()
void SdVectorizeDlg::SaveSettings() const
{
- SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream(
+ SotStorageStreamRef xOStm( SD_MOD()->GetOptionStream(
OUString(SD_OPTION_VECTORIZE) ,
SD_OPTION_STORE ) );