diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 10:56:35 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 10:56:35 +0000 |
| commit | b769ccbe4fb743a33f064ded8ea0e9dfcfc5e2c8 (patch) | |
| tree | ce4e4c6457ffa976fb16f39a432ae8db878ccb1f /scripting/source | |
| parent | 600523d7d6d8edbb92f1db2626e5130cc25c5c4d (diff) | |
INTEGRATION: CWS ab53 (1.21.12); FILE MERGED
2008/06/25 14:21:47 ab 1.21.12.2: #i90797# Added support for extension libs
2008/06/19 09:14:49 tkr 1.21.12.1: #i90797# show marco list correctly
Diffstat (limited to 'scripting/source')
| -rw-r--r-- | scripting/source/basprov/basprov.cxx | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index c63765e9e72d..d0a028329e7f 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: basprov.cxx,v $ - * $Revision: 1.22 $ + * $Revision: 1.23 $ * * This file is part of OpenOffice.org. * @@ -197,26 +197,9 @@ namespace basprov OSL_VERIFY( aFileItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None ); ::rtl::OUString aCanonicalFileURL( aFileStatus.getFileURL() ); - ::rtl::OUString aShareURL; - OSL_VERIFY( osl_getExecutableFile( &aShareURL.pData ) == osl_Process_E_None ); - sal_Int32 nIndex = aShareURL.lastIndexOf( '/' ); - if ( nIndex >= 0 ) - { - nIndex = aShareURL.lastIndexOf( '/', nIndex ); - if ( nIndex >= 0 ) - { - aShareURL = aShareURL.copy( 0, nIndex + 1 ); - aShareURL += ::rtl::OUString::createFromAscii( "share" ); - } - } - - osl::DirectoryItem aShareItem; - osl::FileStatus aShareStatus( FileStatusMask_FileURL ); - OSL_VERIFY( osl::DirectoryItem::get( aShareURL, aShareItem ) == osl::FileBase::E_None ); - OSL_VERIFY( aShareItem.getFileStatus( aShareStatus ) == osl::FileBase::E_None ); - ::rtl::OUString aCanonicalShareURL( aShareStatus.getFileURL() ); - - if ( aCanonicalFileURL.match( aCanonicalShareURL ) ) + ::rtl::OUString aSearchURL1( RTL_CONSTASCII_USTRINGPARAM( "share/basic" ) ); + ::rtl::OUString aSearchURL2( RTL_CONSTASCII_USTRINGPARAM( "share/uno_packages" ) ); + if( aCanonicalFileURL.indexOf( aSearchURL1 ) != -1 || aCanonicalFileURL.indexOf( aSearchURL2 ) != -1 ) bIsShared = true; } } |