diff options
Diffstat (limited to 'sot')
-rw-r--r-- | sot/inc/sot/storage.hxx | 6 | ||||
-rw-r--r-- | sot/source/sdstor/storage.cxx | 35 |
2 files changed, 0 insertions, 41 deletions
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx index a71332b3108b..32a7cdb23e6a 100644 --- a/sot/inc/sot/storage.hxx +++ b/sot/inc/sot/storage.hxx @@ -137,9 +137,6 @@ public: SotStorage( sal_Bool bUCBStorage, const String &, StreamMode = STREAM_STD_READWRITE, StorageMode = 0 ); - SotStorage( const ::ucbhelper::Content& rContent, const String &, - StreamMode = STREAM_STD_READWRITE, - StorageMode = 0 ); SotStorage( BaseStorage * ); SotStorage( SvStream & rStm ); SotStorage( sal_Bool bUCBStorage, SvStream & rStm ); @@ -214,9 +211,6 @@ public: SotStorage * OpenUCBStorage( const String & rEleName, StreamMode = STREAM_STD_READWRITE, StorageMode = STORAGE_TRANSACTED ); - SotStorage * OpenOLEStorage( const String & rEleName, - StreamMode = STREAM_STD_READWRITE, - StorageMode = STORAGE_TRANSACTED ); // Abfrage auf Storage oder Stream virtual sal_Bool IsStream( const String & rEleName ) const; virtual sal_Bool IsStorage( const String & rEleName ) const; diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 3d99b0ad2f6f..d2e3cd701ab5 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -502,20 +502,6 @@ SotStorage::SotStorage() #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <ucbhelper/content.hxx> -SotStorage::SotStorage( const ::ucbhelper::Content& rContent, const String & rName, StreamMode nMode, StorageMode nStorageMode ) - INIT_SotStorage() -{ - m_aName = rName; // Namen merken - m_pOwnStg = new UCBStorage( rContent, m_aName, nMode, (nStorageMode & STORAGE_TRANSACTED) ? sal_False : sal_True ); - - SetError( m_pOwnStg->GetError() ); - - if ( IsOLEStorage() ) - m_nVersion = SOFFICE_FILEFORMAT_50; - - SignAsRoot( m_pOwnStg->IsRoot() ); -} - SotStorage::SotStorage( const String & rName, StreamMode nMode, StorageMode nStorageMode ) INIT_SotStorage() { @@ -1067,27 +1053,6 @@ SotStorage * SotStorage::OpenUCBStorage( const String & rEleName, return pStor; } -SotStorage * SotStorage::OpenOLEStorage( const String & rEleName, - StreamMode nMode, - StorageMode nStorageMode ) -{ - SotStorage * pStor = NULL; - DBG_ASSERT( Owner(), "must be owner" ); - if( m_pOwnStg ) - { - nMode |= STREAM_SHARE_DENYALL; - ErrCode nE = m_pOwnStg->GetError(); - BaseStorage * p = m_pOwnStg->OpenOLEStorage( rEleName, nMode, - (nStorageMode & STORAGE_TRANSACTED) ? sal_False : sal_True ); - pStor = new SotStorage( p ); - if( !nE ) - m_pOwnStg->ResetError(); // kein Fehler setzen - } - else - SetError( SVSTREAM_GENERALERROR ); - return pStor; -} - /************************************************************************* |* SotStorage::IsStream() |* SotStorage::IsStorage() |