#87187# - Added support for css::ucb::InteractiveAugmentedIOException

6 files changed, 457 insertions, 70 deletions

diff --git a/uui/source/cookiedg.src b/uui/source/cookiedg.src
index 2e5ab39d6d82..008d3833c49a 100644
--- a/uui/source/cookiedg.src
+++ b/uui/source/cookiedg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cookiedg.src,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: kz $ $Date: 2001-06-13 21:41:21 $
+ *  last change: $Author: kso $ $Date: 2001-06-22 14:06:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,6 +59,8 @@
  *
  ************************************************************************/
 
+#define __RSC
+
 #ifndef UUI_COOKIEDG_HRC
 #include <cookiedg.hrc>
 #endif
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 0849677897d4..5ef69478b608 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: iahndl.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: mav $ $Date: 2001-06-11 12:12:36 $
+ *  last change: $Author: kso $ $Date: 2001-06-22 14:06:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,6 +80,9 @@
 #ifndef _COM_SUN_STAR_UCB_HANDLECOOKIESREQUEST_HPP_
 #include <com/sun/star/ucb/HandleCookiesRequest.hpp>
 #endif
+#ifndef _COM_SUN_STAR_UCB_INTERACTIVEAUGMENTEDIOEXCEPTION_HPP_
+#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
+#endif
 #ifndef _COM_SUN_STAR_UCB_INTERACTIVEBADTRANSFERURLEXCEPTION_HPP_
 #include <com/sun/star/ucb/InteractiveBadTransferURLException.hpp>
 #endif
@@ -89,9 +92,6 @@
 #ifndef _COM_SUN_STAR_UCB_INTERACTIVEFILEIOEXCEPTION_HPP_
 #include <com/sun/star/ucb/InteractiveFileIOException.hpp>
 #endif
-#ifndef _COM_SUN_STAR_UCB_INTERACTIVEIOEXCEPTION_HPP_
-#include <com/sun/star/ucb/InteractiveIOException.hpp>
-#endif
 #ifndef _COM_SUN_STAR_UCB_INTERACTIVENETWORKCONNECTEXCEPTION_HPP_
 #include <com/sun/star/ucb/InteractiveNetworkConnectException.hpp>
 #endif
@@ -654,45 +654,6 @@ UUIInteractionHandler::handle(
         if (!bAbort)
             return;
 
-        static sal_uInt32 const aID[ucb::IOErrorCode_WRONG_VERSION + 1]
-            = { ERRCODE_IO_ABORT, // ABORT
-                ERRCODE_IO_ACCESSDENIED, // ACCESS_DENIED
-                ERRCODE_IO_ALREADYEXISTS, // ALREADY_EXISTING
-                ERRCODE_IO_BADCRC, // BAD_CRC
-                ERRCODE_IO_CANTCREATE, // CANT_CREATE
-                ERRCODE_IO_CANTREAD, // CANT_READ
-                ERRCODE_IO_CANTSEEK, // CANT_SEEK
-                ERRCODE_IO_CANTTELL, // CANT_TELL
-                ERRCODE_IO_CANTWRITE, // CANT_WRITE
-                ERRCODE_IO_CURRENTDIR, // CURRENT_DIRECTORY
-                ERRCODE_IO_DEVICENOTREADY, // DEVICE_NOT_READY
-                ERRCODE_IO_NOTSAMEDEVICE, // DIFFERENT_DEVICES
-                ERRCODE_IO_GENERAL, // GENERAL
-                ERRCODE_IO_INVALIDACCESS, // INVALID_ACCESS
-                ERRCODE_IO_INVALIDCHAR, // INVALID_CHARACTER
-                ERRCODE_IO_INVALIDDEVICE, // INVALID_DEVICE
-                ERRCODE_IO_INVALIDLENGTH, // INVALID_LENGTH
-                ERRCODE_IO_INVALIDPARAMETER, // INVALID_PARAMETER
-                ERRCODE_IO_ISWILDCARD, // IS_WILDCARD
-                ERRCODE_IO_LOCKVIOLATION, // LOCKING_VIOLATION
-                ERRCODE_IO_MISPLACEDCHAR, // MISPLACED_CHARACTER
-                ERRCODE_IO_NAMETOOLONG, // NAME_TOO_LONG
-                ERRCODE_IO_NOTEXISTS, // NOT_EXISTING
-                ERRCODE_IO_NOTEXISTSPATH, // NOT_EXISTING_PATH
-                ERRCODE_IO_NOTSUPPORTED, // NOT_SUPPORTED
-                ERRCODE_IO_NOTADIRECTORY, // NO_DIRECTORY
-                ERRCODE_IO_NOTAFILE, // NO_FILE
-                ERRCODE_IO_OUTOFSPACE, // OUT_OF_DISK_SPACE
-                ERRCODE_IO_TOOMANYOPENFILES, // OUT_OF_FILE_HANDLES
-                ERRCODE_IO_OUTOFMEMORY, // OUT_OF_MEMORY
-                ERRCODE_IO_PENDING, // PENDING
-                ERRCODE_IO_RECURSIVE, // RECURSIVE
-                ERRCODE_IO_UNKNOWN, // UNKNOWN
-                ERRCODE_IO_WRITEPROTECTED, // WRITE_PROTECTED
-                ERRCODE_IO_WRONGFORMAT, // WRONG_FORMAT
-                ERRCODE_IO_WRONGVERSION }; // WRONG_VERSION
-        nErrorID = aID[aIOException.Code];
-
         nErrorFlags = ERRCODE_BUTTON_OK;
         switch (eClassification)
         {
@@ -713,22 +674,169 @@ UUIInteractionHandler::handle(
                 break;
         }
 
-        ucb::InteractiveFileIOException aFileIOException;
-        if (aTheRequest >>= aFileIOException)
+        eExecute = EXECUTE_IGNORE_RESULT;
+
+        ucb::InteractiveAugmentedIOException aAugmentedIOException;
+        if (aTheRequest >>= aAugmentedIOException)
         {
-            vos::OGuard aGuard(Application::GetSolarMutex());
+            static sal_uInt32 const aID[ucb::IOErrorCode_WRONG_VERSION + 1]
+                = { ERRCODE_UUI_IO_ABORT, // ABORT
+                    ERRCODE_UUI_IO_ACCESSDENIED, // ACCESS_DENIED
+                    ERRCODE_UUI_IO_ALREADYEXISTS, // ALREADY_EXISTING
+                    ERRCODE_UUI_IO_BADCRC, // BAD_CRC
+                    ERRCODE_UUI_IO_CANTCREATE, // CANT_CREATE
+                    ERRCODE_UUI_IO_CANTREAD, // CANT_READ
+                    ERRCODE_UUI_IO_CANTSEEK, // CANT_SEEK
+                    ERRCODE_UUI_IO_CANTTELL, // CANT_TELL
+                    ERRCODE_UUI_IO_CANTWRITE, // CANT_WRITE
+                    ERRCODE_UUI_IO_CURRENTDIR, // CURRENT_DIRECTORY
+                    ERRCODE_UUI_IO_DEVICENOTREADY, // DEVICE_NOT_READY
+                    ERRCODE_UUI_IO_NOTSAMEDEVICE, // DIFFERENT_DEVICES
+                    ERRCODE_UUI_IO_GENERAL, // GENERAL
+                    ERRCODE_UUI_IO_INVALIDACCESS, // INVALID_ACCESS
+                    ERRCODE_UUI_IO_INVALIDCHAR, // INVALID_CHARACTER
+                    ERRCODE_UUI_IO_INVALIDDEVICE, // INVALID_DEVICE
+                    ERRCODE_UUI_IO_INVALIDLENGTH, // INVALID_LENGTH
+                    ERRCODE_UUI_IO_INVALIDPARAMETER, // INVALID_PARAMETER
+                    ERRCODE_UUI_IO_ISWILDCARD, // IS_WILDCARD
+                    ERRCODE_UUI_IO_LOCKVIOLATION, // LOCKING_VIOLATION
+                    ERRCODE_UUI_IO_MISPLACEDCHAR, // MISPLACED_CHARACTER
+                    ERRCODE_UUI_IO_NAMETOOLONG, // NAME_TOO_LONG
+                    ERRCODE_UUI_IO_NOTEXISTS, // NOT_EXISTING
+                    ERRCODE_UUI_IO_NOTEXISTSPATH, // NOT_EXISTING_PATH
+                    ERRCODE_UUI_IO_NOTSUPPORTED, // NOT_SUPPORTED
+                    ERRCODE_UUI_IO_NOTADIRECTORY, // NO_DIRECTORY
+                    ERRCODE_UUI_IO_NOTAFILE, // NO_FILE
+                    ERRCODE_UUI_IO_OUTOFSPACE, // OUT_OF_DISK_SPACE
+                    ERRCODE_UUI_IO_TOOMANYOPENFILES, // OUT_OF_FILE_HANDLES
+                    ERRCODE_UUI_IO_OUTOFMEMORY, // OUT_OF_MEMORY
+                    ERRCODE_UUI_IO_PENDING, // PENDING
+                    ERRCODE_UUI_IO_RECURSIVE, // RECURSIVE
+                    ERRCODE_UUI_IO_UNKNOWN, // UNKNOWN
+                    ERRCODE_UUI_IO_WRITEPROTECTED, // WRITE_PROTECTED
+                    ERRCODE_UUI_IO_WRONGFORMAT, // WRONG_FORMAT
+                    ERRCODE_UUI_IO_WRONGVERSION }; // WRONG_VERSION
+
+            switch ( aAugmentedIOException.Code )
+            {
+                case ucb::IOErrorCode_CANT_CREATE:
+                case ucb::IOErrorCode_DIFFERENT_DEVICES:
+                {
+                    if ( aAugmentedIOException.Arguments.getLength() < 2 )
+                    {
+                        OSL_ENSURE( sal_False,
+                                    "UUIInteractionHandler::handle - "
+                                    "Too few arguments!" );
+                        return;
+                    }
 
-            ResMgr * pManager
-                = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui));
-            UniString aTheContext(ResId(STR_ERROR_FILEIO, pManager));
-            delete pManager;
+                    rtl::OUString aArg1;
+                    if ( !( aAugmentedIOException.Arguments[ 0 ] >>= aArg1 ) )
+                    {
+                        OSL_ENSURE( sal_False,
+                                    "UUIInteractionHandler::handle - "
+                                    "First argument must be a string!" );
+                        return;
+                    }
+
+                    rtl::OUString aArg2;
+                    if ( !( aAugmentedIOException.Arguments[ 0 ] >>= aArg2 ) )
+                    {
+                        OSL_ENSURE( sal_False,
+                                    "UUIInteractionHandler::handle - "
+                                    "Second argument must be a string!" );
+                        return;
+                    }
+
+                    nErrorID = *new TwoStringErrorInfo(
+                                        aID[ aAugmentedIOException.Code ],
+                                        aArg1,
+                                        aArg2 );
+                    break;
+                }
 
-            aTheContext.SearchAndReplaceAscii("($URL1)",
-                                              aFileIOException.FileName);
-            pContext = new SimpleErrorContext(aTheContext);
+                default:
+                {
+                    if ( aAugmentedIOException.Arguments.getLength() < 1 )
+                    {
+                        OSL_ENSURE( sal_False,
+                                    "UUIInteractionHandler::handle - "
+                                    "Too few arguments!" );
+                        return;
+                    }
+
+                    rtl::OUString aArg;
+                    if ( !( aAugmentedIOException.Arguments[ 0 ] >>= aArg ) )
+                    {
+                        OSL_ENSURE( sal_False,
+                                    "UUIInteractionHandler::handle - "
+                                    "First argument must be a string!" );
+                        return;
+                    }
+
+                    nErrorID = *new StringErrorInfo(
+                                        aID[ aAugmentedIOException.Code ],
+                                        aArg );
+                    break;
+                }
+            }
         }
+        else
+        {
+            static sal_uInt32 const aID[ucb::IOErrorCode_WRONG_VERSION + 1]
+                = { ERRCODE_IO_ABORT, // ABORT
+                    ERRCODE_IO_ACCESSDENIED, // ACCESS_DENIED
+                    ERRCODE_IO_ALREADYEXISTS, // ALREADY_EXISTING
+                    ERRCODE_IO_BADCRC, // BAD_CRC
+                    ERRCODE_IO_CANTCREATE, // CANT_CREATE
+                    ERRCODE_IO_CANTREAD, // CANT_READ
+                    ERRCODE_IO_CANTSEEK, // CANT_SEEK
+                    ERRCODE_IO_CANTTELL, // CANT_TELL
+                    ERRCODE_IO_CANTWRITE, // CANT_WRITE
+                    ERRCODE_IO_CURRENTDIR, // CURRENT_DIRECTORY
+                    ERRCODE_IO_DEVICENOTREADY, // DEVICE_NOT_READY
+                    ERRCODE_IO_NOTSAMEDEVICE, // DIFFERENT_DEVICES
+                    ERRCODE_IO_GENERAL, // GENERAL
+                    ERRCODE_IO_INVALIDACCESS, // INVALID_ACCESS
+                    ERRCODE_IO_INVALIDCHAR, // INVALID_CHARACTER
+                    ERRCODE_IO_INVALIDDEVICE, // INVALID_DEVICE
+                    ERRCODE_IO_INVALIDLENGTH, // INVALID_LENGTH
+                    ERRCODE_IO_INVALIDPARAMETER, // INVALID_PARAMETER
+                    ERRCODE_IO_ISWILDCARD, // IS_WILDCARD
+                    ERRCODE_IO_LOCKVIOLATION, // LOCKING_VIOLATION
+                    ERRCODE_IO_MISPLACEDCHAR, // MISPLACED_CHARACTER
+                    ERRCODE_IO_NAMETOOLONG, // NAME_TOO_LONG
+                    ERRCODE_IO_NOTEXISTS, // NOT_EXISTING
+                    ERRCODE_IO_NOTEXISTSPATH, // NOT_EXISTING_PATH
+                    ERRCODE_IO_NOTSUPPORTED, // NOT_SUPPORTED
+                    ERRCODE_IO_NOTADIRECTORY, // NO_DIRECTORY
+                    ERRCODE_IO_NOTAFILE, // NO_FILE
+                    ERRCODE_IO_OUTOFSPACE, // OUT_OF_DISK_SPACE
+                    ERRCODE_IO_TOOMANYOPENFILES, // OUT_OF_FILE_HANDLES
+                    ERRCODE_IO_OUTOFMEMORY, // OUT_OF_MEMORY
+                    ERRCODE_IO_PENDING, // PENDING
+                    ERRCODE_IO_RECURSIVE, // RECURSIVE
+                    ERRCODE_IO_UNKNOWN, // UNKNOWN
+                    ERRCODE_IO_WRITEPROTECTED, // WRITE_PROTECTED
+                    ERRCODE_IO_WRONGFORMAT, // WRONG_FORMAT
+                    ERRCODE_IO_WRONGVERSION }; // WRONG_VERSION
+            nErrorID = aID[aIOException.Code];
+
+            ucb::InteractiveFileIOException aFileIOException;
+            if (aTheRequest >>= aFileIOException)
+            {
+                vos::OGuard aGuard(Application::GetSolarMutex());
 
-        eExecute = EXECUTE_IGNORE_RESULT;
+                ResMgr * pManager
+                    = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui));
+                UniString aTheContext(ResId(STR_ERROR_FILEIO, pManager));
+                delete pManager;
+
+                aTheContext.SearchAndReplaceAscii("($URL1)",
+                                                aFileIOException.FileName);
+                pContext = new SimpleErrorContext(aTheContext);
+            }
+        }
     }
     else if (aTheRequest >>= aNetworkException)
     {
@@ -917,6 +1025,10 @@ USHORT executeErrorDialog(ULONG nID, USHORT nMask)
                               ERRCODE_AREA_CHAOS_END, pManager2);
         // cf. chaos/source/inc/cntrids.hrc, where
         // #define RID_CHAOS_ERRHDL (RID_CHAOS_START + 12)
+    ResMgr * pManager3 = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui));
+    SfxErrorHandler * pHandler3
+        = new SfxErrorHandler(RID_UUI_ERRHDL, ERRCODE_AREA_UUI,
+                              ERRCODE_AREA_UUI_END, pManager3);
 
     // Needed because within ErrorHandler::HandleError() ResIds are created
     // without a ResMgr---they require a default ResMgr:
@@ -927,6 +1039,8 @@ USHORT executeErrorDialog(ULONG nID, USHORT nMask)
 
     Resource::SetResManager(pDefaultManager);
 
+    delete pHandler3;
+    delete pManager3;
     delete pHandler2;
     delete pManager2;
     delete pHandler1;
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index b989391e56c2..00e1df2939e9 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ids.hrc,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: sb $ $Date: 2000-11-10 10:57:09 $
+ *  last change: $Author: kso $ $Date: 2001-06-22 14:06:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,12 +62,16 @@
 //
 //  The UUI Resources
 //
-// $Author: sb $ $Date: 2000-11-10 10:57:09 $ $Revision: 1.2 $
+// $Author: kso $ $Date: 2001-06-22 14:06:59 $ $Revision: 1.3 $
 //============================================================================
 
 #ifndef UUI_IDS_HRC
 #define UUI_IDS_HRC
 
+#ifndef _ERRCODE_HXX
+#include <tools/errcode.hxx>
+#endif
+
 #ifndef _SOLAR_HRC
 #include <svtools/solar.hrc>
 #endif
@@ -87,6 +91,50 @@
 #define STR_ERROR_WRONGMEDIUM (RID_UUI_START + 11)
 
 //============================================================================
+// errors
+#define RID_UUI_ERRHDL                    (RID_UUI_START + 20)
+
+//============================================================================
+// IO errors ( for use with css::ucb::InteractiveAugmentedIOException )
+
+#define ERRCODE_UUI_IO_ABORT              (ERRCODE_AREA_UUI +  0)
+#define ERRCODE_UUI_IO_ACCESSDENIED       (ERRCODE_AREA_UUI +  1)
+#define ERRCODE_UUI_IO_ALREADYEXISTS      (ERRCODE_AREA_UUI +  2)
+#define ERRCODE_UUI_IO_BADCRC             (ERRCODE_AREA_UUI +  3)
+#define ERRCODE_UUI_IO_CANTCREATE         (ERRCODE_AREA_UUI +  4)
+#define ERRCODE_UUI_IO_CANTREAD           (ERRCODE_AREA_UUI +  5)
+#define ERRCODE_UUI_IO_CANTSEEK           (ERRCODE_AREA_UUI +  6)
+#define ERRCODE_UUI_IO_CANTTELL           (ERRCODE_AREA_UUI +  7)
+#define ERRCODE_UUI_IO_CANTWRITE          (ERRCODE_AREA_UUI +  8)
+#define ERRCODE_UUI_IO_CURRENTDIR         (ERRCODE_AREA_UUI +  9)
+#define ERRCODE_UUI_IO_DEVICENOTREADY     (ERRCODE_AREA_UUI + 10)
+#define ERRCODE_UUI_IO_NOTSAMEDEVICE      (ERRCODE_AREA_UUI + 11)
+#define ERRCODE_UUI_IO_GENERAL            (ERRCODE_AREA_UUI + 12)
+#define ERRCODE_UUI_IO_INVALIDACCESS      (ERRCODE_AREA_UUI + 13)
+#define ERRCODE_UUI_IO_INVALIDCHAR        (ERRCODE_AREA_UUI + 14)
+#define ERRCODE_UUI_IO_INVALIDDEVICE      (ERRCODE_AREA_UUI + 15)
+#define ERRCODE_UUI_IO_INVALIDLENGTH      (ERRCODE_AREA_UUI + 16)
+#define ERRCODE_UUI_IO_INVALIDPARAMETER   (ERRCODE_AREA_UUI + 17)
+#define ERRCODE_UUI_IO_ISWILDCARD         (ERRCODE_AREA_UUI + 18)
+#define ERRCODE_UUI_IO_LOCKVIOLATION      (ERRCODE_AREA_UUI + 19)
+#define ERRCODE_UUI_IO_MISPLACEDCHAR      (ERRCODE_AREA_UUI + 20)
+#define ERRCODE_UUI_IO_NAMETOOLONG        (ERRCODE_AREA_UUI + 21)
+#define ERRCODE_UUI_IO_NOTEXISTS          (ERRCODE_AREA_UUI + 22)
+#define ERRCODE_UUI_IO_NOTEXISTSPATH      (ERRCODE_AREA_UUI + 23)
+#define ERRCODE_UUI_IO_NOTSUPPORTED       (ERRCODE_AREA_UUI + 24)
+#define ERRCODE_UUI_IO_NOTADIRECTORY      (ERRCODE_AREA_UUI + 25)
+#define ERRCODE_UUI_IO_NOTAFILE           (ERRCODE_AREA_UUI + 26)
+#define ERRCODE_UUI_IO_OUTOFSPACE         (ERRCODE_AREA_UUI + 27)
+#define ERRCODE_UUI_IO_TOOMANYOPENFILES   (ERRCODE_AREA_UUI + 28)
+#define ERRCODE_UUI_IO_OUTOFMEMORY        (ERRCODE_AREA_UUI + 29)
+#define ERRCODE_UUI_IO_PENDING            (ERRCODE_AREA_UUI + 30)
+#define ERRCODE_UUI_IO_RECURSIVE          (ERRCODE_AREA_UUI + 31)
+#define ERRCODE_UUI_IO_UNKNOWN            (ERRCODE_AREA_UUI + 32)
+#define ERRCODE_UUI_IO_WRITEPROTECTED     (ERRCODE_AREA_UUI + 33)
+#define ERRCODE_UUI_IO_WRONGFORMAT        (ERRCODE_AREA_UUI + 34)
+#define ERRCODE_UUI_IO_WRONGVERSION       (ERRCODE_AREA_UUI + 35)
+
+//============================================================================
 #define HID_DLG_LOGIN (HID_UUI_START + 0)
 #define HID_DLG_COOKIES (HID_UUI_START + 1)
 
@@ -94,4 +142,3 @@
 // sfx2/util/hidother.src!
 
 #endif // UUI_IDS_HRC
-
diff --git a/uui/source/ids.src b/uui/source/ids.src
index 3027d8c51bc4..6176d28e2d60 100644
--- a/uui/source/ids.src
+++ b/uui/source/ids.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ids.src,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: vg $ $Date: 2001-06-08 21:41:36 $
+ *  last change: $Author: kso $ $Date: 2001-06-22 14:06:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,9 +62,11 @@
 //
 //  Miscellaneous Resources
 //
-// $Author: vg $ $Date: 2001-06-08 21:41:36 $ $Revision: 1.11 $
+// $Author: kso $ $Date: 2001-06-22 14:06:59 $ $Revision: 1.12 $
 //============================================================================
 
+#define __RSC
+
 #ifndef UUI_IDS_HRC
 #include <ids.hrc>
 #endif
@@ -177,4 +179,223 @@ String STR_ERROR_WRONGMEDIUM
     Text[ finnish ] = "Sy�t� tallennusv�line $$.";
 };
 
-
+Resource RID_UUI_ERRHDL
+{
+    // IOErrorCode_ABORT = 0,
+    String ( ERRCODE_UUI_IO_ABORT & ERRCODE_RES_MASK )
+    {
+        Text = "Die auf $(ARG1) ausgefnhrte Aktion wurde abgebrochen" ;
+        Text [ ENGLISH ] = "The operation executed on $(ARG1) was aborted" ;
+    };
+    // IOErrorCode_ACCESS_DENIED = 1,
+    String ( ERRCODE_UUI_IO_ACCESSDENIED & ERRCODE_RES_MASK )
+    {
+        Text = "Der Zugriff auf auf $(ARG1) wurde verweigert" ;
+        Text [ ENGLISH ] = "The access to $(ARG1) was denied" ;
+    };
+    // IOErrorCode_ALREADY_EXISTING = 2,
+    String ( ERRCODE_UUI_IO_ALREADYEXISTS & ERRCODE_RES_MASK )
+    {
+        Text = "$(ARG1) existiert bereits" ;
+        Text [ ENGLISH ] = "$(ARG1) does already exist" ;
+    };
+    // IOErrorCode_BAD_CRC = 3,
+    String ( ERRCODE_UUI_IO_BADCRC & ERRCODE_RES_MASK )
+    {
+        Text = "Die Daten von $(ARG1) haben eine inkorrekte Prnfsumme" ;
+        Text [ english ] = "The data of $(ARG1) have an incorrect checksum" ;
+    };
+    // IOErrorCode_CANT_CREATE = 4,
+    String ( ERRCODE_UUI_IO_CANTCREATE & ERRCODE_RES_MASK )
+    {
+        // !!! $(ARG1) can be empty!
+        Text = "Das Objekt $(ARG1) kann im Verzeichnis $(ARG2) nicht angelegt werden" ;
+        Text [ ENGLISH ] = "The object $(ARG1) could not be created in directory $(ARG2)" ;
+    };
+    // IOErrorCode_CANT_READ = 5,
+    String ( ERRCODE_UUI_IO_CANTREAD & ERRCODE_RES_MASK )
+    {
+        Text = "Daten von $(ARG1) konnten nicht gelesen werden" ;
+        Text [ ENGLISH ] = "Data of $(ARG1) could not be read" ;
+    };
+    // IOErrorCode_CANT_SEEK = 6,
+    String ( ERRCODE_UUI_IO_CANTSEEK & ERRCODE_RES_MASK )
+    {
+        Text = "Die Seek-Operation auf $(ARG1) konnte nicht ausgefnhrt werden" ;
+        Text [ ENGLISH ] = "The seek operation on $(ARG1) could not be completed" ;
+    };
+    // IOErrorCode_CANT_TELL = 7,
+    String ( ERRCODE_UUI_IO_CANTTELL & ERRCODE_RES_MASK )
+    {
+        Text = "Die Tell-Operation auf $(ARG1) konnte nicht ausgefnhrt werden" ;
+        Text [ ENGLISH ] = "The tell operation on $(ARG1) could not be completed" ;
+    };
+    // IOErrorCode_CANT_WRITE = 8,
+    String ( ERRCODE_UUI_IO_CANTWRITE & ERRCODE_RES_MASK )
+    {
+        Text = "Daten fnr $(ARG1) konnten nicht geschrieben werden" ;
+        Text [ ENGLISH ] = "Data for $(ARG1) could not be written" ;
+    };
+    // IOErrorCode_CURRENT_DIRECTORY = 9,
+    String ( ERRCODE_UUI_IO_CURRENTDIR & ERRCODE_RES_MASK )
+    {
+        Text = "Aktion unm�glich: $(ARG1) ist das aktuelle Verzeichnis" ;
+        Text [ english ] = "Action not allowed: $(ARG1) is the current directory" ;
+    };
+    // IOErrorCode_DEVICE_NOT_READY = 10,
+    String ( ERRCODE_UUI_IO_DEVICENOTREADY & ERRCODE_RES_MASK )
+    {
+        Text = "Das GerSt (Laufwerk) $(ARG1) ist nicht bereit" ;
+        Text [ english ] = "The Device (drive) $(ARG1) is not ready" ;
+    };
+    // IOErrorCode_DIFFERENT_DEVICES = 11,
+    String ( ERRCODE_UUI_IO_NOTSAMEDEVICE & ERRCODE_RES_MASK )
+    {
+        Text = "Aktion unm�glich: $(ARG1) und $(ARG2) sind verschiedene GerSte (Laufwerke)" ;
+        Text [ english ] = "Action not allowed: $(ARG1) and $(ARG2) are different devices (drives)" ;
+    };
+    // IOErrorCode_GENERAL = 12,
+    String ( ERRCODE_UUI_IO_GENERAL & ERRCODE_RES_MASK )
+    {
+        Text = "Allgemeiner Ein-/Ausgabefehler beim Zugriff auf $(ARG1)" ;
+        Text [ ENGLISH ] = "General input/output error while accessing $(ARG1)" ;
+    };
+    // IOErrorCode_INVALID_ACCESS = 13,
+    String ( ERRCODE_UUI_IO_INVALIDACCESS & ERRCODE_RES_MASK )
+    {
+        Text = "Es wurde versucht, in ungnltiger Weise auf $(ARG1) zuzugreifen" ;
+        Text [ ENGLISH ] = "An invalid attempt was made to access $(ARG1)" ;
+    };
+    // IOErrorCode_INVALID_CHARACTER = 14,
+    String ( ERRCODE_UUI_IO_INVALIDCHAR & ERRCODE_RES_MASK )
+    {
+        Text = "$(ARG1) enthSlt unzulSssige Zeichen" ;
+        Text [ ENGLISH ] = "$(ARG1) contains invalid characters" ;
+    };
+    // IOErrorCode_INVALID_DEVICE = 15,
+    String ( ERRCODE_UUI_IO_INVALIDDEVICE & ERRCODE_RES_MASK )
+    {
+        Text = "Das GerSt (Laufwerk) $(ARG1) ist ungnltig" ;
+        Text [ ENGLISH ] = "The device (drive) $(ARG1) is invalid" ;
+    };
+    // IOErrorCode_INVALID_LENGTH = 16,
+    String ( ERRCODE_UUI_IO_INVALIDLENGTH & ERRCODE_RES_MASK )
+    {
+        Text = "Die Daten von $(ARG1) haben eine ungnltige LSnge" ;
+        Text [ english ] = "The data of $(ARG1) have an invalid length" ;
+    };
+    // IOErrorCode_INVALID_PARAMETER = 17,
+    String ( ERRCODE_UUI_IO_INVALIDPARAMETER & ERRCODE_RES_MASK )
+    {
+        Text = "Die Operation auf $(ARG1) wurde mit einem ungnltigen Parameter gestartet" ;
+        Text [ ENGLISH ] = "The operation on $(ARG1) was started with an invalid parameter" ;
+    };
+    // IOErrorCode_IS_WILDCARD = 18,
+    String ( ERRCODE_UUI_IO_ISWILDCARD & ERRCODE_RES_MASK )
+    {
+        Text = "Die Operation kann nicht ausgefnhrt werden, weil $(ARG1) Wildcards enthSlt";
+        Text [ ENGLISH ] = "The operation cannot be run, because $(ARG1) contains wildcards" ;
+    };
+    // IOErrorCode_LOCKING_VIOLATION = 19,
+    String ( ERRCODE_UUI_IO_LOCKVIOLATION & ERRCODE_RES_MASK )
+    {
+        Text = "Fehler beim gemeinsamen Zugriff auf $(ARG1)" ;
+        Text [ ENGLISH ] = "Sharing violation while accessing $(ARG1)" ;
+    };
+    // IOErrorCode_MISPLACED_CHARACTER = 20,
+    String ( ERRCODE_UUI_IO_MISPLACEDCHAR & ERRCODE_RES_MASK )
+    {
+        Text = "$(ARG1) enthSlt Zeichen an unzulSssiger Position" ;
+        Text [ ENGLISH ] = "$(ARG1) contains misplaced characters" ;
+    };
+    // IOErrorCode_NAME_TOO_LONG = 21,
+    String ( ERRCODE_UUI_IO_NAMETOOLONG & ERRCODE_RES_MASK )
+    {
+        Text = "Der Name $(ARG1) enthSlt zu viele Zeichen" ;
+        Text [ ENGLISH ] = "The name $(ARG1) contains to many characters" ;
+    };
+    // IOErrorCode_NOT_EXISTING = 22,
+    String ( ERRCODE_UUI_IO_NOTEXISTS & ERRCODE_RES_MASK )
+    {
+        Text = "$(ARG1) existiert nicht" ;
+        Text [ ENGLISH ] = "$(ARG1) does not exist" ;
+    };
+    // IOErrorCode_NOT_EXISTING_PATH = 23,
+    String ( ERRCODE_UUI_IO_NOTEXISTSPATH & ERRCODE_RES_MASK )
+    {
+        Text = "Der Pfad $(ARG1) existiert nicht" ;
+        Text [ ENGLISH ] = "The path $(ARG1) does not exist" ;
+    };
+    // IOErrorCode_NOT_SUPPORTED = 24,
+    String ( ERRCODE_UUI_IO_NOTSUPPORTED & ERRCODE_RES_MASK )
+    {
+        Text = "Die Operation auf $(ARG1) wird auf dem vorliegenden Betriebssystem nicht unterstntzt" ;
+        Text [ ENGLISH ] = "The operation on $(ARG1) is not supported on this operating system" ;
+    };
+    // IOErrorCode_NO_DIRECTORY = 25,
+    String ( ERRCODE_UUI_IO_NOTADIRECTORY & ERRCODE_RES_MASK )
+    {
+        Text = "$(ARG1) ist kein Verzeichnis" ;
+        Text [ ENGLISH ] = "$(ARG1) is not a directory" ;
+    };
+    // IOErrorCode_NO_FILE = 26,
+    String ( ERRCODE_UUI_IO_NOTAFILE & ERRCODE_RES_MASK )
+    {
+        Text = "$(ARG1) ist keine Datei" ;
+        Text [ ENGLISH ] = "$(ARG1) is not a file" ;
+    };
+    // IOErrorCode_OUT_OF_DISK_SPACE = 27,
+    String ( ERRCODE_UUI_IO_OUTOFSPACE & ERRCODE_RES_MASK )
+    {
+        Text = "Auf dem GerSt $(ARG1) ist kein Platz mehr vorhanden" ;
+        Text [ ENGLISH ] = "There was no space left on device $(ARG1)" ;
+    };
+    // IOErrorCode_OUT_OF_FILE_HANDLES = 28,
+    String ( ERRCODE_UUI_IO_TOOMANYOPENFILES & ERRCODE_RES_MASK )
+    {
+        Text = "Die Operation auf $(ARG1) kann nicht ausgefnhrt werden, da bereits zu viele Dateien ge�ffnet sind" ;
+        Text [ ENGLISH ] = "The operation on $(ARG1) can't be completed because there are too many open files" ;
+    };
+    // IOErrorCode_OUT_OF_MEMORY = 29,
+    String ( ERRCODE_UUI_IO_OUTOFMEMORY & ERRCODE_RES_MASK )
+    {
+        Text = "Die Operation auf $(ARG1) kann nicht ausgefnhrt werden, da kein Speicher mehr zur Verfngung steht" ;
+        Text [ ENGLISH ] = "The operation on $(ARG1) can't be completed because there is no more memory available" ;
+    };
+    // IOErrorCode_PENDING = 30,
+    String ( ERRCODE_UUI_IO_PENDING & ERRCODE_RES_MASK )
+    {
+        Text = "Die Operation auf $(ARG1) kann nicht fortgesetzt werden, weil weitere Daten erwartet werden" ;
+        Text [ ENGLISH ] = "The operation on $(ARG1) cannot continue, because there are pending data" ;
+    };
+    // IOErrorCode_RECURSIVE = 31,
+    String ( ERRCODE_UUI_IO_RECURSIVE & ERRCODE_RES_MASK )
+    {
+        Text = "$(ARG1) kann nicht in sich selbst kopiert werden" ;
+        Text [ ENGLISH ] = "$(ARG1) cannot be copied into itself" ;
+    };
+    // IOErrorCode_UNKNOWN = 32,
+    String ( ERRCODE_UUI_IO_UNKNOWN & ERRCODE_RES_MASK )
+    {
+        Text = "Unbekannter Ein-/Ausgabefehler beim Zugriff auf $(ARG1)" ;
+        Text [ ENGLISH ] = "Unknown input/output error while accessing $(ARG1)" ;
+    };
+    // IOErrorCode_WRITE_PROTECTED = 33,
+    String ( ERRCODE_UUI_IO_WRITEPROTECTED & ERRCODE_RES_MASK )
+    {
+        Text = "$(ARG1) ist schreibgeschntzt" ;
+        Text [ english ] = "$(ARG1) is write protected" ;
+    };
+    // IOErrorCode_WRONG_FORMAT = 34,
+    String ( ERRCODE_UUI_IO_WRONGFORMAT & ERRCODE_RES_MASK )
+    {
+        Text = "$(ARG1) liegt in einem falschen Format vor" ;
+        Text [ ENGLISH ] = "$(ARG1) has an incorrect format" ;
+    };
+    // IOErrorCode_WRONG_VERSION = 35,
+    String ( ERRCODE_UUI_IO_WRONGVERSION & ERRCODE_RES_MASK )
+    {
+        Text = "$(ARG1) liegt in einer falschen Version vor" ;
+        Text [ ENGLISH ] = "$(ARG1) has an incorrect version" ;
+    };
+};
diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src
index d1b9c895749c..432b09a7c257 100644
--- a/uui/source/logindlg.src
+++ b/uui/source/logindlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: logindlg.src,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: vg $ $Date: 2001-06-08 21:43:18 $
+ *  last change: $Author: kso $ $Date: 2001-06-22 14:06:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,6 +59,8 @@
  *
  ************************************************************************/
 
+#define __RSC
+
 #ifndef UUI_IDS_HRC
 #include <ids.hrc>
 #endif
diff --git a/uui/util/uui.xml b/uui/util/uui.xml
index 94d8e8502489..9c17bf02d2c3 100644
--- a/uui/util/uui.xml
+++ b/uui/util/uui.xml
@@ -43,6 +43,7 @@
         <type> com.sun.star.task.XInteractionRetry                     </type>
         <type> com.sun.star.ucb.AuthenticationRequest                  </type>
         <type> com.sun.star.ucb.HandleCookiesRequest                   </type>
+        <type> com.sun.star.ucb.InteractiveAugmentedIOException        </type>
         <type> com.sun.star.ucb.InteractiveBadTransferURLException     </type>
         <type> com.sun.star.ucb.InteractiveCHAOSException              </type>
         <type> com.sun.star.ucb.InteractiveFileIOException             </type>
@@ -64,9 +65,9 @@
     <project-build-dependency> svtools            </project-build-dependency>
     <project-build-dependency> vcl                </project-build-dependency>
 
-    <runtime-module-dependency> sal2          </runtime-module-dependency>
-    <runtime-module-dependency> cppu2         </runtime-module-dependency>
-    <runtime-module-dependency> cppuhelper2$(COM) </runtime-module-dependency>
+    <runtime-module-dependency> sal3              </runtime-module-dependency>
+    <runtime-module-dependency> cppu3             </runtime-module-dependency>
+    <runtime-module-dependency> cppuhelper3$(COM) </runtime-module-dependency>
     <runtime-module-dependency> tl                </runtime-module-dependency>
     <runtime-module-dependency> svt               </runtime-module-dependency>
     <runtime-module-dependency> vcl               </runtime-module-dependency>