diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-06 18:54:13 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-06 19:37:47 +0300 |
commit | 88bea0a5a8b1e5c1fb601f4e4ba61ba7bce38a3a (patch) | |
tree | 3efd83cf3c67f727f473b73da69e30963f08dc0f /unotools/source/ucbhelper | |
parent | dcb88d170b6ced0ee805b787c1e9be820ff90d25 (diff) |
Kill superfluous vertical whitespace
Change-Id: I949ba575951998d36cb4d38746f2182633046b3b
Diffstat (limited to 'unotools/source/ucbhelper')
-rw-r--r-- | unotools/source/ucbhelper/tempfile.cxx | 1 | ||||
-rw-r--r-- | unotools/source/ucbhelper/ucblockbytes.cxx | 56 | ||||
-rw-r--r-- | unotools/source/ucbhelper/ucbstreamhelper.cxx | 2 | ||||
-rw-r--r-- | unotools/source/ucbhelper/xtempfile.cxx | 7 |
4 files changed, 0 insertions, 66 deletions
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 4821714576cf..a5ef10f1fba4 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -330,7 +330,6 @@ umask(old_mode); } } - OUString TempFile::CreateTempName( const OUString* pParent ) { // get correct directory diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index c4c6c24ae1c5..8beeec966bd4 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sal/macros.h> #include <unotools/ucblockbytes.hxx> #include <comphelper/processfactory.hxx> @@ -63,7 +62,6 @@ using namespace ::com::sun::star::task; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; - namespace utl { @@ -160,7 +158,6 @@ public: { return m_xProgressHandler; } }; - /** Helper class for property change notifies when executing UCB commands */ @@ -230,8 +227,6 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc } } - - class Moderator : public osl::Thread { @@ -254,7 +249,6 @@ public: virtual ~Moderator(); - enum ResultType { NORESULT, @@ -276,7 +270,6 @@ public: GENERAL }; - class ConditionRes : public salhelper::Condition { @@ -296,7 +289,6 @@ public: Moderator& m_aModerator; }; - struct Result { ResultType type; Any result; @@ -341,7 +333,6 @@ public: void setStream(const Reference< XStream >& aStream); void setInputStream(const Reference<XInputStream> &rxInputStream); - protected: virtual void SAL_CALL run() SAL_OVERRIDE; virtual void SAL_CALL onTerminated() SAL_OVERRIDE; @@ -365,7 +356,6 @@ private: ::ucbhelper::Content m_aContent; }; - class ModeratorsActiveDataStreamer : public ::cppu::WeakImplHelper1<XActiveDataStreamer> { @@ -395,7 +385,6 @@ public: return m_xStream; } - private: Moderator& m_aModerator; @@ -403,7 +392,6 @@ private: Reference<XStream> m_xStream; }; - class ModeratorsActiveDataSink : public ::cppu::WeakImplHelper1<XActiveDataSink> { @@ -433,21 +421,17 @@ public: return m_xStream; } - private: Moderator& m_aModerator; osl::Mutex m_aMutex; Reference<XInputStream> m_xStream; }; - - ModeratorsActiveDataSink::ModeratorsActiveDataSink(Moderator &theModerator) : m_aModerator(theModerator) { } - ModeratorsActiveDataSink::~ModeratorsActiveDataSink() { } @@ -466,7 +450,6 @@ ModeratorsActiveDataSink::setInputStream ( m_xStream = rxInputStream; } - ModeratorsActiveDataStreamer::ModeratorsActiveDataStreamer( Moderator &theModerator ) @@ -474,7 +457,6 @@ ModeratorsActiveDataStreamer::ModeratorsActiveDataStreamer( { } - ModeratorsActiveDataStreamer::~ModeratorsActiveDataStreamer() { } @@ -493,8 +475,6 @@ ModeratorsActiveDataStreamer::setStream ( m_xStream = rxStream; } - - class ModeratorsInteractionHandler : public ::cppu::WeakImplHelper1<XInteractionHandler> { @@ -513,7 +493,6 @@ private: Moderator& m_aModerator; }; - class ModeratorsProgressHandler : public ::cppu::WeakImplHelper1<XProgressHandler> { @@ -532,12 +511,10 @@ public: virtual void SAL_CALL pop( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - private: Moderator& m_aModerator; }; - ModeratorsProgressHandler::ModeratorsProgressHandler(Moderator &theModerator) : m_aModerator(theModerator) { @@ -547,7 +524,6 @@ ModeratorsProgressHandler::~ModeratorsProgressHandler() { } - void SAL_CALL ModeratorsProgressHandler::push( const Any& Status ) throw ( RuntimeException, std::exception) @@ -555,33 +531,28 @@ void SAL_CALL ModeratorsProgressHandler::push( const Any& Status ) m_aModerator.push(Status); } - void SAL_CALL ModeratorsProgressHandler::update( const Any& Status ) throw (RuntimeException, std::exception) { m_aModerator.update(Status); } - void SAL_CALL ModeratorsProgressHandler::pop( ) throw (RuntimeException, std::exception) { m_aModerator.pop(); } - ModeratorsInteractionHandler::ModeratorsInteractionHandler( Moderator &aModerator) : m_aModerator(aModerator) { } - ModeratorsInteractionHandler::~ModeratorsInteractionHandler() { } - void SAL_CALL ModeratorsInteractionHandler::handle( const Reference<XInteractionRequest >& Request @@ -594,9 +565,6 @@ ModeratorsInteractionHandler::handle( m_aModerator.handle(Request); } - - - Moderator::Moderator( Reference < XContent >& xContent, Reference < XInteractionHandler >& xInteract, @@ -662,12 +630,10 @@ Moderator::Moderator( m_aArg.Argument <<= aOpenArg; } - Moderator::~Moderator() { } - Moderator::Result Moderator::getResult(const sal_uInt32 milliSec) { Result ret; @@ -688,14 +654,12 @@ Moderator::Result Moderator::getResult(const sal_uInt32 milliSec) return ret; } - void Moderator::setReply(ReplyType aReplyType ) { salhelper::ConditionModifier aMod(m_aRep); m_aReplyType = aReplyType; } - void Moderator::handle( const Reference<XInteractionRequest >& Request ) { ReplyType aReplyType; @@ -732,7 +696,6 @@ void Moderator::handle( const Reference<XInteractionRequest >& Request ) } while(aReplyType != REQUESTHANDLED); } - void Moderator::push( const Any& Status ) { { @@ -750,7 +713,6 @@ void Moderator::push( const Any& Status ) setReply(EXIT); } - void Moderator::update( const Any& Status ) { { @@ -768,7 +730,6 @@ void Moderator::update( const Any& Status ) setReply(EXIT); } - void Moderator::pop( ) { { @@ -785,7 +746,6 @@ void Moderator::pop( ) setReply(EXIT); } - void Moderator::setStream(const Reference< XStream >& aStream) { { @@ -803,7 +763,6 @@ void Moderator::setStream(const Reference< XStream >& aStream) setReply(EXIT); } - void Moderator::setInputStream(const Reference<XInputStream> &rxInputStream) { { @@ -821,7 +780,6 @@ void Moderator::setInputStream(const Reference<XInputStream> &rxInputStream) setReply(EXIT); } - void SAL_CALL Moderator::run() { ResultType aResultType; @@ -884,7 +842,6 @@ static bool _UCBOpenContentSync( Reference < XProgressHandler > xProgress, UcbLockBytesHandlerRef xHandler ); - static bool UCBOpenContentSync( UcbLockBytesRef xLockBytes, Reference < XContent > xContent, @@ -1218,14 +1175,12 @@ static bool _UCBOpenContentSync( if ( xControl.is() ) xControl->terminate(); - if ( xProps.is() ) xProps->removePropertiesChangeListener( Sequence< OUString >(), xListener ); return ( bAborted || bException ); } - UcbLockBytes::UcbLockBytes( UcbLockBytesHandler* pHandler ) : m_aExpireDate( DateTime::EMPTY ) , m_xInputStream (NULL) @@ -1239,7 +1194,6 @@ UcbLockBytes::UcbLockBytes( UcbLockBytesHandler* pHandler ) SetSynchronMode( true ); } - UcbLockBytes::~UcbLockBytes() { if ( !m_bDontClose ) @@ -1281,8 +1235,6 @@ Reference < XInputStream > UcbLockBytes::getInputStream() return m_xInputStream; } - - bool UcbLockBytes::setStream_Impl( const Reference<XStream>& aStream ) { osl::MutexGuard aGuard( m_aMutex ); @@ -1347,7 +1299,6 @@ void UcbLockBytes::SetStreamValid_Impl() m_aInitialized.set(); } - void UcbLockBytes::terminate_Impl() { m_bTerminated = true; @@ -1364,13 +1315,11 @@ void UcbLockBytes::terminate_Impl() m_xHandler->Handle( UcbLockBytesHandler::DONE, this ); } - void UcbLockBytes::SetSynchronMode (bool bSynchron) { SvLockBytes::SetSynchronMode (bSynchron); } - ErrCode UcbLockBytes::ReadAt(sal_uInt64 const nPos, void *pBuffer, sal_uLong nCount, sal_uLong *pRead) const { @@ -1439,7 +1388,6 @@ ErrCode UcbLockBytes::ReadAt(sal_uInt64 const nPos, return ERRCODE_NONE; } - ErrCode UcbLockBytes::WriteAt(sal_uInt64 const nPos, const void *pBuffer, sal_uLong nCount, sal_uLong *pWritten) { @@ -1479,7 +1427,6 @@ ErrCode UcbLockBytes::WriteAt(sal_uInt64 const nPos, const void *pBuffer, return ERRCODE_NONE; } - ErrCode UcbLockBytes::Flush() const { Reference <XOutputStream > xOutputStream = getOutputStream_Impl(); @@ -1498,7 +1445,6 @@ ErrCode UcbLockBytes::Flush() const return ERRCODE_NONE; } - ErrCode UcbLockBytes::SetSize (sal_uInt64 const nNewSize) { SvLockBytesStat aStat; @@ -1532,7 +1478,6 @@ ErrCode UcbLockBytes::SetSize (sal_uInt64 const nNewSize) return ERRCODE_NONE; } - ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const { if ( IsSynchronMode() ) @@ -1569,7 +1514,6 @@ ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const return ERRCODE_NONE; } - IMPL_LINK_NOARG(UcbLockBytes, DataAvailHdl) { if ( hasInputStream_Impl() && m_xHandler.Is() ) diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx index 75326bfae4de..3aea7c03f3f9 100644 --- a/unotools/source/ucbhelper/ucbstreamhelper.cxx +++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx @@ -138,8 +138,6 @@ static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMo return pStream; } - - SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode, UcbLockBytesHandler* pHandler ) { diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx index 3cbb4d54c418..a40d6b0213b9 100644 --- a/unotools/source/ucbhelper/xtempfile.cxx +++ b/unotools/source/ucbhelper/xtempfile.cxx @@ -48,7 +48,6 @@ OTempFileService::~OTempFileService () delete mpTempFile; } - // XInterface css::uno::Any SAL_CALL OTempFileService::queryInterface( css::uno::Type const & aType ) @@ -151,8 +150,6 @@ throw ( css::uno::RuntimeException, std::exception ) return OUString( mpTempFile->GetFileName() ); }; - - // XInputStream sal_Int32 SAL_CALL OTempFileService::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) @@ -323,7 +320,6 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs } } - void OTempFileService::checkError () const { if (!mpStream || mpStream->SvStream::GetError () != ERRCODE_NONE ) @@ -395,7 +391,6 @@ throw ( css::io::IOException, css::uno::RuntimeException, std::exception ) return (sal_Int64)nEndPos; } - // XStream css::uno::Reference< css::io::XInputStream > SAL_CALL OTempFileService::getInputStream() @@ -443,8 +438,6 @@ throw ( css::uno::RuntimeException, std::exception ) return getSupportedServiceNames_Static(); } - - OUString OTempFileService::getImplementationName_Static () { return OUString ( "com.sun.star.io.comp.TempFile" ); |