#89933# - Always pass unchecked mountpoints to TaskManager::endTask(...)

2 files changed, 20 insertions, 7 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 )
 {
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index 7439de7e96d4..3e0bc83ca90a 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bc.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: abi $ $Date: 2001-07-09 11:50:39 $
+ *  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
@@ -434,6 +434,8 @@ namespace fileaccess {
                 const com::sun::star::ucb::InsertCommandArgument& aInsertArgument )
             throw();
 
+        void SAL_CALL endTask( sal_Int32 CommandId );
+
         friend class ContentEventNotifier;
     };