[Libreoffice-commits] core.git: 16 commits - basctl/source basic/source chart2/source dbaccess/source editeng/source filter/source include/basic include/editeng include/filter include/oox include/sfx2 include/sot include/svtools include/svx oox/source reportdesign/source sc/source sd/inc sd/source sfx2/source sot/qa sot/source sot/workben starmath/inc starmath/source svtools/source svx/source svx/workben sw/inc sw/source writerperfect/source xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Thu May 7 02:05:43 PDT 2015
basctl/source/basicide/baside2.cxx | 1
basic/source/basmgr/basicmanagerrepository.cxx | 2
basic/source/basmgr/basmgr.cxx | 24 +--
basic/source/uno/scriptcont.cxx | 2
chart2/source/controller/main/ChartController_Tools.cxx | 4
chart2/source/controller/main/ChartTransferable.cxx | 4
chart2/source/controller/main/ChartTransferable.hxx | 2
chart2/source/view/main/ChartView.cxx | 1
dbaccess/source/ui/browser/dbexchange.cxx | 2
dbaccess/source/ui/browser/sbagrid.cxx | 1
dbaccess/source/ui/inc/TableCopyHelper.hxx | 2
dbaccess/source/ui/inc/TableRowExchange.hxx | 2
dbaccess/source/ui/inc/dbexchange.hxx | 2
dbaccess/source/ui/misc/TableCopyHelper.cxx | 2
dbaccess/source/ui/tabledesign/TEditControl.cxx | 2
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 2
editeng/source/editeng/impedit2.cxx | 1
editeng/source/misc/svxacorr.cxx | 38 ++---
filter/source/msfilter/msdffimp.cxx | 30 ++--
filter/source/msfilter/msoleexp.cxx | 11 -
filter/source/msfilter/svdfppt.cxx | 22 +-
filter/source/msfilter/svxmsbas2.cxx | 9 -
include/basic/sbxdef.hxx | 2
include/editeng/svxacorr.hxx | 7
include/filter/msfilter/msdffimp.hxx | 13 +
include/filter/msfilter/msocximex.hxx | 2
include/filter/msfilter/mstoolbar.hxx | 2
include/filter/msfilter/svdfppt.hxx | 4
include/filter/msfilter/svxmsbas.hxx | 4
include/oox/ole/olehelper.hxx | 10 -
include/sfx2/objsh.hxx | 4
include/sot/storage.hxx | 37 ----
include/sot/storinfo.hxx | 4
include/svtools/transfer.hxx | 10 -
include/svx/dbaexchange.hxx | 3
include/svx/galmisc.hxx | 7
include/svx/galtheme.hxx | 14 -
include/svx/svdmodel.hxx | 2
include/svx/xmleohlp.hxx | 1
oox/source/export/ooxml-export-notes.txt | 2
oox/source/ole/olehelper.cxx | 19 +-
reportdesign/source/ui/dlg/GroupsSorting.cxx | 1
reportdesign/source/ui/report/dlgedclip.cxx | 1
sc/source/filter/excel/excel.cxx | 12 -
sc/source/filter/excel/excimp8.cxx | 6
sc/source/filter/excel/expop2.cxx | 2
sc/source/filter/excel/xepivot.cxx | 4
sc/source/filter/excel/xeroot.cxx | 2
sc/source/filter/excel/xestream.cxx | 2
sc/source/filter/excel/xiescher.cxx | 2
sc/source/filter/excel/xipivot.cxx | 4
sc/source/filter/excel/xiroot.cxx | 2
sc/source/filter/excel/xlroot.cxx | 12 -
sc/source/filter/ftools/ftools.cxx | 16 +-
sc/source/filter/inc/XclImpChangeTrack.hxx | 2
sc/source/filter/inc/ftools.hxx | 8 -
sc/source/filter/inc/xcl97esc.hxx | 2
sc/source/filter/inc/xeroot.hxx | 2
sc/source/filter/inc/xiescher.hxx | 2
sc/source/filter/inc/xiroot.hxx | 2
sc/source/filter/inc/xlroot.hxx | 14 -
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 4
sc/source/filter/xcl97/XclImpChangeTrack.cxx | 2
sc/source/filter/xcl97/xcl97rec.cxx | 2
sc/source/filter/xml/xmlwrap.cxx | 1
sc/source/ui/app/drwtrans.cxx | 2
sc/source/ui/app/transobj.cxx | 2
sc/source/ui/inc/drwtrans.hxx | 2
sc/source/ui/inc/transobj.hxx | 2
sc/source/ui/unoobj/exceldetect.cxx | 2
sc/source/ui/view/gridwin.cxx | 5
sc/source/ui/view/viewfun3.cxx | 3
sc/source/ui/view/viewfun4.cxx | 3
sc/source/ui/view/viewfun5.cxx | 7
sd/inc/sdmod.hxx | 4
sd/source/filter/eppt/eppt.cxx | 20 +-
sd/source/filter/eppt/eppt.hxx | 4
sd/source/filter/eppt/epptso.cxx | 4
sd/source/filter/ppt/pptin.cxx | 8 -
sd/source/filter/ppt/pptin.hxx | 8 -
sd/source/filter/ppt/propread.cxx | 4
sd/source/filter/ppt/propread.hxx | 6
sd/source/filter/sdpptwrp.cxx | 14 -
sd/source/filter/xml/sdxmlwrp.cxx | 2
sd/source/ui/app/sdmod.cxx | 6
sd/source/ui/app/sdxfer.cxx | 2
sd/source/ui/dlg/morphdlg.cxx | 4
sd/source/ui/dlg/vectdlg.cxx | 4
sd/source/ui/inc/View.hxx | 2
sd/source/ui/inc/sdxfer.hxx | 2
sd/source/ui/unoidl/sddetect.cxx | 2
sd/source/ui/view/sdview2.cxx | 2
sd/source/ui/view/sdview3.cxx | 18 +-
sfx2/source/appl/xpackcreator.cxx | 4
sfx2/source/doc/docfile.cxx | 1
sfx2/source/doc/docfilt.cxx | 1
sfx2/source/doc/objstor.cxx | 3
sfx2/source/doc/oleprops.cxx | 4
sot/qa/cppunit/test_sot.cxx | 20 +-
sot/source/sdstor/storage.cxx | 119 +++++-----------
sot/workben/testsot.cxx | 10 -
starmath/inc/document.hxx | 2
starmath/source/document.cxx | 2
starmath/source/eqnolefilehdr.cxx | 4
starmath/source/eqnolefilehdr.hxx | 6
starmath/source/mathtype.cxx | 10 -
starmath/source/mathtype.hxx | 2
starmath/source/smdetect.cxx | 2
starmath/source/unofilter.cxx | 2
svtools/source/misc/embedtransfer.cxx | 2
svtools/source/misc/imagemgr.cxx | 2
svtools/source/misc/stringtransfer.cxx | 3
svtools/source/misc/transfer.cxx | 20 +-
svx/source/gallery2/galmisc.cxx | 4
svx/source/gallery2/galtheme.cxx | 36 ++--
svx/source/inc/fmexch.hxx | 1
svx/source/tbxctrls/colrctrl.cxx | 7
svx/source/xml/xmleohlp.cxx | 1
svx/workben/msview/msview.cxx | 2
sw/inc/ndgrf.hxx | 2
sw/inc/shellio.hxx | 14 -
sw/source/core/swg/swblocks.cxx | 2
sw/source/core/undo/unins.cxx | 2
sw/source/filter/basflt/iodetect.cxx | 4
sw/source/filter/writer/writer.cxx | 6
sw/source/filter/ww8/wrtw8esh.cxx | 6
sw/source/filter/ww8/wrtww8.cxx | 6
sw/source/filter/ww8/wrtww8.hxx | 6
sw/source/filter/ww8/wrtww8gr.cxx | 14 -
sw/source/filter/ww8/ww8glsy.cxx | 4
sw/source/filter/ww8/ww8glsy.hxx | 8 -
sw/source/filter/ww8/ww8par.cxx | 26 +--
sw/source/filter/ww8/ww8par.hxx | 16 +-
sw/source/filter/ww8/ww8par4.cxx | 26 +--
sw/source/filter/ww8/ww8par5.cxx | 6
sw/source/filter/xml/wrtxml.cxx | 2
sw/source/filter/xml/xmlimp.hxx | 4
sw/source/ui/uno/swdetect.cxx | 2
sw/source/uibase/app/docsh.cxx | 4
sw/source/uibase/dochdl/swdtflvr.cxx | 10 -
sw/source/uibase/inc/edtwin.hxx | 1
sw/source/uibase/inc/swdtflvr.hxx | 2
writerperfect/source/common/WPXSvInputStream.cxx | 26 +--
xmlsecurity/source/helper/xsecctl.cxx | 2
144 files changed, 511 insertions(+), 524 deletions(-)
New commits:
commit 9b1b3c9fdd6022fd8547af19cce62ce18ed6e383
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu May 7 10:52:27 2015 +0200
Reduce enum class StorageMode to bool transacted
Change-Id: I04e53d7de9f2f26e9338a82f7d5ae5dab1682712
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index a97fa80..8c31ee2 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/embed/XStorage.hpp>
-#include <o3tl/typed_flags_set.hxx>
#include <sot/object.hxx>
#include <sot/factory.hxx>
#include <tools/stream.hxx>
@@ -33,18 +32,6 @@
#include <sot/storinfo.hxx>
#include <sot/sotdllapi.h>
-enum class StorageMode {
- Default = 0,
- Transacted = 0x04
-};
-
-namespace o3tl {
-
-template<> struct typed_flags<StorageMode>: is_typed_flags<StorageMode, 0x04>
-{};
-
-}
-
class SotStorage;
enum class SotClipboardFormatId : sal_uLong;
@@ -111,7 +98,7 @@ friend class SotStorage;
protected:
virtual ~SotStorage();
- void CreateStorage( bool bUCBStorage, StreamMode, StorageMode );
+ void CreateStorage( bool bUCBStorage, StreamMode, bool transacted );
public:
SotStorage( const OUString &,
StreamMode = STREAM_STD_READWRITE,
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 4d32dc2..faa6fcd 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -337,12 +337,12 @@ SotStorage::SotStorage( const OUString & rName, StreamMode nMode, bool transacte
INIT_SotStorage()
{
m_aName = rName; // Namen merken
- CreateStorage( true, nMode, transacted ? StorageMode::Transacted : StorageMode::Default );
+ CreateStorage( true, nMode, transacted );
if ( IsOLEStorage() )
m_nVersion = SOFFICE_FILEFORMAT_50;
}
-void SotStorage::CreateStorage( bool bForceUCBStorage, StreamMode nMode, StorageMode nStorageMode )
+void SotStorage::CreateStorage( bool bForceUCBStorage, StreamMode nMode, bool transacted )
{
DBG_ASSERT( !m_pStorStm && !m_pOwnStg, "Use only in ctor!" );
if( !m_aName.isEmpty() )
@@ -378,31 +378,31 @@ void SotStorage::CreateStorage( bool bForceUCBStorage, StreamMode nMode, Storage
if ( !(UCBStorage::GetLinkedFile( *m_pStorStm ).isEmpty()) )
{
// detect special unpacked storages
- m_pOwnStg = new UCBStorage( *m_pStorStm, !(nStorageMode & StorageMode::Transacted) );
+ m_pOwnStg = new UCBStorage( *m_pStorStm, !transacted );
m_bDelStm = true;
}
else
{
// UCBStorage always works directly on the UCB content, so discard the stream first
DELETEZ( m_pStorStm );
- m_pOwnStg = new UCBStorage( m_aName, nMode, !(nStorageMode & StorageMode::Transacted) );
+ m_pOwnStg = new UCBStorage( m_aName, nMode, !transacted );
}
}
else
{
// OLEStorage can be opened with a stream
- m_pOwnStg = new Storage( *m_pStorStm, !(nStorageMode & StorageMode::Transacted) );
+ m_pOwnStg = new Storage( *m_pStorStm, !transacted );
m_bDelStm = true;
}
}
else if ( bForceUCBStorage )
{
- m_pOwnStg = new UCBStorage( m_aName, nMode, !(nStorageMode & StorageMode::Transacted) );
+ m_pOwnStg = new UCBStorage( m_aName, nMode, !transacted );
SetError( ERRCODE_IO_NOTSUPPORTED );
}
else
{
- m_pOwnStg = new Storage( m_aName, nMode, !(nStorageMode & StorageMode::Transacted) );
+ m_pOwnStg = new Storage( m_aName, nMode, !transacted );
SetError( ERRCODE_IO_NOTSUPPORTED );
}
}
@@ -410,9 +410,9 @@ void SotStorage::CreateStorage( bool bForceUCBStorage, StreamMode nMode, Storage
{
// temporary storage
if ( bForceUCBStorage )
- m_pOwnStg = new UCBStorage( m_aName, nMode, !(nStorageMode & StorageMode::Transacted) );
+ m_pOwnStg = new UCBStorage( m_aName, nMode, !transacted );
else
- m_pOwnStg = new Storage( m_aName, nMode, !(nStorageMode & StorageMode::Transacted) );
+ m_pOwnStg = new Storage( m_aName, nMode, !transacted );
m_aName = m_pOwnStg->GetName();
}
@@ -425,7 +425,7 @@ SotStorage::SotStorage( bool bUCBStorage, const OUString & rName, StreamMode nMo
INIT_SotStorage()
{
m_aName = rName;
- CreateStorage( bUCBStorage, nMode, StorageMode::Default );
+ CreateStorage( bUCBStorage, nMode, false );
if ( IsOLEStorage() )
m_nVersion = SOFFICE_FILEFORMAT_50;
}
commit 79d853e31826c9e8b7e86bf90e5c1f9b7dd0c43a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu May 7 10:39:08 2015 +0200
StorageMode::DiskspannedMode is effectively unused
Change-Id: I977b0a51a609d3cbc30abd308715f91cad2cfdfa
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 2acbc07..a97fa80 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -35,13 +35,12 @@
enum class StorageMode {
Default = 0,
- Transacted = 0x04,
- DiskspannedMode = 0x80
+ Transacted = 0x04
};
namespace o3tl {
-template<> struct typed_flags<StorageMode>: is_typed_flags<StorageMode, 0x84>
+template<> struct typed_flags<StorageMode>: is_typed_flags<StorageMode, 0x04>
{};
}
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 9dd9e32..4d32dc2 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -383,10 +383,6 @@ void SotStorage::CreateStorage( bool bForceUCBStorage, StreamMode nMode, Storage
}
else
{
- // detect special disk spanned storages
- if ( UCBStorage::IsDiskSpannedFile( m_pStorStm ) )
- nStorageMode |= StorageMode::DiskspannedMode;
-
// UCBStorage always works directly on the UCB content, so discard the stream first
DELETEZ( m_pStorStm );
m_pOwnStg = new UCBStorage( m_aName, nMode, !(nStorageMode & StorageMode::Transacted) );
commit 8a91528a3e03fe6e2923c33327b687ecf57adb0b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu May 7 10:37:27 2015 +0200
StorageMode::CreateUnpacked is never used
Change-Id: I7285c90c82b04e3ebb2db371b675689de9c183d7
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 0116453..2acbc07 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -36,13 +36,12 @@
enum class StorageMode {
Default = 0,
Transacted = 0x04,
- DiskspannedMode = 0x80,
- CreateUnpacked = 0x44
+ DiskspannedMode = 0x80
};
namespace o3tl {
-template<> struct typed_flags<StorageMode>: is_typed_flags<StorageMode, 0xC4>
+template<> struct typed_flags<StorageMode>: is_typed_flags<StorageMode, 0x84>
{};
}
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index caa6c2e..9dd9e32 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -360,74 +360,55 @@ void SotStorage::CreateStorage( bool bForceUCBStorage, StreamMode nMode, Storage
m_aName = aObj.GetMainURL( INetURLObject::NO_DECODE );
}
- // a new unpacked storage should be created
- if ( nStorageMode == StorageMode::CreateUnpacked )
- {
- // don't open stream readwrite, content provider may not support this !
- OUString aURL = UCBStorage::CreateLinkFile( m_aName );
- if ( !aURL.isEmpty() )
- {
- ::ucbhelper::Content aContent( aURL, ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
- m_pOwnStg = new UCBStorage( aContent, aURL, nMode, false );
- }
- else
- {
- m_pOwnStg = new Storage( m_aName, nMode, false );
- SetError( ERRCODE_IO_NOTSUPPORTED );
- }
- }
- else
+ // check the stream
+ m_pStorStm = ::utl::UcbStreamHelper::CreateStream( m_aName, nMode );
+ if ( m_pStorStm && m_pStorStm->GetError() )
+ DELETEZ( m_pStorStm );
+
+ if ( m_pStorStm )
{
- // check the stream
- m_pStorStm = ::utl::UcbStreamHelper::CreateStream( m_aName, nMode );
- if ( m_pStorStm && m_pStorStm->GetError() )
- DELETEZ( m_pStorStm );
+ // try as UCBStorage, next try as OLEStorage
+ bool bIsUCBStorage = UCBStorage::IsStorageFile( m_pStorStm );
+ if ( !bIsUCBStorage && bForceUCBStorage )
+ // if UCBStorage has priority, it should not be used only if it is really an OLEStorage
+ bIsUCBStorage = !Storage::IsStorageFile( m_pStorStm );
- if ( m_pStorStm )
+ if ( bIsUCBStorage )
{
- // try as UCBStorage, next try as OLEStorage
- bool bIsUCBStorage = UCBStorage::IsStorageFile( m_pStorStm );
- if ( !bIsUCBStorage && bForceUCBStorage )
- // if UCBStorage has priority, it should not be used only if it is really an OLEStorage
- bIsUCBStorage = !Storage::IsStorageFile( m_pStorStm );
-
- if ( bIsUCBStorage )
+ if ( !(UCBStorage::GetLinkedFile( *m_pStorStm ).isEmpty()) )
{
- if ( !(UCBStorage::GetLinkedFile( *m_pStorStm ).isEmpty()) )
- {
- // detect special unpacked storages
- m_pOwnStg = new UCBStorage( *m_pStorStm, !(nStorageMode & StorageMode::Transacted) );
- m_bDelStm = true;
- }
- else
- {
- // detect special disk spanned storages
- if ( UCBStorage::IsDiskSpannedFile( m_pStorStm ) )
- nStorageMode |= StorageMode::DiskspannedMode;
-
- // UCBStorage always works directly on the UCB content, so discard the stream first
- DELETEZ( m_pStorStm );
- m_pOwnStg = new UCBStorage( m_aName, nMode, !(nStorageMode & StorageMode::Transacted) );
- }
+ // detect special unpacked storages
+ m_pOwnStg = new UCBStorage( *m_pStorStm, !(nStorageMode & StorageMode::Transacted) );
+ m_bDelStm = true;
}
else
{
- // OLEStorage can be opened with a stream
- m_pOwnStg = new Storage( *m_pStorStm, !(nStorageMode & StorageMode::Transacted) );
- m_bDelStm = true;
+ // detect special disk spanned storages
+ if ( UCBStorage::IsDiskSpannedFile( m_pStorStm ) )
+ nStorageMode |= StorageMode::DiskspannedMode;
+
+ // UCBStorage always works directly on the UCB content, so discard the stream first
+ DELETEZ( m_pStorStm );
+ m_pOwnStg = new UCBStorage( m_aName, nMode, !(nStorageMode & StorageMode::Transacted) );
}
}
- else if ( bForceUCBStorage )
- {
- m_pOwnStg = new UCBStorage( m_aName, nMode, !(nStorageMode & StorageMode::Transacted) );
- SetError( ERRCODE_IO_NOTSUPPORTED );
- }
else
{
- m_pOwnStg = new Storage( m_aName, nMode, !(nStorageMode & StorageMode::Transacted) );
- SetError( ERRCODE_IO_NOTSUPPORTED );
+ // OLEStorage can be opened with a stream
+ m_pOwnStg = new Storage( *m_pStorStm, !(nStorageMode & StorageMode::Transacted) );
+ m_bDelStm = true;
}
}
+ else if ( bForceUCBStorage )
+ {
+ m_pOwnStg = new UCBStorage( m_aName, nMode, !(nStorageMode & StorageMode::Transacted) );
+ SetError( ERRCODE_IO_NOTSUPPORTED );
+ }
+ else
+ {
+ m_pOwnStg = new Storage( m_aName, nMode, !(nStorageMode & StorageMode::Transacted) );
+ SetError( ERRCODE_IO_NOTSUPPORTED );
+ }
}
else
{
commit bd9f5783abe2ed807c3c70a60e5e00b5d117d820
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu May 7 10:35:41 2015 +0200
SotStorage ctor nStorageMode param is effectively only used as bool transacted
Change-Id: I3458ae46c256206e31ad268f47e8b92a30f3738e
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 96ede56..0116453 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -117,7 +117,7 @@ protected:
public:
SotStorage( const OUString &,
StreamMode = STREAM_STD_READWRITE,
- StorageMode = StorageMode::Default );
+ bool transacted = false );
SotStorage( bool bUCBStorage, const OUString &,
StreamMode = STREAM_STD_READWRITE );
SotStorage( BaseStorage * );
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index df6b5d4..caa6c2e 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -333,11 +333,11 @@ SotStorage::SotStorage()
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <ucbhelper/content.hxx>
-SotStorage::SotStorage( const OUString & rName, StreamMode nMode, StorageMode nStorageMode )
+SotStorage::SotStorage( const OUString & rName, StreamMode nMode, bool transacted )
INIT_SotStorage()
{
m_aName = rName; // Namen merken
- CreateStorage( true, nMode, nStorageMode );
+ CreateStorage( true, nMode, transacted ? StorageMode::Transacted : StorageMode::Default );
if ( IsOLEStorage() )
m_nVersion = SOFFICE_FILEFORMAT_50;
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e6b7c66..ebf8095 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4842,7 +4842,7 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom,
if ( !aURL.endsWithIgnoreAsciiCase( ".dot" ) || ( !sCreatedFrom.isEmpty() && sCreatedFrom.equals( aURL ) ) )
continue; // don't try and read the same document as ourselves
- tools::SvRef<SotStorage> rRoot = new SotStorage( aURL, STREAM_STD_READWRITE, StorageMode::Transacted );
+ tools::SvRef<SotStorage> rRoot = new SotStorage( aURL, STREAM_STD_READWRITE, true );
BasicProjImportHelper aBasicImporter( *m_pDocShell );
// Import vba via oox filter
commit 76c50eddb0484d687425040f152460ea61af993c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu May 7 10:01:18 2015 +0200
Remove unused SotStorage ctor nStorageMode param
Change-Id: I6af399ef26d3f3ee97a49592cf97c590c0781eb0
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 1c6e491..96ede56 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -119,8 +119,7 @@ public:
StreamMode = STREAM_STD_READWRITE,
StorageMode = StorageMode::Default );
SotStorage( bool bUCBStorage, const OUString &,
- StreamMode = STREAM_STD_READWRITE,
- StorageMode = StorageMode::Default );
+ StreamMode = STREAM_STD_READWRITE );
SotStorage( BaseStorage * );
SotStorage( SvStream & rStm );
SotStorage( bool bUCBStorage, SvStream & rStm );
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 4c819a7..df6b5d4 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -444,11 +444,11 @@ void SotStorage::CreateStorage( bool bForceUCBStorage, StreamMode nMode, Storage
SignAsRoot( m_pOwnStg->IsRoot() );
}
-SotStorage::SotStorage( bool bUCBStorage, const OUString & rName, StreamMode nMode, StorageMode nStorageMode )
+SotStorage::SotStorage( bool bUCBStorage, const OUString & rName, StreamMode nMode )
INIT_SotStorage()
{
m_aName = rName;
- CreateStorage( bUCBStorage, nMode, nStorageMode );
+ CreateStorage( bUCBStorage, nMode, StorageMode::Default );
if ( IsOLEStorage() )
m_nVersion = SOFFICE_FILEFORMAT_50;
}
commit 66335d3898547410f8ebf9963fb00d24352a56cc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu May 7 08:51:34 2015 +0200
Remove unused SotStorage::OpenSotStream nStorageMode param
Change-Id: Ieda14d984f1614056c701a50ce637ea6fe9620f3
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 23ae8d0..1c6e491 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -184,8 +184,7 @@ public:
// create stream with connection to Storage,
// more or less a Parent-Child relationship
SotStorageStream * OpenSotStream( const OUString & rEleName,
- StreamMode = STREAM_STD_READWRITE,
- StorageMode = StorageMode::Default );
+ StreamMode = STREAM_STD_READWRITE );
SotStorage * OpenSotStorage( const OUString & rEleName,
StreamMode = STREAM_STD_READWRITE,
bool transacted = true );
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 8a54023..4c819a7 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -681,10 +681,8 @@ bool SotStorage::Commit()
}
SotStorageStream * SotStorage::OpenSotStream( const OUString & rEleName,
- StreamMode nMode,
- StorageMode nStorageMode )
+ StreamMode nMode )
{
- DBG_ASSERT( nStorageMode == StorageMode::Default, "StorageModes ignored" );
SotStorageStream * pStm = NULL;
DBG_ASSERT( Owner(), "must be owner" );
if( m_pOwnStg )
@@ -693,8 +691,7 @@ SotStorageStream * SotStorage::OpenSotStream( const OUString & rEleName,
// egal was kommt, nur exclusiv gestattet
nMode |= StreamMode::SHARE_DENYALL;
ErrCode nE = m_pOwnStg->GetError();
- BaseStorageStream * p = m_pOwnStg->OpenStream( rEleName, nMode,
- !(nStorageMode & StorageMode::Transacted) );
+ BaseStorageStream * p = m_pOwnStg->OpenStream( rEleName, nMode, true );
pStm = new SotStorageStream( p );
if( !nE )
commit 9e90401a2168e7db8a3f967f0d5011d2f52039eb
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu May 7 08:40:53 2015 +0200
Remove unused SotStorageStream ctor nStorageMode param
Change-Id: I5f114f4ca92d991d17ad871d11a78a5306191f9c
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 45593de..23ae8d0 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -67,8 +67,7 @@ protected:
virtual ~SotStorageStream();
public:
SotStorageStream( const OUString &,
- StreamMode = STREAM_STD_READWRITE,
- StorageMode = StorageMode::Default );
+ StreamMode = STREAM_STD_READWRITE );
SotStorageStream( BaseStorageStream *pStm );
SotStorageStream();
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 7f204e6..8a54023 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -75,12 +75,7 @@ SvLockBytesRef MakeLockBytes_Impl( const OUString & rName, StreamMode nMode )
return xLB;
}
-SotStorageStream::SotStorageStream( const OUString & rName, StreamMode nMode,
- StorageMode
- #ifdef DBG_UTIL
- nStorageMode
- #endif
- )
+SotStorageStream::SotStorageStream( const OUString & rName, StreamMode nMode )
: SvStream( MakeLockBytes_Impl( rName, nMode ) )
, pOwnStm( NULL )
{
@@ -88,8 +83,6 @@ SotStorageStream::SotStorageStream( const OUString & rName, StreamMode nMode,
bIsWritable = true;
else
bIsWritable = false;
-
- DBG_ASSERT( nStorageMode == StorageMode::Default, "StorageModes ignored" );
}
SotStorageStream::SotStorageStream( BaseStorageStream * pStm )
commit 7df89ec7a2ccfc9b448ea33d0a9d4412062dee67
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed May 6 18:08:16 2015 +0200
Remove unnecessary includes of sot/storage.hxx from include/
Change-Id: I242cd126814bbebdb99ea38d9e66513189c313d9
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 23207dc..2d8d794 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -41,6 +41,7 @@
#include <sfx2/docfile.hxx>
#include <sfx2/printer.hxx>
#include <sfx2/request.hxx>
+#include <sot/exchange.hxx>
#include <svl/aeitem.hxx>
#include <svl/srchitem.hxx>
#include <svl/visitem.hxx>
diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx
index ff85446..c6f4702 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -19,6 +19,8 @@
#include "ChartTransferable.hxx"
+#include <sot/exchange.hxx>
+#include <sot/storage.hxx>
#include <unotools/streamwrap.hxx>
#include <vcl/graph.hxx>
#include <svl/itempool.hxx>
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index c85da48..97b3181 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -54,6 +54,7 @@
#include <editeng/frmdiritem.hxx>
#include <rtl/uuid.h>
+#include <tools/globname.hxx>
#include <comphelper/scopeguard.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 17b4592..c2dab41 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -20,6 +20,7 @@
#include "sbagrid.hrc"
#include "uiservices.hxx"
+#include <sot/exchange.hxx>
#include <svx/svxids.hrc>
#include <svx/numinf.hxx>
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 7e5f1d0..ca975a3 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -59,6 +59,7 @@
#include <comphelper/processfactory.hxx>
+#include <sot/exchange.hxx>
#include <sot/formats.hxx>
#include <unicode/ubidi.h>
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index dc3340e..0cb1543 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -36,6 +36,7 @@
#include <sfx2/docfile.hxx>
#include <sfx2/fcontnr.hxx>
#include <sot/formats.hxx>
+#include <sot/storage.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/streamwrap.hxx>
#include <comphelper/storagehelper.hxx>
diff --git a/filter/source/msfilter/svxmsbas2.cxx b/filter/source/msfilter/svxmsbas2.cxx
index 9e7740a..42f3436 100644
--- a/filter/source/msfilter/svxmsbas2.cxx
+++ b/filter/source/msfilter/svxmsbas2.cxx
@@ -21,6 +21,7 @@
#include <basic/basmgr.hxx>
#include <sfx2/objsh.hxx>
+#include <sot/storage.hxx>
#include <svx/svxerr.hxx>
#include <filter/msfilter/svxmsbas.hxx>
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 91c5157..d4438d4 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/embed/XStorage.hpp>
#include <o3tl/sorted_vector.hxx>
-#include <sot/storage.hxx>
+#include <tools/ref.hxx>
#include <tools/rtti.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <tools/time.hxx>
@@ -36,6 +36,7 @@
class CharClass;
class SfxPoolItem;
+class SotStorage;
class SvxAutoCorrect;
class SfxObjectShell;
namespace vcl { class Window; }
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 34834ad..fc54ade 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -38,8 +38,6 @@
#include <tools/color.hxx>
#include <tools/gen.hxx>
-#include <sot/storage.hxx>
-
#include <vcl/graph.hxx>
#include <svx/msdffdef.hxx>
@@ -49,6 +47,7 @@
#include <filter/msfilter/msfilterdllapi.h>
class Graphic;
+class SotStorage;
class SvStream;
class SdrObject;
class SdrOle2Obj;
@@ -68,6 +67,10 @@ class SdrObject;
class SdrTextObj;
struct DffObjData;
+namespace com { namespace sun { namespace star { namespace embed {
+ class XStorage;
+} } } }
+
class MSFILTER_DLLPUBLIC DffPropertyReader : public DffPropSet
{
const SvxMSDffManager& rManager;
diff --git a/include/filter/msfilter/msocximex.hxx b/include/filter/msfilter/msocximex.hxx
index caa91f7..f0dd851 100644
--- a/include/filter/msfilter/msocximex.hxx
+++ b/include/filter/msfilter/msocximex.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_FILTER_MSFILTER_MSOCXIMEX_HXX
#define INCLUDED_FILTER_MSFILTER_MSOCXIMEX_HXX
-#include <sot/storage.hxx>
-
#include <filter/msfilter/msfilterdllapi.h>
namespace com{namespace sun{namespace star{
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 227f97c..14ddff3 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -9,7 +9,6 @@
#ifndef INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX
#define INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX
#include <filter/msfilter/msfilterdllapi.h>
-#include <sot/storage.hxx>
#include <ostream>
#include <memory>
#include <vector>
@@ -19,6 +18,7 @@
#include <com/sun/star/ui/ImageType.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <tools/stream.hxx>
#include <vcl/bitmap.hxx>
#include <cppuhelper/implbase1.hxx>
diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx
index d379750..312e18c 100644
--- a/include/filter/msfilter/svxmsbas.hxx
+++ b/include/filter/msfilter/svxmsbas.hxx
@@ -23,11 +23,11 @@
#include <tools/solar.h>
#include <filter/msfilter/msfilterdllapi.h>
-#include <sot/storage.hxx>
#include <map>
#include <unordered_map>
class SfxObjectShell;
+class SotStorage;
/* Construct with the root storage of the MS document, with bImportCode
* set the visual basic code will be imported into the stardocument when Import
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index 17e76e2..f82cd2b 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_OOX_OLE_OLEHELPER_HXX
#include <rtl/ustring.hxx>
+#include <tools/ref.hxx>
#include <oox/helper/binarystreambase.hxx>
#include <oox/helper/storagebase.hxx>
#include <oox/helper/graphichelper.hxx>
@@ -37,8 +38,9 @@
#include <com/sun/star/container/XIndexContainer.hpp>
#include <filter/msfilter/msocximex.hxx>
#include <oox/dllapi.h>
-#include <sot/storage.hxx>
+class SotStorage;
+class SotStorageStream;
class SvGlobalName;
namespace oox {
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index b9d20fe..ce8ab30 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -23,6 +23,7 @@
#include <sfx2/dllapi.h>
#include <sfx2/signaturestate.hxx>
#include <sal/types.h>
+#include <tools/errcode.hxx>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.hxx>
@@ -40,7 +41,8 @@
#include <vcl/vclptr.hxx>
#include <svl/poolitem.hxx>
#include <vcl/bitmap.hxx>
-#include <sot/storage.hxx>
+#include <sot/formats.hxx>
+#include <sot/object.hxx>
#include <rsc/rscsfx.hxx>
#include <sfx2/XmlIdRegistry.hxx>
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index c292b13..c58e6b3 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -24,8 +24,8 @@
#include <tools/globname.hxx>
#include <tools/gen.hxx>
#include <tools/link.hxx>
+#include <tools/ref.hxx>
#include <sot/formats.hxx>
-#include <sot/storage.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase4.hxx>
#include <com/sun/star/frame/XTerminateListener.hpp>
@@ -49,6 +49,8 @@ class ImageMap;
class INetBookmark;
class INetImage;
class FileList;
+class SotStorageStream;
+struct DataFlavorExVector;
namespace vcl { class Window; }
// Drag&Drop defines
diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index fccf29d..ebe4e78 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -20,6 +20,9 @@
#ifndef INCLUDED_SVX_DBAEXCHANGE_HXX
#define INCLUDED_SVX_DBAEXCHANGE_HXX
+#include <sal/config.h>
+
+#include <o3tl/typed_flags_set.hxx>
#include <svtools/transfer.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index c0604ea..729bdd2 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_GALMISC_HXX
#define INCLUDED_SVX_GALMISC_HXX
-#include <sot/storage.hxx>
+#include <sot/formats.hxx>
#include <tools/urlobj.hxx>
#include <svtools/imap.hxx>
#include <svl/hint.hxx>
@@ -33,6 +33,7 @@
#include <tools/time.hxx>
class GalleryTheme;
+class SotStorageStream;
struct ExchangeData
{
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 21ec91f..371d4a0 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -28,14 +28,12 @@
#include <svl/SfxBroadcaster.hxx>
#include <svl/lstner.hxx>
#include <svtools/transfer.hxx>
-#include <sot/storage.hxx>
#include <svx/svdmodel.hxx>
#include <svx/galmisc.hxx>
#include <vector>
-
-// - GalleryObject -
-
+class SotStorage;
+class SotStorageStream;
// - SgaObjKind -
@@ -182,7 +180,7 @@ public:
SAL_DLLPRIVATE void AbortActualize() { bAbortActualize = true; }
SAL_DLLPRIVATE Gallery* GetParent() const { return pParent; }
- SAL_DLLPRIVATE tools::SvRef<SotStorage> GetSvDrawStorage() const { return aSvDrawStorageRef; }
+ SAL_DLLPRIVATE tools::SvRef<SotStorage> GetSvDrawStorage() const;
public:
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 2248d4b..4d56a44 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -24,7 +24,6 @@
#include <cppuhelper/weakref.hxx>
#include <editeng/forbiddencharacterstable.hxx>
#include <rtl/ustring.hxx>
-#include <sot/storage.hxx>
#include <tools/link.hxx>
#include <tools/weakbase.hxx>
#include <vcl/mapmod.hxx>
@@ -74,7 +73,6 @@ class XHatchList;
class XLineEndList;
class SvxForbiddenCharactersTable;
class SvNumberFormatter;
-class SotStorage;
class SdrOutlinerCache;
class SdrUndoFactory;
class ImageMap;
diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx
index 61ed78d..f5680ed 100644
--- a/include/svx/xmleohlp.hxx
+++ b/include/svx/xmleohlp.hxx
@@ -22,7 +22,6 @@
#include <cppuhelper/compbase2.hxx>
#include <osl/mutex.hxx>
-#include <sot/storage.hxx>
#include <map>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 4344873..fa54529 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -20,6 +20,7 @@
#include "oox/ole/olehelper.hxx"
#include <rtl/ustrbuf.hxx>
+#include <sot/storage.hxx>
#include <osl/diagnose.h>
#include "oox/helper/binaryinputstream.hxx"
#include "oox/helper/graphichelper.hxx"
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 52006da..0623eb2 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -18,6 +18,7 @@
*/
#include "GroupsSorting.hxx"
#include <connectivity/dbtools.hxx>
+#include <sot/exchange.hxx>
#include <svtools/editbrowsebox.hxx>
#include <svtools/imgdef.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx
index f85e21f..5923a5a 100644
--- a/reportdesign/source/ui/report/dlgedclip.cxx
+++ b/reportdesign/source/ui/report/dlgedclip.cxx
@@ -19,6 +19,7 @@
#include "dlgedclip.hxx"
#include <comphelper/processfactory.hxx>
#include <osl/diagnose.h>
+#include <sot/exchange.hxx>
#include <com/sun/star/datatransfer/XMimeContentType.hpp>
#include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 23fa1fc..9cb0a71 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -20,6 +20,7 @@
#include <rsc/rscsfx.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/objsh.hxx>
+#include <sot/storage.hxx>
#include <osl/diagnose.h>
#include <comphelper/processfactory.hxx>
#include <unotools/streamwrap.hxx>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 1a895e1..2e4860b 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -21,6 +21,7 @@
#include <memory>
#include <editeng/adjustitem.hxx>
+#include <sot/storage.hxx>
#include <svx/algitem.hxx>
#include <editeng/editview.hxx>
#include <editeng/editstat.hxx>
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index d44bda3..4091230 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -29,6 +29,7 @@
#include <svl/urlbmk.hxx>
#include <comphelper/classids.hxx>
#include <sot/formats.hxx>
+#include <sot/storage.hxx>
#include <vcl/graph.hxx>
#include <vcl/virdev.hxx>
#include <vcl/msgbox.hxx>
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index e15e201..30320b9 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -24,6 +24,7 @@
#include <editeng/editstat.hxx>
#include <editeng/editview.hxx>
#include <editeng/flditem.hxx>
+#include <sot/storage.hxx>
#include <svx/hlnkitem.hxx>
#include <editeng/langitem.hxx>
#include <svx/svxerr.hxx>
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 3172c1d..046f01e 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -37,6 +37,7 @@
#include <comphelper/classids.hxx>
#include <sot/formats.hxx>
#include <sot/filelist.hxx>
+#include <sot/storage.hxx>
#include <unotools/pathoptions.hxx>
#include <svl/ptitem.hxx>
#include <svl/stritem.hxx>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index c39452f..d89235a 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -101,6 +101,7 @@
#include <ucbhelper/content.hxx>
#include <ucbhelper/interactionrequest.hxx>
#include <sot/stg.hxx>
+#include <sot/storage.hxx>
#include <unotools/saveopt.hxx>
#include <svl/documentlockfile.hxx>
#include <com/sun/star/document/DocumentRevisionListPersistence.hpp>
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index ad59751..7defffe 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -23,6 +23,7 @@
#include <string>
#include <sot/exchange.hxx>
+#include <sot/storage.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 319a91e..d431a1e 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -87,6 +87,7 @@
#include <unotools/tempfile.hxx>
#include <unotools/docinfohelper.hxx>
#include <ucbhelper/content.hxx>
+#include <sot/storage.hxx>
#include <sot/storinfo.hxx>
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index b571816..2bff133 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -24,7 +24,7 @@
#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/embed/Aspects.hpp>
-
+#include <sot/exchange.hxx>
#include <svtools/embedtransfer.hxx>
#include <tools/mapunit.hxx>
#include <vcl/outdev.hxx>
diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx
index da73961..c412281 100644
--- a/svtools/source/misc/stringtransfer.cxx
+++ b/svtools/source/misc/stringtransfer.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <sot/exchange.hxx>
#include <svtools/stringtransfer.hxx>
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 46dfae0..cf2a75f 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -17,7 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+#include <sot/storage.hxx>
#include <unotools/streamwrap.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 76030e7..047b4cc 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1533,6 +1533,12 @@ bool GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromReso
bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
bool GalleryTheme::IsModified() const { return pThm->IsModified(); }
+
+tools::SvRef<SotStorage> GalleryTheme::GetSvDrawStorage() const
+{
+ return aSvDrawStorageRef;
+}
+
const OUString& GalleryTheme::GetName() const { return pThm->GetThemeName(); }
void GalleryTheme::InsertAllThemes( ListBox& rListBox )
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index a4289d9..814c4fb 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -23,6 +23,7 @@
#include <set>
+#include <sot/exchange.hxx>
#include <svtools/transfer.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 058d81b..9302b7a 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -17,7 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+#include <sot/exchange.hxx>
+#include <sot/storage.hxx>
#include <svx/dialogs.hrc>
#include <sfx2/viewsh.hxx>
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 0713255..3d69924 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/embed/EmbedStates.hpp>
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <sot/storage.hxx>
#include <tools/debug.hxx>
#include <unotools/streamwrap.hxx>
#include <unotools/tempfile.hxx>
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 54e7333..c440054 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -21,6 +21,7 @@
#include <FrameControlsManager.hxx>
+#include <sot/exchange.hxx>
#include <svx/svdobj.hxx>
#include <tools/link.hxx>
#include <vcl/timer.hxx>
commit 0241519f323b2b29db747467b8c3d9590c33f0df
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed May 6 16:38:01 2015 +0200
Unwind SotStorageStreamRef typedef
Change-Id: If7652a7c0251b741660365848a717c06954ca419
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index bd8c61c..83e6f50 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -546,7 +546,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const OUString& rBaseURL, Star
// #91626 Save all stream data to save it unmodified if basic isn't modified
// in an 6.0+ office. So also the old basic dialogs can be saved.
- SotStorageStreamRef xManagerStream = rStorage.OpenSotStream( OUString(szManagerStream), eStreamReadMode );
+ tools::SvRef<SotStorageStream> xManagerStream = rStorage.OpenSotStream( OUString(szManagerStream), eStreamReadMode );
mpImpl->mpManagerStream = new SvMemoryStream();
static_cast<SvStream*>(&xManagerStream)->ReadStream( *mpImpl->mpManagerStream );
@@ -558,7 +558,7 @@ BasicManager::BasicManager( SotStorage& rStorage, const OUString& rBaseURL, Star
for( sal_uInt16 nL = 0; nL < nLibs; nL++ )
{
BasicLibInfo& rInfo = mpImpl->aLibs[nL];
- SotStorageStreamRef xBasicStream = xBasicStorage->OpenSotStream( rInfo.GetLibName(), eStreamReadMode );
+ tools::SvRef<SotStorageStream> xBasicStream = xBasicStorage->OpenSotStream( rInfo.GetLibName(), eStreamReadMode );
mpImpl->mppLibStreams[nL] = new SvMemoryStream();
static_cast<SvStream*>(&xBasicStream)->ReadStream( *( mpImpl->mppLibStreams[nL] ) );
}
@@ -733,7 +733,7 @@ void BasicManager::ImpCreateStdLib( StarBASIC* pParentFromStdLib )
void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBaseURL, bool bLoadLibs )
{
- SotStorageStreamRef xManagerStream = rStorage.OpenSotStream( OUString(szManagerStream), eStreamReadMode );
+ tools::SvRef<SotStorageStream> xManagerStream = rStorage.OpenSotStream( OUString(szManagerStream), eStreamReadMode );
OUString aStorName( rStorage.GetName() );
// #i13114 removed, DBG_ASSERT( aStorName.Len(), "No Storage Name!" );
@@ -825,7 +825,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBase
void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
{
- SotStorageStreamRef xManagerStream = rStorage.OpenSotStream( OUString(szOldManagerStream), eStreamReadMode );
+ tools::SvRef<SotStorageStream> xManagerStream = rStorage.OpenSotStream( OUString(szOldManagerStream), eStreamReadMode );
OUString aStorName( rStorage.GetName() );
DBG_ASSERT( aStorName.getLength(), "No Storage Name!" );
@@ -993,7 +993,7 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora
else
{
// In the Basic-Storage every lib is in a Stream...
- SotStorageStreamRef xBasicStream = xBasicStorage->OpenSotStream( pLibInfo->GetLibName(), eStreamReadMode );
+ tools::SvRef<SotStorageStream> xBasicStream = xBasicStorage->OpenSotStream( pLibInfo->GetLibName(), eStreamReadMode );
if ( !xBasicStream.Is() || xBasicStream->GetError() )
{
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD , pLibInfo->GetLibName(), ERRCODE_BUTTON_OK );
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 259cb38..839fd5d 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -262,7 +262,7 @@ void ChartController::executeDispatch_Paste()
{
if ( aDataHelper.HasFormat( SotClipboardFormatId::DRAWING ) )
{
- SotStorageStreamRef xStm;
+ tools::SvRef<SotStorageStream> xStm;
if ( aDataHelper.GetSotStorageStream( SotClipboardFormatId::DRAWING, xStm ) )
{
xStm->Seek( 0 );
@@ -277,7 +277,7 @@ void ChartController::executeDispatch_Paste()
else if ( aDataHelper.HasFormat( SotClipboardFormatId::SVXB ) )
{
// graphic exchange format (graphic manager bitmap format?)
- SotStorageStreamRef xStm;
+ tools::SvRef<SotStorageStream> xStm;
if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::SVXB, xStm ))
ReadGraphic( *xStm, aGraphic );
}
diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx
index 464345e..ff85446 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -99,7 +99,7 @@ bool ChartTransferable::GetData( const css::datatransfer::DataFlavor& rFlavor, c
return bResult;
}
-bool ChartTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId,
+bool ChartTransferable::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId,
const datatransfer::DataFlavor& /* rFlavor */ )
{
// called from SetObject, put data into stream
diff --git a/chart2/source/controller/main/ChartTransferable.hxx b/chart2/source/controller/main/ChartTransferable.hxx
index 5ebf319..2275fec 100644
--- a/chart2/source/controller/main/ChartTransferable.hxx
+++ b/chart2/source/controller/main/ChartTransferable.hxx
@@ -44,7 +44,7 @@ protected:
// implementation of TransferableHelper methods
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,
+ virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId,
const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
private:
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index d926109..f7d6117 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -134,7 +134,7 @@ namespace dbaui
osl_atomic_decrement( &m_refCount );
}
- bool ODataClipboard::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ )
+ bool ODataClipboard::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ )
{
if (nUserObjectId == SotClipboardFormatId::RTF || nUserObjectId == SotClipboardFormatId::HTML )
{
diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx
index d2b1df6..ceba0c8 100644
--- a/dbaccess/source/ui/inc/TableCopyHelper.hxx
+++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx
@@ -76,7 +76,7 @@ namespace dbaui
OUString sDefaultTableName;
OUString aUrl;
- SotStorageStreamRef aHtmlRtfStorage;
+ tools::SvRef<SotStorageStream> aHtmlRtfStorage;
ElementType nType;
SvTreeListEntry* pDroppedAt;
sal_Int8 nAction;
diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx
index 84cc984..7af8a86 100644
--- a/dbaccess/source/ui/inc/TableRowExchange.hxx
+++ b/dbaccess/source/ui/inc/TableRowExchange.hxx
@@ -35,7 +35,7 @@ namespace dbaui
protected:
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 ObjectReleased() SAL_OVERRIDE;
};
}
diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx
index 8e856b9..71eb2a2 100644
--- a/dbaccess/source/ui/inc/dbexchange.hxx
+++ b/dbaccess/source/ui/inc/dbexchange.hxx
@@ -79,7 +79,7 @@ namespace dbaui
virtual void AddSupportedFormats() SAL_OVERRIDE;
virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
virtual void ObjectReleased() 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;
};
}
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index dab0e67..0541b88 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -286,7 +286,7 @@ bool OTableCopyHelper::copyTagTable(const TransferableDataHelper& _aDroppedData
// now we need to copy the stream
::utl::TempFile aTmp;
_rAsyncDrop.aUrl = aTmp.GetURL();
- SotStorageStreamRef aNew = new SotStorageStream( aTmp.GetFileName() );
+ tools::SvRef<SotStorageStream> aNew = new SotStorageStream( aTmp.GetFileName() );
_rAsyncDrop.aHtmlRtfStorage->Seek(STREAM_SEEK_TO_BEGIN);
_rAsyncDrop.aHtmlRtfStorage->CopyTo( aNew );
aNew->Commit();
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index c47fc25..4fe2c01 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -777,7 +777,7 @@ void OTableEditorCtrl::InsertRows( long nRow )
TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent()));
if(aTransferData.HasFormat(SotClipboardFormatId::SBA_TABED))
{
- SotStorageStreamRef aStreamRef;
+ tools::SvRef<SotStorageStream> aStreamRef;
bool bOk = aTransferData.GetSotStorageStream(SotClipboardFormatId::SBA_TABED,aStreamRef);
if (bOk && aStreamRef.Is())
{
diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
index b1ce44b..25ed589 100644
--- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
@@ -30,7 +30,7 @@ namespace dbaui
: m_vTableRow(_rvTableRow)
{
}
- bool OTableRowExchange::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ )
+ bool OTableRowExchange::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ )
{
if(nUserObjectId == SotClipboardFormatId::SBA_TABED)
{
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index d1af5f0..48d12f9 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2007,7 +2007,7 @@ void SvxAutoCorrectLanguageLists::LoadXMLExceptList_Imp(
if( rStg.Is() && rStg->IsStream( sStrmName ) )
{
- SotStorageStreamRef xStrm = rStg->OpenSotStream( sTmp,
+ tools::SvRef<SotStorageStream> xStrm = rStg->OpenSotStream( sTmp,
( StreamMode::READ | StreamMode::SHARE_DENYWRITE | StreamMode::NOCREATE ) );
if( SVSTREAM_OK != xStrm->GetError())
{
@@ -2081,7 +2081,7 @@ void SvxAutoCorrectLanguageLists::SaveExceptList_Imp(
}
else
{
- SotStorageStreamRef xStrm = rStg->OpenSotStream( sStrmName,
+ tools::SvRef<SotStorageStream> xStrm = rStg->OpenSotStream( sStrmName,
( StreamMode::READ | StreamMode::WRITE | StreamMode::SHARE_DENYWRITE ) );
if( xStrm.Is() )
{
@@ -2452,7 +2452,7 @@ bool SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SotStorage& rStg )
bool bRet = true, bRemove = !pAutocorr_List || pAutocorr_List->empty();
if( !bRemove )
{
- SotStorageStreamRef refList = rStg.OpenSotStream( sStrmName,
+ tools::SvRef<SotStorageStream> refList = rStg.OpenSotStream( sStrmName,
( StreamMode::READ | StreamMode::WRITE | StreamMode::SHARE_DENYWRITE ) );
if( refList.Is() )
{
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index f205272..506c449 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6533,7 +6533,7 @@ SdrObject* SvxMSDffManager::ImportOLE( long nOLEId,
bool SvxMSDffManager::MakeContentStream( SotStorage * pStor, const GDIMetaFile & rMtf )
{
- SotStorageStreamRef xStm = pStor->OpenSotStream(OUString(SVEXT_PERSIST_STREAM));
+ tools::SvRef<SotStorageStream> xStm = pStor->OpenSotStream(OUString(SVEXT_PERSIST_STREAM));
xStm->SetVersion( pStor->GetVersion() );
xStm->SetBufferSize( 8192 );
@@ -6674,7 +6674,7 @@ bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen,
const GDIMetaFile * pMtf, const tools::SvRef<SotStorage>& rDest )
{
bool bMtfRead = false;
- SotStorageStreamRef xOle10Stm = rDest->OpenSotStream( OUString("\1Ole10Native"),
+ tools::SvRef<SotStorageStream> xOle10Stm = rDest->OpenSotStream( OUString("\1Ole10Native"),
StreamMode::WRITE| StreamMode::SHARE_DENYALL );
if( xOle10Stm->GetError() )
return false;
@@ -6722,7 +6722,7 @@ bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen,
// write to ole10 stream
xOle10Stm->WriteUInt32( nDataLen );
xOle10Stm->Write( pData.get(), nDataLen );
- xOle10Stm = SotStorageStreamRef();
+ xOle10Stm = tools::SvRef<SotStorageStream>();
// set the compobj stream
const ClsIDs* pIds;
@@ -6915,7 +6915,7 @@ com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > SvxMS
if ( pName )
{
// TODO/LATER: perhaps we need to retrieve VisArea and Metafile from the storage also
- SotStorageStreamRef xStr = rSrcStg.OpenSotStream( OUString( "package_stream" ), STREAM_STD_READ );
+ tools::SvRef<SotStorageStream> xStr = rSrcStg.OpenSotStream( OUString( "package_stream" ), STREAM_STD_READ );
xStr->ReadStream( *xMemStream );
}
else
@@ -7060,7 +7060,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
{
{
sal_uInt8 aTestA[10]; // exist the \1CompObj-Stream ?
- SotStorageStreamRef xSrcTst = xObjStg->OpenSotStream( OUString( "\1CompObj" ) );
+ tools::SvRef<SotStorageStream> xSrcTst = xObjStg->OpenSotStream( OUString( "\1CompObj" ) );
bValidStorage = xSrcTst.Is() && sizeof( aTestA ) ==
xSrcTst->Read( aTestA, sizeof( aTestA ) );
if( !bValidStorage )
@@ -7081,7 +7081,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
// is a kind of embedded objects in Word documents
// TODO/LATER: should the caller be notified if the aspect changes in future?
- SotStorageStreamRef xObjInfoSrc = xObjStg->OpenSotStream(
+ tools::SvRef<SotStorageStream> xObjInfoSrc = xObjStg->OpenSotStream(
OUString( "\3ObjInfo" ), STREAM_STD_READ | StreamMode::NOCREATE );
if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() )
{
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 61fccc2..dc3340e 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -224,7 +224,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotSt
rDestStg.SetClass( aEmbName,
SotClipboardFormatId::EMBEDDED_OBJ_OLE,
GetStorageType( aEmbName ) );
- SotStorageStreamRef xExtStm = rDestStg.OpenSotStream(
+ tools::SvRef<SotStorageStream> xExtStm = rDestStg.OpenSotStream(
OUString( "properties_stream" ),
STREAM_STD_READWRITE);
@@ -279,7 +279,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotSt
if ( bExtentSuccess )
{
- SotStorageStreamRef xEmbStm = rDestStg.OpenSotStream(
+ tools::SvRef<SotStorageStream> xEmbStm = rDestStg.OpenSotStream(
OUString( "package_stream" ),
STREAM_STD_READWRITE);
if( !xEmbStm->GetError() )
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index ea1ba04..484ce10 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1840,7 +1840,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId,
{
xObjStor->SetClass( SvGlobalName( pObjStor->GetClassId() ), pObjStor->GetFormat(), pObjStor->GetUserName() );
}
- SotStorageStreamRef xSrcTst = xObjStor->OpenSotStream( "\1Ole" );
+ tools::SvRef<SotStorageStream> xSrcTst = xObjStor->OpenSotStream( "\1Ole" );
if ( xSrcTst.Is() )
{
sal_uInt8 aTestA[ 10 ];
@@ -2031,7 +2031,7 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt
tools::SvRef<SotStorage> xSubVBA = xVBA->OpenSotStorage( "_MS_VBA_Overhead" );
if ( xSubVBA.Is() && ( xSubVBA->GetError() == SVSTREAM_OK ) )
{
- SotStorageStreamRef xOriginal = xSubVBA->OpenSotStream( "_MS_VBA_Overhead2" );
+ tools::SvRef<SotStorageStream> xOriginal = xSubVBA->OpenSotStream( "_MS_VBA_Overhead2" );
if ( xOriginal.Is() && ( xOriginal->GetError() == SVSTREAM_OK ) )
{
if ( nPersistPtr && ( nPersistPtr < nPersistPtrAnz ) )
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index ae18908..17e76e2 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 90a77e8..45593de 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 0c86721..c292b13 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 c833b08..c0604ea 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 e956ea0..21ec91f 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 );
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 08b126d..4344873 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -473,7 +473,7 @@ MSConvertOCXControls::importControlFromStream( ::oox::BinaryInputStream& rInStrm
}
bool
-MSConvertOCXControls::ReadOCXCtlsStream( SotStorageStreamRef& rSrc1, Reference< XFormComponent > & rxFormComp,
+MSConvertOCXControls::ReadOCXCtlsStream( tools::SvRef<SotStorageStream>& rSrc1, Reference< XFormComponent > & rxFormComp,
sal_Int32 nPos,
sal_Int32 nStreamSize)
{
@@ -527,13 +527,13 @@ bool MSConvertOCXControls::ReadOCXStorage( tools::SvRef<SotStorage>& xOleStg,
{
if ( xOleStg.Is() )
{
- SotStorageStreamRef pNameStream = xOleStg->OpenSotStream( OUString("\3OCXNAME"));
+ tools::SvRef<SotStorageStream> pNameStream = xOleStg->OpenSotStream( OUString("\3OCXNAME"));
BinaryXInputStream aNameStream( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper( *pNameStream ) ), true );
- SotStorageStreamRef pContents = xOleStg->OpenSotStream( OUString("contents"));
+ tools::SvRef<SotStorageStream> pContents = xOleStg->OpenSotStream( OUString("contents"));
BinaryXInputStream aInStrm( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper( *pContents ) ), true );
- SotStorageStreamRef pClsStrm = xOleStg->OpenSotStream(OUString("\1CompObj"));
+ tools::SvRef<SotStorageStream> pClsStrm = xOleStg->OpenSotStream(OUString("\1CompObj"));
BinaryXInputStream aClsStrm( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper(*pClsStrm ) ), true );
aClsStrm.skip(12);
@@ -588,17 +588,17 @@ bool MSConvertOCXControls::WriteOCXStream( const Reference< XModel >& rxModel, t
rName = exportHelper.getTypeName();
xOleStg->SetClass( aName, SotClipboardFormatId::EMBEDDED_OBJ_OLE, sFullName);
{
- SotStorageStreamRef pNameStream = xOleStg->OpenSotStream(OUString("\3OCXNAME"));
+ tools::SvRef<SotStorageStream> pNameStream = xOleStg->OpenSotStream(OUString("\3OCXNAME"));
Reference< XOutputStream > xOut = new utl::OSeekableOutputStreamWrapper( *pNameStream );
exportHelper.exportName( xOut );
}
{
- SotStorageStreamRef pObjStream = xOleStg->OpenSotStream(OUString("\1CompObj"));
+ tools::SvRef<SotStorageStream> pObjStream = xOleStg->OpenSotStream(OUString("\1CompObj"));
Reference< XOutputStream > xOut = new utl::OSeekableOutputStreamWrapper( *pObjStream );
exportHelper.exportCompObj( xOut );
}
{
- SotStorageStreamRef pContents = xOleStg->OpenSotStream(OUString("contents"));
+ tools::SvRef<SotStorageStream> pContents = xOleStg->OpenSotStream(OUString("contents"));
Reference< XOutputStream > xOut = new utl::OSeekableOutputStreamWrapper( *pContents );
exportHelper.exportControl( xOut, rSize );
}
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 09d6d50..6230384 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -67,7 +67,7 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument
// try to open an OLE storage
tools::SvRef<SotStorage> xRootStrg;
- SotStorageStreamRef xStrgStrm;
+ tools::SvRef<SotStorageStream> xStrgStrm;
if( SotStorage::IsStorageFile( pMedStrm ) )
{
xRootStrg = new SotStorage( pMedStrm, false );
@@ -79,11 +79,11 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument
if( xRootStrg.Is() )
{
// try to open the "Book" stream
- SotStorageStreamRef xBookStrm = ScfTools::OpenStorageStreamRead( xRootStrg, EXC_STREAM_BOOK );
+ tools::SvRef<SotStorageStream> xBookStrm = ScfTools::OpenStorageStreamRead( xRootStrg, EXC_STREAM_BOOK );
XclBiff eBookBiff = xBookStrm.Is() ? XclImpStream::DetectBiffVersion( *xBookStrm ) : EXC_BIFF_UNKNOWN;
// try to open the "Workbook" stream
- SotStorageStreamRef xWorkbookStrm = ScfTools::OpenStorageStreamRead( xRootStrg, EXC_STREAM_WORKBOOK );
+ tools::SvRef<SotStorageStream> xWorkbookStrm = ScfTools::OpenStorageStreamRead( xRootStrg, EXC_STREAM_WORKBOOK );
XclBiff eWorkbookBiff = xWorkbookStrm.Is() ? XclImpStream::DetectBiffVersion( *xWorkbookStrm ) : EXC_BIFF_UNKNOWN;
// decide which stream to use
@@ -164,7 +164,7 @@ static FltError lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument,
}
// open the "Book"/"Workbook" stream
- SotStorageStreamRef xStrgStrm = ScfTools::OpenStorageStreamWrite( xRootStrg, aStrmName );
+ tools::SvRef<SotStorageStream> xStrgStrm = ScfTools::OpenStorageStreamWrite( xRootStrg, aStrmName );
if( !xStrgStrm.Is() || xStrgStrm->GetError() ) return eERR_OPEN;
xStrgStrm->SetBufferSize( 0x8000 ); // still needed?
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 65d334e..3b91332 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -384,7 +384,7 @@ void ImportExcel8::ReadBasic()
rFilterOpt.IsLoadExcelBasicExecutable() )
{
// see if we have the XCB stream
- SotStorageStreamRef xXCB = xRootStrg->OpenSotStream( OUString("XCB"), STREAM_STD_READ | StreamMode::NOCREATE );
+ tools::SvRef<SotStorageStream> xXCB = xRootStrg->OpenSotStream( OUString("XCB"), STREAM_STD_READ | StreamMode::NOCREATE );
if ( xXCB.Is()|| SVSTREAM_OK == xXCB->GetError() )
{
ScCTBWrapper wrapper;
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index d734056..71ca745 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -813,7 +813,7 @@ void XclExpPivotCache::WriteDConName( XclExpStream& rStrm ) const
void XclExpPivotCache::WriteCacheStream()
{
tools::SvRef<SotStorage> xSvStrg = OpenStorage( EXC_STORAGE_PTCACHE );
- SotStorageStreamRef xSvStrm = OpenStream( xSvStrg, ScfTools::GetHexStr( maPCInfo.mnStrmId ) );
+ tools::SvRef<SotStorageStream> xSvStrm = OpenStream( xSvStrg, ScfTools::GetHexStr( maPCInfo.mnStrmId ) );
if( xSvStrm.Is() )
{
XclExpStream aStrm( *xSvStrm, GetRoot() );
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index 6b813dc..48fe3b3 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -716,7 +716,7 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm )
// open pivot cache storage stream
tools::SvRef<SotStorage> xSvStrg = OpenStorage( EXC_STORAGE_PTCACHE );
- SotStorageStreamRef xSvStrm = OpenStream( xSvStrg, ScfTools::GetHexStr( mnStrmId ) );
+ tools::SvRef<SotStorageStream> xSvStrm = OpenStream( xSvStrg, ScfTools::GetHexStr( mnStrmId ) );
if( !xSvStrm.Is() )
return;
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 8463fb7..df3f4d6 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -254,14 +254,14 @@ tools::SvRef<SotStorage> XclRoot::OpenStorage( const OUString& rStrgName ) const
return OpenStorage( GetRootStorage(), rStrgName );
}
-SotStorageStreamRef XclRoot::OpenStream( tools::SvRef<SotStorage> xStrg, const OUString& rStrmName ) const
+tools::SvRef<SotStorageStream> XclRoot::OpenStream( tools::SvRef<SotStorage> xStrg, const OUString& rStrmName ) const
{
return mrData.mbExport ?
ScfTools::OpenStorageStreamWrite( xStrg, rStrmName ) :
ScfTools::OpenStorageStreamRead( xStrg, rStrmName );
}
-SotStorageStreamRef XclRoot::OpenStream( const OUString& rStrmName ) const
+tools::SvRef<SotStorageStream> XclRoot::OpenStream( const OUString& rStrmName ) const
{
return OpenStream( GetRootStorage(), rStrmName );
}
diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx
index c74829c..342715e 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -182,18 +182,18 @@ tools::SvRef<SotStorage> ScfTools::OpenStorageWrite( tools::SvRef<SotStorage> xS
return xSubStrg;
}
-SotStorageStreamRef ScfTools::OpenStorageStreamRead( tools::SvRef<SotStorage> xStrg, const OUString& rStrmName )
+tools::SvRef<SotStorageStream> ScfTools::OpenStorageStreamRead( tools::SvRef<SotStorage> xStrg, const OUString& rStrmName )
{
- SotStorageStreamRef xStrm;
+ tools::SvRef<SotStorageStream> xStrm;
if( xStrg.Is() && xStrg->IsContained( rStrmName ) && xStrg->IsStream( rStrmName ) )
xStrm = xStrg->OpenSotStream( rStrmName, STREAM_STD_READ );
return xStrm;
}
-SotStorageStreamRef ScfTools::OpenStorageStreamWrite( tools::SvRef<SotStorage> xStrg, const OUString& rStrmName )
+tools::SvRef<SotStorageStream> ScfTools::OpenStorageStreamWrite( tools::SvRef<SotStorage> xStrg, const OUString& rStrmName )
{
OSL_ENSURE( !xStrg || !xStrg->IsContained( rStrmName ), "ScfTools::OpenStorageStreamWrite - stream exists already" );
- SotStorageStreamRef xStrm;
+ tools::SvRef<SotStorageStream> xStrm;
if( xStrg.Is() )
xStrm = xStrg->OpenSotStream( rStrmName, STREAM_STD_WRITE | StreamMode::TRUNC );
return xStrm;
diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx
index e681f08..bf7801d 100644
--- a/sc/source/filter/inc/XclImpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclImpChangeTrack.hxx
@@ -55,7 +55,7 @@ private:
OUString sOldUsername;
ScChangeTrack* pChangeTrack;
- SotStorageStreamRef xInStrm; // input stream
+ tools::SvRef<SotStorageStream> xInStrm; // input stream
XclImpStream* pStrm; // stream import class
sal_uInt16 nTabIdCount;
bool bGlobExit; // global exit loop
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index fecc646..09d7efe 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -163,9 +163,9 @@ public:
static tools::SvRef<SotStorage> OpenStorageWrite( tools::SvRef<SotStorage> xStrg, const OUString& rStrgName );
/** Tries to open an existing stream with the specified name in the passed storage (read-only). */
- static SotStorageStreamRef OpenStorageStreamRead( tools::SvRef<SotStorage> xStrg, const OUString& rStrmName );
+ static tools::SvRef<SotStorageStream> OpenStorageStreamRead( tools::SvRef<SotStorage> xStrg, const OUString& rStrmName );
/** Creates and opens a stream with the specified name in the passed storage (read/write). */
- static SotStorageStreamRef OpenStorageStreamWrite( tools::SvRef<SotStorage> xStrg, const OUString& rStrmName );
+ static tools::SvRef<SotStorageStream> OpenStorageStreamWrite( tools::SvRef<SotStorage> xStrg, const OUString& rStrmName );
// *** item handling *** ------------------------------------------------------
diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx
index a38f0ed..e5d1bd1 100644
--- a/sc/source/filter/inc/xcl97esc.hxx
+++ b/sc/source/filter/inc/xcl97esc.hxx
@@ -106,7 +106,7 @@ public:
const Rectangle* pChildAnchor );
private:
- SotStorageStreamRef mxCtlsStrm; /// The 'Ctls' stream.
+ tools::SvRef<SotStorageStream> mxCtlsStrm; /// The 'Ctls' stream.
/** Creates a TBX form control OBJ record from the passed form control. */
XclExpTbxControlObj* CreateTBXCtrlObj(
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape,
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index 337ae0a..ebf7792 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -1034,7 +1034,7 @@ private:
typedef ::std::vector< XclImpDffConvDataRef > XclImpDffConvDataStack;
const OUString maStdFormName; /// Standard name of control forms.
- SotStorageStreamRef mxCtlsStrm; /// The 'Ctls' stream for OCX form controls.
+ tools::SvRef<SotStorageStream> mxCtlsStrm; /// The 'Ctls' stream for OCX form controls.
ScfProgressBarRef mxProgress; /// The progress bar used in ProcessObj().
XclImpDffConvDataStack maDataStack; /// Stack for registered drawing managers.
sal_uInt32 mnOleImpFlags; /// Application OLE import settings.
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index 7c0e021..d65ccf0 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -199,9 +199,9 @@ public:
/** Tries to open a storage as child of the root storage for reading or writing. */
tools::SvRef<SotStorage> OpenStorage( const OUString& rStrgName ) const;
/** Tries to open a new stream in the specified storage for reading or writing. */
- SotStorageStreamRef OpenStream( tools::SvRef<SotStorage> xStrg, const OUString& rStrmName ) const;
+ tools::SvRef<SotStorageStream> OpenStream( tools::SvRef<SotStorage> xStrg, const OUString& rStrmName ) const;
/** Tries to open a new stream in the root storage for reading or writing. */
- SotStorageStreamRef OpenStream( const OUString& rStrmName ) const;
+ tools::SvRef<SotStorageStream> OpenStream( const OUString& rStrmName ) const;
/** Returns the destination document (import) or source document (export). */
ScDocument& GetDoc() const;
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index de77546..acd7fa2 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1601,7 +1601,7 @@ void XclExpChangeTrack::PushActionRecord( const ScChangeAction& rAction )
bool XclExpChangeTrack::WriteUserNamesStream()
{
bool bRet = false;
- SotStorageStreamRef xSvStrm = OpenStream( EXC_STREAM_USERNAMES );
+ tools::SvRef<SotStorageStream> xSvStrm = OpenStream( EXC_STREAM_USERNAMES );
OSL_ENSURE( xSvStrm.Is(), "XclExpChangeTrack::WriteUserNamesStream - no stream" );
if( xSvStrm.Is() )
{
@@ -1623,7 +1623,7 @@ void XclExpChangeTrack::Write()
if( WriteUserNamesStream() )
{
- SotStorageStreamRef xSvStrm = OpenStream( EXC_STREAM_REVLOG );
+ tools::SvRef<SotStorageStream> xSvStrm = OpenStream( EXC_STREAM_REVLOG );
OSL_ENSURE( xSvStrm.Is(), "XclExpChangeTrack::Write - no stream" );
if( xSvStrm.Is() )
{
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 0c4be44..417aa3f 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -44,7 +44,7 @@ XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStrea
// Verify that the User Names stream exists before going any further. Excel adds both
// "Revision Log" and "User Names" streams when Change Tracking is active but the Revision log
// remains if Change Tracking is turned off.
- SotStorageStreamRef xUserStrm = OpenStream( EXC_STREAM_USERNAMES );
+ tools::SvRef<SotStorageStream> xUserStrm = OpenStream( EXC_STREAM_USERNAMES );
if( !xUserStrm.Is() )
return;
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index b83928d..9279bff 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -450,7 +450,7 @@ bool ScDrawTransferObj::GetData( const css::datatransfer::DataFlavor& rFlavor, c
return bOK;
}
-bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId,
+bool ScDrawTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId,
const ::com::sun::star::datatransfer::DataFlavor& /* rFlavor */ )
{
// called from SetObject, put data into stream
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 815c102..11a696f 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -388,7 +388,7 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt
return bOK;
}
-bool ScTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId,
+bool ScTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId,
const datatransfer::DataFlavor& rFlavor )
{
// called from SetObject, put data into stream
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx
index 8f5642b..5103d3a 100644
--- a/sc/source/ui/inc/drwtrans.hxx
+++ b/sc/source/ui/inc/drwtrans.hxx
@@ -76,7 +76,7 @@ public:
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,
+ virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId,
const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
virtual void ObjectReleased() SAL_OVERRIDE;
virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index 57d8ea6..c0772b5 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -73,7 +73,7 @@ public:
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,
+ virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId,
const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
virtual void ObjectReleased() SAL_OVERRIDE;
virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index fa79b0c..1a895e1 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4032,7 +4032,7 @@ static SotClipboardFormatId lcl_GetDropFormatId( const uno::Reference<datatransf
// If it's a Writer object, insert RTF instead of OLE
bool bDoRtf = false;
- SotStorageStreamRef xStm;
+ tools::SvRef<SotStorageStream> xStm;
TransferableObjectDescriptor aObjDesc;
if( aDataHelper.GetTransferableObjectDescriptor( SotClipboardFormatId::OBJECTDESCRIPTOR, aObjDesc ) &&
aDataHelper.GetSotStorageStream( SotClipboardFormatId::EMBED_SOURCE, xStm ) )
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index f1dd830..d44bda3 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -744,7 +744,7 @@ bool ScViewFunc::PasteOnDrawObjectLinked(
if ( aDataHelper.HasFormat( SotClipboardFormatId::SVXB ) )
{
- SotStorageStreamRef xStm;
+ tools::SvRef<SotStorageStream> xStm;
ScDrawView* pScDrawView = GetScDrawView();
if( pScDrawView && aDataHelper.GetSotStorageStream( SotClipboardFormatId::SVXB, xStm ) )
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 0ccf18b..e15e201 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -164,7 +164,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
ScAddress( nStartCol, nStartRow, GetViewData().GetTabNo() ) );
OUString aStr;
- SotStorageStreamRef xStream;
+ tools::SvRef<SotStorageStream> xStream;
if ( aDataHelper.GetSotStorageStream( SotClipboardFormatId::RTF, xStream ) && xStream.Is() )
// mba: clipboard always must contain absolute URLs (could be from alien source)
aImpEx.ImportStream( *xStream, OUString(), SotClipboardFormatId::RTF );
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index c220b23..3172c1d 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -296,7 +296,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
aObj.SetOverwriting( true );
OUString aStr;
- SotStorageStreamRef xStream;
+ tools::SvRef<SotStorageStream> xStream;
if ( aDataHelper.GetSotStorageStream( nFormatId, xStream ) && xStream.Is() )
{
if (nFormatId == SotClipboardFormatId::HTML)
@@ -471,7 +471,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
}
else if (nFormatId == SotClipboardFormatId::SVXB)
{
- SotStorageStreamRef xStm;
+ tools::SvRef<SotStorageStream> xStm;
if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::SVXB, xStm ) )
{
Graphic aGraphic;
@@ -481,7 +481,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
}
else if ( nFormatId == SotClipboardFormatId::DRAWING )
{
- SotStorageStreamRef xStm;
+ tools::SvRef<SotStorageStream> xStm;
if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::DRAWING, xStm ) )
{
MakeDrawLayer(); // before loading model, so 3D factory has been created
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index ca4c559..fc44c68 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 SotStorageStreamRef GetOptionStream( const OUString& rOptionName, SdOptionStreamMode eMode );
+ SD_DLLPUBLIC tools::SvRef<SotStorageStream> 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 f998047..6728bc7 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1288,7 +1288,7 @@ void PPTWriter::ImplWriteOLE( )
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.
- SotStorageStreamRef xStm = xCleanStorage->OpenSotStream( aPersistStream, STREAM_STD_READWRITE );
+ tools::SvRef<SotStorageStream> xStm = xCleanStorage->OpenSotStream( aPersistStream, STREAM_STD_READWRITE );
xStm->WriteUInt32( 0 ) // no ClipboardId
.WriteUInt32( 4 ) // no target device
.WriteUInt32( 1 ) // aspect ratio
@@ -1472,7 +1472,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocS
tools::SvRef<SotStorage> xOverhead2 = xOverhead->OpenSotStorage( OUString( "_MS_VBA_Overhead") );
if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) )
{
- SotStorageStreamRef xTemp = xOverhead2->OpenSotStream( OUString( "_MS_VBA_Overhead2") );
+ tools::SvRef<SotStorageStream> 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 567a837..c7bfef9 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() )
{
- SotStorageStreamRef xCompObj = xTemp->OpenSotStream(
+ tools::SvRef<SotStorageStream> 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 29c7181..1ffbaa8 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;
- SotStorageStreamRef mpSvStream;
+ tools::SvRef<SotStorageStream> mpSvStream;
sal_uInt16 mnByteOrder;
sal_uInt16 mnFormat;
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 300c35c..b7c627a 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)
- SotStorageStreamRef xDocStream;
+ tools::SvRef<SotStorageStream> 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 14ed722..d1c4e6f 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
*/
-SotStorageStreamRef SdModule::GetOptionStream( const OUString& rOptionName,
+tools::SvRef<SotStorageStream> SdModule::GetOptionStream( const OUString& rOptionName,
SdOptionStreamMode eMode )
{
::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() );
- SotStorageStreamRef xStm;
+ tools::SvRef<SotStorageStream> xStm;
if( pDocSh )
{
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 422b18a..044f680 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -571,7 +571,7 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
return bOK;
}
-bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject, SotClipboardFormatId nObjectType, const DataFlavor& )
+bool SdTransferable::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pObject, SotClipboardFormatId nObjectType, const DataFlavor& )
{
bool bRet = false;
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index b3dc63b..b5984f8 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()
{
- SotStorageStreamRef xIStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) ,
+ tools::SvRef<SotStorageStream> 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
{
- SotStorageStreamRef xOStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) ,
+ tools::SvRef<SotStorageStream> 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 7d8245e..99271d2 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()
{
- SotStorageStreamRef xIStm( SD_MOD()->GetOptionStream(
+ tools::SvRef<SotStorageStream> 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
{
- SotStorageStreamRef xOStm( SD_MOD()->GetOptionStream(
+ tools::SvRef<SotStorageStream> xOStm( SD_MOD()->GetOptionStream(
OUString(SD_OPTION_VECTORIZE) ,
SD_OPTION_STORE ) );
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 610648d..14a0ab0 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -171,7 +171,7 @@ public:
SdrMediaObj* InsertMediaObj( const OUString& rURL, const OUString& rMimeType, sal_Int8& rAction,
const Point& rPos, const Size& rSize );
- bool PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, SdrInsertFlags nPasteOptions );
+ bool PasteRTFTable( ::tools::SvRef<SotStorageStream> xStm, SdrPage* pPage, SdrInsertFlags nPasteOptions );
bool IsPresObjSelected(bool bOnPage = true, bool bOnMasterPage = true, bool bCheckPresObjListOnly = false, bool bCheckLayoutOnly = false) const;
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index 640c207..6d78cfb 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -106,7 +106,7 @@ protected:
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 ObjectReleased() SAL_OVERRIDE;
virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index c279456..29e388d 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -686,7 +686,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar
{
if(pIAOHandle->getOverlayObjectList().isHitPixel(rEvt.maPosPixel))
{
- SotStorageStreamRef xStm;
+ ::tools::SvRef<SotStorageStream> xStm;
if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::XFA, xStm ) && xStm.Is() )
{
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 0458af1..eeb5f78 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -312,7 +312,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
// ImageMap?
if( !pOwnData && aDataHelper.HasFormat( SotClipboardFormatId::SVIM ) )
{
- SotStorageStreamRef xStm;
+ ::tools::SvRef<SotStorageStream> xStm;
if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::SVIM, xStm ) )
{
@@ -329,7 +329,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list