diff options
author | Kai Sommerfeld <kso@openoffice.org> | 2001-07-27 12:28:35 +0000 |
---|---|---|
committer | Kai Sommerfeld <kso@openoffice.org> | 2001-07-27 12:28:35 +0000 |
commit | 2d55a5d7b28689d65453df7f2866c026e08e3ded (patch) | |
tree | 6ba634c6f2840cc6c054cdcb12f63b7e26136125 /ucb/source/ucp/file/bc.cxx | |
parent | cad6e10264322eef1037068aa6222661c7e5f12e (diff) |
#89933# - Always pass unchecked mountpoints to TaskManager::endTask(...)
Diffstat (limited to 'ucb/source/ucp/file/bc.cxx')
-rw-r--r-- | ucb/source/ucp/file/bc.cxx | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index d20ca8140ef4..6aa4b2065a84 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bc.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: hro $ $Date: 2001-07-27 07:54:21 $ + * last change: $Author: kso $ $Date: 2001-07-27 13:28:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -472,7 +472,7 @@ BaseContent::execute( const Command& aCommand, // This is the only function allowed to throw an exception - m_pMyShell->endTask( CommandId,m_aUncPath ); + endTask( CommandId ); return aAny; } @@ -985,8 +985,7 @@ BaseContent::setPropertyValues( try { - m_pMyShell->endTask( nMyCommandIdentifier, - m_aUncPath ); + endTask( nMyCommandIdentifier ); } catch( const Exception& e ) { @@ -1266,6 +1265,18 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier, +void SAL_CALL BaseContent::endTask( sal_Int32 CommandId ) +{ + rtl::OUString aRedirectedPath; + if ( !m_pMyShell->uncheckMountPoint( m_aUncPath, aRedirectedPath ) ) + aRedirectedPath = m_aUncPath; + + // This is the only function allowed to throw an exception + m_pMyShell->endTask( CommandId,aRedirectedPath ); +} + + + ContentEventNotifier* BaseContent::cDEL( void ) { |