From 8512e5c2b3617a2c8d77381788c3864db594ce46 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 16 May 2012 11:19:17 +0100
Subject: reduce static_initialization_and_destruction chain

Change-Id: I962aeac0c7feeabb7963016d5afcfeca5a48ccfe
---
 xmlhelp/source/cxxhelp/provider/databases.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'xmlhelp')

diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 22c873e627ce..0af076bb2b24 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -83,7 +83,6 @@ using namespace com::sun::star::beans;
 
 
 static rtl::OUString aSlash(RTL_CONSTASCII_USTRINGPARAM("/"));
-static rtl::OUString aHelpFilesBaseName(RTL_CONSTASCII_USTRINGPARAM("help"));
 
 rtl::OUString Databases::expandURL( const rtl::OUString& aURL )
 {
@@ -1629,7 +1628,7 @@ rtl::OUString ExtensionIteratorBase::implGetFileFromPackage(
         if( !bLangFolderOnly )
         {
             aStrBuf.append( aSlash );
-            aStrBuf.append( aHelpFilesBaseName );
+            aStrBuf.append( "help" );
             aStrBuf.append( rFileExtension );
         }
 
@@ -1774,6 +1773,8 @@ Db* DataBaseIterator::implGetDbFromPackage( Reference< deployment::XPackage > xP
         rtl::OUString aRegDataUrl(optRegData.Value);
         aRegDataUrl += aSlash;
 
+        rtl::OUString aHelpFilesBaseName("help");
+
         rtl::OUString aUsedLanguage = m_aLanguage;
         pRetDb = m_rDatabases.getBerkeley(
             aHelpFilesBaseName, aUsedLanguage, m_bHelpText, &aRegDataUrl);
-- 
cgit