summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2010-04-21 16:04:34 +0200
committerJoachim Lingner <jl@openoffice.org>2010-04-21 16:04:34 +0200
commit148e48fa5e6c870feaadf7857f70fea4f4d8d106 (patch)
tree7745e59b9c472e72f0c3b99f19493d4b75bc93c2 /basctl
parent0495e9a3b8124a9d07eb489caacde2f91dc28d58 (diff)
jl152 import 263449 from native0jl:#i77196# no registration of components in uno.exe at startup, fixed extension activation, basic, etc.
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/basicide/scriptdocument.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index dd10a00e2bde..8dcacad64179 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -987,8 +987,11 @@ namespace basctl
::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;
+ ::rtl::OUString aSearchURL3( RTL_CONSTASCII_USTRINGPARAM( "share/extensions" ) );
+ if( aCanonicalFileURL.indexOf( aSearchURL1 ) != -1 ||
+ aCanonicalFileURL.indexOf( aSearchURL2 ) != -1 ||
+ aCanonicalFileURL.indexOf( aSearchURL3 ) != -1 )
+ bIsShared = true;
}
}
catch( const Exception& )