INTEGRATION: CWS relocinst (1.16.22); FILE MERGED

2004/04/22 11:31:17 kso 1.16.22.1: #116448# - Does no longer use ooSetupInstallPath and OfficeInstall config items.
- removed mountpoints support (not needed any longer).
CVS: ----------------------------------------------------------------------

1 files changed, 15 insertions, 35 deletions

diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index 2cb0781347b0..e7000999f949 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filglob.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: vg $ $Date: 2003-12-17 17:41:16 $
+ *  last change: $Author: hr $ $Date: 2004-05-10 14:21:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -162,23 +162,16 @@ namespace {
         rtl::OUString aResourceName;
         rtl::OUString aResourceType;
         sal_Bool      bRemovable;
-        bool bUri = false;
         bool bResourceName = false;
         bool bResourceType = false;
         bool bRemoveProperty = false;
 
-        if (pShell->uncheckMountPoint(rPhysicalUrl, aUri))
-        {
-            bUri = true;
-            // For security reasons, exhibit the system path only if it is not
-            // subject to mount point mapping:
-            if (rPhysicalUrl == aUri
-                && osl::FileBase::getSystemPathFromFileURL(
-                    rPhysicalUrl,
-                    aResourceName)
-                == osl::FileBase::E_None)
-                bResourceName = true;
-        }
+        if (rPhysicalUrl == aUri
+            && osl::FileBase::getSystemPathFromFileURL(
+                rPhysicalUrl,
+                aResourceName)
+            == osl::FileBase::E_None)
+            bResourceName = true;
 
         // The resource types "folder" (i.e., directory) and
         // "volume" seem to be
@@ -216,18 +209,17 @@ namespace {
                 }
         }
 
-        Sequence< Any > aArguments( (bUri ? 1 : 0)              +
+        Sequence< Any > aArguments( 1              +
                                     (bResourceName ? 1 : 0)     +
                                     (bResourceType ? 1 : 0)     +
                                     (bRemoveProperty ? 1 : 0) );
         sal_Int32 i = 0;
-        if (bUri)
-            aArguments[i++]
-                <<= PropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                    "Uri")),
-                                  -1,
-                                  makeAny(aUri),
-                                  PropertyState_DIRECT_VALUE);
+        aArguments[i++]
+            <<= PropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Uri")),
+                              -1,
+                              makeAny(aUri),
+                              PropertyState_DIRECT_VALUE);
         if (bResourceName)
             aArguments[i++]
                 <<= PropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
@@ -930,18 +922,6 @@ namespace fileaccess {
                         "a file or directory could not be deleted")),
                 xComProc );
         }
-        else if( errorCode == TASKHANDLING_TRANSFER_MOUNTPOINTS )
-        {
-            ioErrorCode = IOErrorCode_NOT_EXISTING;
-            cancelCommandExecution(
-                ioErrorCode,
-                generateErrorArguments(pShell, aUncPath),
-                xEnv,
-                rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM(
-                        "")),
-                xComProc );
-        }
         else if( errorCode == TASKHANDLING_TRANSFER_BY_COPY_SOURCE         ||
                  errorCode == TASKHANDLING_TRANSFER_BY_COPY_SOURCESTAT     ||
                  errorCode == TASKHANDLING_TRANSFER_BY_MOVE_SOURCE         ||