INTEGRATION: CWS relocinst (1.4.156); FILE MERGED

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

1 files changed, 5 insertions, 19 deletions

diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index 9f733b47b4e7..70aded45583d 100644
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filid.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hr $ $Date: 2001-10-24 16:20:07 $
+ *  last change: $Author: hr $ $Date: 2004-05-10 14:21:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,29 +77,15 @@ FileContentIdentifier::FileContentIdentifier(
     : m_pMyShell( pMyShell ),
       m_bNormalized( IsNormalized )
 {
-    rtl::OUString aRedirectedPath;
-
     if( IsNormalized )
     {
-        m_pMyShell->uncheckMountPoint( aUnqPath,aRedirectedPath );
-        if( aRedirectedPath == rtl::OUString() && m_pMyShell->m_vecMountPoint.size() )
-        {
-            m_aProviderScheme = rtl::OUString::createFromAscii( "invalid:" );
-            m_aContentId = m_aProviderScheme;
-        }
-        else
-        {
-            m_pMyShell->getUrlFromUnq( aRedirectedPath,m_aContentId );
-            m_aNormalizedId = aUnqPath;
-            m_pMyShell->getScheme( m_aProviderScheme );
-        }
+        m_pMyShell->getUrlFromUnq( aUnqPath,m_aContentId );
+        m_aNormalizedId = aUnqPath;
+        m_pMyShell->getScheme( m_aProviderScheme );
     }
     else
     {
         m_pMyShell->getUnqFromUrl( aUnqPath,m_aNormalizedId );
-        m_pMyShell->checkMountPoint( m_aNormalizedId,aRedirectedPath );
-
-        m_aNormalizedId = aRedirectedPath;
         m_aContentId = aUnqPath;
         m_pMyShell->getScheme( m_aProviderScheme );
     }