diff options
Diffstat (limited to 'sw/source/ui/uno/unomailmerge.cxx')
| -rw-r--r-- | sw/source/ui/uno/unomailmerge.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 44597ea0cab9..7a11f86a6e23 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,9 +111,9 @@ osl::Mutex & GetMailMergeMutex() enum CloseResult { - eSuccess, // successfully closed - eVetoed, // vetoed, ownership transfered to the vetoing instance - eFailed // failed for some unknown reason + eSuccess, // successfully closed + eVetoed, // vetoed, ownership transfered to the vetoing instance + eFailed // failed for some unknown reason }; static CloseResult CloseModelAndDocSh( Reference< frame::XModel > &rxModel, @@ -211,11 +211,11 @@ namespace class DelayedFileDeletion : public ::cppu::WeakImplHelper1< util::XCloseListener > { protected: - ::osl::Mutex m_aMutex; - Reference< util::XCloseable > m_xDocument; - Timer m_aDeleteTimer; - String m_sTemporaryFile; - sal_Int32 m_nPendingDeleteAttempts; + ::osl::Mutex m_aMutex; + Reference< util::XCloseable > m_xDocument; + Timer m_aDeleteTimer; + String m_sTemporaryFile; + sal_Int32 m_nPendingDeleteAttempts; public: DelayedFileDeletion( const Reference< XModel >& _rxModel, @@ -236,8 +236,8 @@ namespace DECL_LINK( OnTryDeleteFile, void* ); private: - DelayedFileDeletion( const DelayedFileDeletion& ); // never implemented - DelayedFileDeletion& operator=( const DelayedFileDeletion& ); // never implemented + DelayedFileDeletion( const DelayedFileDeletion& ); // never implemented + DelayedFileDeletion& operator=( const DelayedFileDeletion& ); // never implemented }; DBG_NAME( DelayedFileDeletion ) @@ -294,7 +294,7 @@ namespace m_aDeleteTimer.Start(); } else - bSuccess = sal_True; // can't do anything here ... + bSuccess = sal_True; // can't do anything here ... } catch( const Exception& ) { @@ -307,7 +307,7 @@ namespace { SWUnoHelper::UCB_DeleteFile( m_sTemporaryFile ); aGuard.clear(); - release(); // this should be our last reference, we should be dead after this + release(); // this should be our last reference, we should be dead after this } return 0L; } @@ -325,9 +325,9 @@ namespace OSL_ENSURE(false, "DelayedFileDeletion::implTakeOwnership: could not revoke the listener!" ); } - m_aDeleteTimer.SetTimeout( 3000 ); // 3 seconds + m_aDeleteTimer.SetTimeout( 3000 ); // 3 seconds m_aDeleteTimer.SetTimeoutHdl( LINK( this, DelayedFileDeletion, OnTryDeleteFile ) ); - m_nPendingDeleteAttempts = 3; // try 3 times at most + m_nPendingDeleteAttempts = 3; // try 3 times at most m_aDeleteTimer.Start( ); } @@ -401,7 +401,7 @@ static BOOL DeleteTmpFile_Impl( } } else - bRes = TRUE; // file will be deleted delayed + bRes = TRUE; // file will be deleted delayed } return bRes; } @@ -442,7 +442,7 @@ SwXMailMerge::~SwXMailMerge() { if (aTmpFileName.Len()) DeleteTmpFile_Impl( xModel, xDocSh, aTmpFileName ); - else // there was no temporary file in use + else // there was no temporary file in use { //! we still need to close the model and doc shell manually //! because there is no automatism that will do that later. @@ -740,7 +740,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( aCurOutputURL = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); } } - else // default empty document without URL + else // default empty document without URL { if (!aCurOutputURL.getLength()) throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "OutputURL is not set and can not be obtained." ) ), static_cast < cppu::OWeakObject * > ( this ) ); @@ -832,7 +832,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( pMgr->SetMailMergeEvtSrc( pOldSrc ); if ( xCurModel.get() != xModel.get() ) - { // in case it was a temporary model -> close it, and delete the file + { // in case it was a temporary model -> close it, and delete the file DeleteTmpFile_Impl( xCurModel, xCurDocSh, aTmpFileName ); aTmpFileName.Erase(); } |