diff options
author | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
---|---|---|
committer | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
commit | 3c1d4742e649fe9c8aed8c2817fe3e1f3364f298 (patch) | |
tree | e0c6e02c89aa9227726c9469da1001b3e29c41df /sw/source/ui/uno/unomailmerge.cxx | |
parent | c5c31e2aeaedbdf76e1f38d3c385e34f5ed875ca (diff) |
Resync to trunk, windows non-pro buildaoo/aw080
Diffstat (limited to 'sw/source/ui/uno/unomailmerge.cxx')
-rw-r--r-- | sw/source/ui/uno/unomailmerge.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 77740e822081..bb0d92981621 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -111,7 +111,7 @@ osl::Mutex & GetMailMergeMutex() enum CloseResult { eSuccess, // successfully closed - eVetoed, // vetoed, ownership transfered to the vetoing instance + eVetoed, // vetoed, ownership transferred to the vetoing instance eFailed // failed for some unknown reason }; static CloseResult CloseModelAndDocSh( @@ -279,7 +279,7 @@ namespace try { sal_Bool bDeliverOwnership = ( 0 == m_nPendingDeleteAttempts ); - // if this is our last attemt, then anybody which vetoes this has to take the consequences + // if this is our last attempt, then anybody which vetoes this has to take the consequences // (means take the ownership) m_xDocument->close( bDeliverOwnership ); bSuccess = sal_True; @@ -448,7 +448,7 @@ SwXMailMerge::~SwXMailMerge() //! because there is no automatism that will do that later. //! #120086# if ( eVetoed == CloseModelAndDocSh( xModel, xDocSh ) ) - DBG_WARNING( "owner ship transfered to vetoing object!" ); + DBG_WARNING( "owner ship transferred to vetoing object!" ); xModel = 0; xDocSh = 0; // destroy doc shell |