diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-22 07:29:33 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-23 11:37:04 +0000 |
| commit | fba010a77757d0724a0da4a902e78f17cdf15b65 (patch) | |
| tree | c91ad89be535b856abcf4e3494a7e46d36871e28 /sot/inc | |
| parent | 66823037e164af16f2cb24c4299c8776869c682c (diff) | |
make sot ByteString free
Diffstat (limited to 'sot/inc')
| -rw-r--r-- | sot/inc/sot/stg.hxx | 8 | ||||
| -rw-r--r-- | sot/inc/sot/storage.hxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx index c8d18da67a8a..cb447e3261b8 100644 --- a/sot/inc/sot/stg.hxx +++ b/sot/inc/sot/stg.hxx @@ -121,7 +121,7 @@ public: virtual sal_Bool Revert() = 0; virtual BaseStorageStream* OpenStream( const String & rEleName, StreamMode = STREAM_STD_READWRITE, - sal_Bool bDirect = sal_True, const ByteString* pKey=0 ) = 0; + sal_Bool bDirect = sal_True, const rtl::OString* pKey=0 ) = 0; virtual BaseStorage* OpenStorage( const String & rEleName, StreamMode = STREAM_STD_READWRITE, sal_Bool bDirect = sal_False ) = 0; @@ -221,7 +221,7 @@ public: virtual sal_Bool Revert(); virtual BaseStorageStream* OpenStream( const String & rEleName, StreamMode = STREAM_STD_READWRITE, - sal_Bool bDirect = sal_True, const ByteString* pKey=0 ); + sal_Bool bDirect = sal_True, const rtl::OString* pKey=0 ); virtual BaseStorage* OpenStorage( const String & rEleName, StreamMode = STREAM_STD_READWRITE, sal_Bool bDirect = sal_False ); @@ -257,7 +257,7 @@ protected: ~UCBStorageStream(); public: TYPEINFO(); - UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const ByteString* pKey, sal_Bool bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress ); + UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const rtl::OString* pKey, sal_Bool bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress ); UCBStorageStream( UCBStorageStream_Impl* ); virtual sal_uLong Read( void * pData, sal_uLong nSize ); @@ -340,7 +340,7 @@ public: virtual sal_Bool Revert(); virtual BaseStorageStream* OpenStream( const String & rEleName, StreamMode = STREAM_STD_READWRITE, - sal_Bool bDirect = sal_True, const ByteString* pKey=0 ); + sal_Bool bDirect = sal_True, const rtl::OString* pKey=0 ); virtual BaseStorage* OpenStorage( const String & rEleName, StreamMode = STREAM_STD_READWRITE, sal_Bool bDirect = sal_False ); diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx index 26258bc4b51e..2057bacdca54 100644 --- a/sot/inc/sot/storage.hxx +++ b/sot/inc/sot/storage.hxx @@ -124,7 +124,7 @@ friend class ::binfilter::SvStorage; String m_aName; // Name des Storage sal_Bool m_bIsRoot:1, // z.B.: File-Storage m_bDelStm:1; - ByteString m_aKey; // aKey.Len != 0 -> Verschluesselung + rtl::OString m_aKey; // aKey.Len != 0 -> Verschluesselung long m_nVersion; protected: @@ -155,8 +155,8 @@ public: virtual sal_Bool Validate(); - void SetKey( const ByteString& rKey ); - const ByteString & GetKey() const { return m_aKey; } + void SetKey( const rtl::OString& rKey ); + const rtl::OString& GetKey() const { return m_aKey; } void SetVersion( long nVers ) { |