summaryrefslogtreecommitdiff
path: root/sot
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-11-14 09:27:04 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-11-14 10:11:33 +0000
commit690ce9f1b95c0bb2e8401771c376d3052009c9af (patch)
tree514eaf197e0f7a5c665c4a847505d924dbf05201 /sot
parentfb0b27491dbb0186ac20574b47c904b4c44eac83 (diff)
callcatcher: more binfilter freed up methods
Change-Id: Iea3716e5c7a21f083f36ce4b8d43ae9fc85227f7
Diffstat (limited to 'sot')
-rw-r--r--sot/inc/sot/stg.hxx7
-rw-r--r--sot/inc/sot/storage.hxx1
-rw-r--r--sot/source/sdstor/storage.cxx14
-rw-r--r--sot/source/sdstor/ucbstorage.cxx98
4 files changed, 0 insertions, 120 deletions
diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx
index 183ffaa8856f..711dce29cc77 100644
--- a/sot/inc/sot/stg.hxx
+++ b/sot/inc/sot/stg.hxx
@@ -267,11 +267,8 @@ public:
const SvStream* GetSvStream() const;
virtual sal_Bool Equals( const BaseStorageStream& rStream ) const;
sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue );
- sal_Bool GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue );
SvStream* GetModifySvStream();
-
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetXInputStream() const;
};
namespace ucbhelper
@@ -355,20 +352,16 @@ public:
virtual const SvStream* GetSvStream() const;
virtual sal_Bool Equals( const BaseStorage& rStream ) const;
sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue );
- sal_Bool GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue );
sal_Bool GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue );
-//#if _SOLAR__PRIVATE
UCBStorageElement_Impl* FindElement_Impl( const String& rName ) const;
sal_Bool CopyStorageElement_Impl( UCBStorageElement_Impl& rElement,
BaseStorage* pDest, const String& rNew ) const;
BaseStorage* OpenStorage_Impl( const String & rEleName,
StreamMode, sal_Bool bDirect, sal_Bool bForceUCBStorage );
-//#endif
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index abe1d831fa08..2f92517270c0 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -197,7 +197,6 @@ public:
virtual sal_Bool MoveTo( const String & rEleName, SotStorage * pDest,
const String & rNewName );
- sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue );
sal_Bool IsOLEStorage() const;
static sal_Bool IsOLEStorage( const String & rFileName );
static sal_Bool IsOLEStorage( SvStream* pStream );
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 5fd1efa0b8b0..dbfeefc36424 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -1047,20 +1047,6 @@ sal_Bool SotStorage::Validate()
return sal_True;
}
-sal_Bool SotStorage::SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue )
-{
- UCBStorage* pStg = PTR_CAST( UCBStorage, m_pOwnStg );
- if ( pStg )
- {
- return pStg->SetProperty( rName, rValue );
- }
- else
- {
- DBG_WARNING("W1:Not implemented!");
- return sal_False;
- }
-}
-
sal_Bool SotStorage::IsOLEStorage() const
{
UCBStorage* pStg = PTR_CAST( UCBStorage, m_pOwnStg );
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index c3158c5f3daf..c0a0021fe024 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -453,9 +453,6 @@ public:
sal_uLong CopySourceToTemporary(); // same as ReadSourceWriteToTemporary()
// but the writing is done at the end of temporary
// pointer position is not changed
- Reference<XInputStream> GetXInputStream(); // return XInputStream, after that
- // this class is close to be unusable
- // since it can not read and write
using SvStream::SetError;
void SetError( sal_uInt32 nError );
void PrepareCachedForReopen( StreamMode nMode );
@@ -710,62 +707,6 @@ UCBStorageStream_Impl::~UCBStorageStream_Impl()
}
-Reference<XInputStream> UCBStorageStream_Impl::GetXInputStream()
-{
- Reference< XInputStream > aResult;
-
- if( m_pAntiImpl && m_nRepresentMode != nonset )
- {
- OSL_FAIL( "Misuse of the XInputstream!" );
- SetError( ERRCODE_IO_ACCESSDENIED );
- }
- else
- {
- if( m_bModified )
- {
- // use wrapper around temporary stream
- if( Init() )
- {
- CopySourceToTemporary();
-
- // owner transfer of stream to wrapper
- aResult = new ::utl::OInputStreamWrapper( m_pStream, sal_True );
- m_pStream->Seek(0);
-
- if( aResult.is() )
- {
- // temporary stream can not be used here any more
- // and can not be opened untill wrapper is closed
- // stream is deleted by wrapper after use
- m_pStream = NULL;
- m_nRepresentMode = xinputstream;
- }
- }
- }
- else
- {
- Free();
-
- // open a new instance of XInputStream
- try
- {
- aResult = m_pContent->openStream();
- }
- catch (const Exception&)
- {
- // usually means that stream could not be opened
- }
-
- if( aResult.is() )
- m_nRepresentMode = xinputstream;
- else
- SetError( ERRCODE_IO_ACCESSDENIED );
- }
- }
-
- return aResult;
-}
-
sal_Bool UCBStorageStream_Impl::Init()
{
if( m_nRepresentMode == xinputstream )
@@ -1420,11 +1361,6 @@ SvStream* UCBStorageStream::GetModifySvStream()
return (SvStream*)pImp;
}
-Reference< XInputStream > UCBStorageStream::GetXInputStream() const
-{
- return pImp->GetXInputStream();
-}
-
sal_Bool UCBStorageStream::Equals( const BaseStorageStream& rStream ) const
{
// ???
@@ -1508,23 +1444,6 @@ sal_Bool UCBStorageStream::SetProperty( const String& rName, const ::com::sun::s
return sal_False;
}
-sal_Bool UCBStorageStream::GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue )
-{
- try
- {
- if ( pImp->m_pContent )
- {
- rValue = pImp->m_pContent->getPropertyValue( rName );
- return sal_True;
- }
- }
- catch (const Exception&)
- {
- }
-
- return sal_False;
-}
-
sal_uLong UCBStorageStream::GetSize() const
{
return pImp->GetSize();
@@ -3361,21 +3280,4 @@ sal_Bool UCBStorage::SetProperty( const String& rName, const ::com::sun::star::u
return sal_False;
}
-sal_Bool UCBStorage::GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue )
-{
- try
- {
- if ( pImp->GetContent() )
- {
- rValue = pImp->m_pContent->getPropertyValue( rName );
- return sal_True;
- }
- }
- catch (const Exception&)
- {
- }
-
- return sal_False;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */