From 893d3ed1b6d83775df277825f07bf3d47f721004 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Mon, 23 Nov 2009 16:33:39 +0000
Subject: CWS-TOOLING: integrate CWS fwk125 2009-11-19 08:11:20 +0100 jsk 
 r277554 : fwk125: #i105760# - removed warnlog, re-enabled autotest e_help.bas
 2009-11-16 16:21:49 +0100 tl  r277521 : #i106571# fixed locale list for
 dictionaries to get rid of duplicate entries 2009-11-12 08:47:31 +0100 hde 
 r277469 : rework of hyphenation 2009-11-11 15:25:16 +0100 hde  r277462 :
 rework of hyphenation 2009-11-11 15:24:09 +0100 hde  r277461 : rework of
 hyphenation 2009-11-11 13:52:02 +0100 hde  r277453 : new include for
 hyphenation tools 2009-11-10 12:28:51 +0100 tl  r277427 : #i102304# fix for
 hyphenation dialog 2009-11-10 12:00:10 +0100 mav  r277425 : #i10000# A
 workaround for pch and windows headers conflict 2009-11-10 11:58:32 +0100 mav
  r277424 : #i10000# A workaround for pch and windows headers conflict
 2009-11-09 15:47:59 +0100 kso  r277414 : #i16732# fixed url matching.
 2009-11-09 11:51:40 +0100 mav  r277406 : #i10000# use precompiled headers
 2009-11-08 23:53:03 +0100 mav  r277399 : #i10000# fix warning 2009-11-08
 23:50:23 +0100 mav  r277398 : #i10000# adapt for unix 2009-11-08 23:49:52
 +0100 mav  r277397 : #i10000# adapt for unix 2009-11-08 21:26:06 +0100 mav 
 r277396 : CWS-TOOLING: rebase CWS fwk125 to branches/OOO320@277373
 (milestone: OOO320:m4) 2009-11-06 16:30:27 +0100 ab  r277394 : #i106100# Hold
 references to packages to speed up further calls to getDeployedPackages()
 2009-11-06 15:58:48 +0100 mav  r277392 : #i102464# check the Windows ACL
 2009-11-06 15:58:23 +0100 mav  r277391 : #i102464# check the Windows ACL
 2009-11-04 11:54:06 +0100 tl  r277342 : #i106497# incorrectly found
 'supported languages' fixed 2009-11-04 10:40:51 +0100 tl  r277335 : #i106571#
 dictionary updates for Polish and Swedish. 2009-10-28 09:54:41 +0100 tl 
 r277236 : #i106100# context menu performance 2009-10-27 15:47:05 +0100 tl 
 r277213 : #i106100# context menu performance 2009-10-23 17:31:56 +0200 mav 
 r277170 : #i106075# use correct path to inprocserv.dll 2009-10-23 16:07:27
 +0200 mav  r277168 : #i105760# seek the temporary file to beginning also for
 URL case 2009-10-23 11:03:58 +0200 mav  r277134 : CWS-TOOLING: rebase CWS
 fwk125 to branches/OOO320@276942 (milestone: OOO320:m2)

---
 xmlhelp/source/cxxhelp/provider/databases.cxx | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'xmlhelp')

diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index c0980017c2ed..1de0bc80ee73 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -137,6 +137,19 @@ rtl::OUString Databases::expandURL( const rtl::OUString& aURL, Reference< uno::X
     return aRetURL;
 }
 
+
+// Hold Packages to improve performance (#i106100)
+// The PackageManager implementation seems to completely throw away all cached data
+// as soon as the last reference to a XPackage dies. Maybe this should be changed.
+struct ImplPackageSequenceHolder
+{
+    Sequence< Reference< deployment::XPackage > >   m_aUserPackagesSeq;
+    Sequence< Reference< deployment::XPackage > >   m_aSharedPackagesSeq;
+};
+
+static ImplPackageSequenceHolder* GpPackageSequenceHolder = NULL;
+
+
 Databases::Databases( sal_Bool showBasic,
                       const rtl::OUString& instPath,
                       const com::sun::star::uno::Sequence< rtl::OUString >& imagesZipPaths,
@@ -187,6 +200,8 @@ Databases::Databases( sal_Bool showBasic,
     m_xSFA = Reference< ucb::XSimpleFileAccess >(
         m_xSMgr->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ),
         m_xContext ), UNO_QUERY_THROW );
+
+    GpPackageSequenceHolder = new ImplPackageSequenceHolder();
 }
 
 Databases::~Databases()
@@ -235,6 +250,7 @@ Databases::~Databases()
         }
     }
 
+    delete GpPackageSequenceHolder;
 }
 
 static bool impl_getZipFile(
@@ -1530,6 +1546,8 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack
             thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("user") );
         m_aUserPackagesSeq = xUserManager->getDeployedPackages
             ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
+        if( GpPackageSequenceHolder != NULL )
+            GpPackageSequenceHolder->m_aUserPackagesSeq = m_aUserPackagesSeq;
 
         m_bUserPackagesLoaded = true;
     }
@@ -1560,6 +1578,8 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa
             thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("shared") );
         m_aSharedPackagesSeq = xSharedManager->getDeployedPackages
             ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
+        if( GpPackageSequenceHolder != NULL )
+            GpPackageSequenceHolder->m_aSharedPackagesSeq = m_aSharedPackagesSeq;
 
         m_bSharedPackagesLoaded = true;
     }
-- 
cgit