jl152 import 263452 from native0jl:#i77196# fixed bundled extension help tree view, scripts in shared extensions...

2 files changed, 27 insertions, 3 deletions

diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 507e0b9c81..1f269b9656 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <com/sun/star/script/XLibraryContainerExport.hpp>
+#include <com/sun/star/script/XLibraryContainer3.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
@@ -57,7 +58,7 @@
 #include <com/sun/star/deployment/XPackage.hpp>
 
 #include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase7.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 
 class BasicManager;
@@ -65,11 +66,12 @@ class BasicManager;
 namespace basic
 {
 
-typedef ::cppu::WeakComponentImplHelper6< 
+typedef ::cppu::WeakComponentImplHelper7< 
     ::com::sun::star::lang::XInitialization,
     ::com::sun::star::script::XStorageBasedLibraryContainer,
     ::com::sun::star::script::XLibraryContainerPassword,
     ::com::sun::star::script::XLibraryContainerExport,
+    ::com::sun::star::script::XLibraryContainer3,
     ::com::sun::star::container::XContainer,
     ::com::sun::star::lang::XServiceInfo > LibraryContainerHelper;
 
@@ -405,6 +407,12 @@ public:
     virtual ::rtl::OUString SAL_CALL getContainerLocationName() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL storeLibraries(  ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
+    //Methods XLibraryContainer3
+    virtual ::rtl::OUString SAL_CALL getOriginalLibraryLinkURL( const ::rtl::OUString& Name ) 
+        throw (::com::sun::star::lang::IllegalArgumentException, 
+               ::com::sun::star::container::NoSuchElementException, 
+               ::com::sun::star::uno::RuntimeException);
+    
     // Methods XLibraryContainer2 (base of XPersistentLibraryContainer)
     virtual sal_Bool SAL_CALL isLibraryLink( const ::rtl::OUString& Name ) 
         throw (::com::sun::star::container::NoSuchElementException, 
@@ -541,6 +549,8 @@ private:
     ::rtl::OUString maLibInfoFileURL;
     ::rtl::OUString maStorageURL;
     ::rtl::OUString maUnexpandedStorageURL;
+    ::rtl::OUString maOrignialStorageURL;
+    
     sal_Bool mbLink;
     sal_Bool mbReadOnly;
     sal_Bool mbReadOnlyLink;
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 136536b600..21142dcd0e 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -2169,6 +2169,7 @@ Reference< XNameAccess > SAL_CALL SfxLibraryContainer::createLibraryLink
     SfxLibrary* pNewLib = implCreateLibraryLink( Name, aLibInfoFileURL, aLibDirURL, ReadOnly );
     pNewLib->maLibElementFileExtension = maLibElementFileExtension;
     pNewLib->maUnexpandedStorageURL = aUnexpandedStorageURL;
+    pNewLib->maOrignialStorageURL = StorageURL;
 
     OUString aInitFileName;
     uno::Reference< embed::XStorage > xDummyStor;
@@ -2788,6 +2789,19 @@ OUString SfxLibraryContainer::expand_url( const OUString& url )
     }
 }
 
+//XLibraryContainer3 
+OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString& Name )
+    throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
+{
+    LibraryContainerMethodGuard aGuard( *this );
+    SfxLibrary* pImplLib = getImplLib( Name );
+    sal_Bool bLink = pImplLib->mbLink;
+    if( !bLink )
+        throw IllegalArgumentException();
+    OUString aRetStr = pImplLib->maOrignialStorageURL;
+    return aRetStr;
+}
+
 // Methods XServiceInfo
 ::sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const ::rtl::OUString& _rServiceName )
     throw (RuntimeException)
@@ -3381,7 +3395,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextSharedScri
 
     if( m_iSharedPackage == m_aSharedPackagesSeq.getLength() )
     {
-        m_eState = END_REACHED;
+        m_eState = BUNDLED_EXTENSIONS;
     }
     else
     {