diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-11-13 21:02:02 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-14 10:11:32 +0000 |
commit | a94b6ec2d57cab51d79329ea62d908f3b3713505 (patch) | |
tree | 68dd3fe95d4e46e24fb68b225d5ef93310593cda /unotools | |
parent | 288a3e6ef7e04c95be1ed26a5df850fbf4e6ea24 (diff) |
callcatcher: update unused code post binfilter death
Change-Id: I5b25d14ef2769126f98523551597f43812b9feb7
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/inc/unotools/ucblockbytes.hxx | 9 | ||||
-rw-r--r-- | unotools/source/ucbhelper/ucblockbytes.cxx | 46 |
2 files changed, 0 insertions, 55 deletions
diff --git a/unotools/inc/unotools/ucblockbytes.hxx b/unotools/inc/unotools/ucblockbytes.hxx index 7c090b72dd84..6e264fc453af 100644 --- a/unotools/inc/unotools/ucblockbytes.hxx +++ b/unotools/inc/unotools/ucblockbytes.hxx @@ -121,13 +121,6 @@ protected: public: // properties: Referer, PostMimeType static UcbLockBytesRef CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XContent >& xContent, - const ::rtl::OUString& rReferer, - const ::rtl::OUString& rMediaType, - const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >& xPostData, - const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& xInter, - UcbLockBytesHandler* pHandler=0 ); - - static UcbLockBytesRef CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XContent >& xContent, const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rProps, StreamMode eMode, const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& xInter, @@ -150,8 +143,6 @@ public: ErrCode GetError() const { return m_nError; } - void Cancel(); // is alive only for compatibility reasons - // the following properties are available when and after the first DataAvailable callback has been executed String GetContentType() const; String GetRealURL() const; diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 758aef20670c..ee5e86122380 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1572,13 +1572,6 @@ ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const } //---------------------------------------------------------------------------- -void UcbLockBytes::Cancel() -{ - // is alive only for compatibility reasons - OSL_ENSURE( m_bTerminated, "UcbLockBytes is not thread safe so it can be used only syncronously!\n" ); -} - -//---------------------------------------------------------------------------- IMPL_LINK_NOARG(UcbLockBytes, DataAvailHdl) { if ( hasInputStream_Impl() && m_xHandler.Is() ) @@ -1611,45 +1604,6 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference< XStream >& xStre return xLockBytes; } -UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xContent, const ::rtl::OUString& rReferer, const ::rtl::OUString& rMediaType, - const Reference < XInputStream >& xPostData, const Reference < XInteractionHandler >& xInteractionHandler, UcbLockBytesHandler* pHandler ) -{ - if( !xContent.is() ) - return NULL; - - UcbLockBytesRef xLockBytes = new UcbLockBytes( pHandler ); - xLockBytes->SetSynchronMode( !pHandler ); - Reference< XActiveDataControl > xSink = (XActiveDataControl*) new UcbDataSink_Impl( xLockBytes ); - - PostCommandArgument2 aArgument; - aArgument.Source = xPostData; - aArgument.Sink = xSink; - aArgument.MediaType = rMediaType; - aArgument.Referer = rReferer; - - Command aCommand; - aCommand.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("post")); - aCommand.Argument <<= aArgument; - - Reference< XProgressHandler > xProgressHdl = new ProgressHandler_Impl( LINK( &xLockBytes, UcbLockBytes, DataAvailHdl ) ); - - sal_Bool bError = UCBOpenContentSync( xLockBytes, - xContent, - aCommand, - xSink, - xInteractionHandler, - xProgressHdl, - pHandler ); - - if ( xLockBytes->GetError() == ERRCODE_NONE && ( bError || !xLockBytes->getInputStream().is() ) ) - { - OSL_FAIL("No InputStream, but no error set!" ); - xLockBytes->SetError( ERRCODE_IO_GENERAL ); - } - - return xLockBytes; -} - UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xContent, const Sequence < PropertyValue >& rProps, StreamMode eOpenMode, const Reference < XInteractionHandler >& xInteractionHandler, UcbLockBytesHandler* pHandler ) { |