#90331# now filling the exception members

ucb/source/ucp/file/bc.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bc.cxx,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: abi $ $Date: 2001-11-19 17:09:21 $
+ *  last change: $Author: abi $ $Date: 2002-10-31 16:24:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1063,13 +1063,17 @@ BaseContent::open(
                                        aCommandArgument.Properties,
                                        aCommandArgument.SortingInfo );
         }
-        else if(  aCommandArgument.Mode == OpenMode::DOCUMENT_SHARE_DENY_NONE  ||
-                  aCommandArgument.Mode == OpenMode::DOCUMENT_SHARE_DENY_WRITE )
-            m_pMyShell->installError( nMyCommandIdentifier,
-                                      TASKHANDLING_UNSUPPORTED_OPEN_MODE );
+//          else if(  aCommandArgument.Mode ==
+//                    OpenMode::DOCUMENT_SHARE_DENY_NONE  ||
+//                    aCommandArgument.Mode ==
+//                    OpenMode::DOCUMENT_SHARE_DENY_WRITE )
+//              m_pMyShell->installError( nMyCommandIdentifier,
+//                                        TASKHANDLING_UNSUPPORTED_OPEN_MODE,
+//                                        aCommandArgument.Mode);
         else
             m_pMyShell->installError( nMyCommandIdentifier,
-                                      TASKHANDLING_UNSUPPORTED_OPEN_MODE );
+                                      TASKHANDLING_UNSUPPORTED_OPEN_MODE,
+                                      aCommandArgument.Mode);
     }
 
     return retValue;
@@ -1298,7 +1302,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
 void SAL_CALL BaseContent::endTask( sal_Int32 CommandId )
 {
     // This is the only function allowed to throw an exception
-    m_pMyShell->endTask( m_pMyShell,CommandId,m_aUncPath );
+    m_pMyShell->endTask( m_pMyShell,CommandId,m_aUncPath,this );
 }
 
 

ucb/source/ucp/file/filglob.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filglob.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: abi $ $Date: 2001-11-19 11:11:29 $
+ *  last change: $Author: abi $ $Date: 2002-10-31 16:24:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,6 +75,7 @@
 namespace fileaccess {
 
     class shell;
+    class BaseContent;
 
     struct equalOUString
     {
@@ -163,6 +164,7 @@ namespace fileaccess {
                                const com::sun::star::uno::Reference<
                                com::sun::star::ucb::XCommandEnvironment >& xEnv,
                                const rtl::OUString& aUncPath,
+                               BaseContent* pContent,
                                bool isHandled = false);
                                    // the physical URL of the object
 

ucb/source/ucp/file/filtask.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filtask.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: abi $ $Date: 2001-11-19 11:11:29 $
+ *  last change: $Author: abi $ $Date: 2002-10-31 16:24:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -112,7 +112,8 @@ TaskManager::startTask(
 void SAL_CALL
 TaskManager::endTask( shell * pShell,
                       sal_Int32 CommandId,
-                      const rtl::OUString& aUncPath )
+                      const rtl::OUString& aUncPath,
+                      BaseContent* pContent)
 {
     vos::OGuard aGuard( m_aMutex );
     TaskMap::iterator it = m_aTaskMap.find( CommandId );
@@ -128,7 +129,14 @@ TaskManager::endTask( shell * pShell,
     m_aTaskMap.erase( it );
 
     if( ErrorCode != TASKHANDLER_NO_ERROR )
-        throw_handler( pShell,ErrorCode,MinorCode,xComEnv,aUncPath,isHandled );
+        throw_handler(
+            pShell,
+            ErrorCode,
+            MinorCode,
+            xComEnv,
+            aUncPath,
+            pContent,
+            isHandled);
 }
 
 

ucb/source/ucp/file/filtask.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filtask.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: abi $ $Date: 2001-11-19 11:11:29 $
+ *  last change: $Author: abi $ $Date: 2002-10-31 16:24:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,6 +95,7 @@
 namespace fileaccess
 {
     class shell;
+    class BaseContent;
 
     /*
      * This implementation is inherited by class fileaccess::shell.
@@ -260,8 +261,10 @@ namespace fileaccess
 
         void SAL_CALL endTask( shell * pShell, // must not be null
                                sal_Int32 CommandId,
-                               const rtl::OUString& aUnqPath );
                                // the physical URL of the object
+                               const rtl::OUString& aUnqPath,
+                               BaseContent* pContent);
+
 
         /**
          *  Handles an interactionrequest

ucb/source/ucp/file/shell.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: shell.cxx,v $
  *
- *  $Revision: 1.71 $
+ *  $Revision: 1.72 $
  *
- *  last change: $Author: pl $ $Date: 2002-05-13 17:02:56 $
+ *  last change: $Author: abi $ $Date: 2002-10-31 16:24:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1262,10 +1262,11 @@ shell::move( sal_Int32 CommandId,
             }
             break;
         }
-    case NameClash::ASK:
-    default:
+        case NameClash::ASK:
+        default:
         installError( CommandId,
-                      TASKHANDLING_NAMECLASHSUPPORT_FOR_MOVE );
+                      TASKHANDLING_NAMECLASHSUPPORT_FOR_MOVE,
+                      NameClash::ASK);
         return;
         break;
     }
@@ -1461,7 +1462,8 @@ shell::copy(
         default:
         {
             installError( CommandId,
-                          TASKHANDLING_NAMECLASHSUPPORT_FOR_COPY );
+                          TASKHANDLING_NAMECLASHSUPPORT_FOR_COPY,
+                          NameClash::ASK);
             return;
             break;
         }