diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-07-27 17:12:01 +0200 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-07-27 17:12:01 +0200 |
| commit | 82de1aefa19ebd1c64c78610ea2b683bd5c2ff92 (patch) | |
| tree | 8991b05f373e660649ed23d0e13f418c9d80d4a9 /basctl | |
| parent | 63011eb5ee3b5da99275dceb747f771276b175a8 (diff) | |
| parent | 273fa6a6aa0d56660807ab29892f0618cfbb2e63 (diff) | |
mib17: rebase to DEV300_m84
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/bastype2.cxx | 2 | ||||
| -rw-r--r-- | basctl/source/basicide/scriptdocument.cxx | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 18ba6fedfd27..79f3cdb84c6b 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -85,7 +85,7 @@ void ModuleInfoHelper::getObjectName( const uno::Reference< container::XNameCont sal_Int32 ModuleInfoHelper::getModuleType( const uno::Reference< container::XNameContainer >& rLib, const String& rModName ) { - sal_Int32 nType = ::script::ModuleType::NORMAL; + sal_Int32 nType = script::ModuleType::NORMAL; uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( rLib, uno::UNO_QUERY ); if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo( rModName ) ) { diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index 391cb1778caa..6b16316d889c 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -1016,8 +1016,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& ) |