diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-16 11:19:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-16 12:04:10 +0100 |
| commit | 8512e5c2b3617a2c8d77381788c3864db594ce46 (patch) | |
| tree | c7fde308b180a2bce971fc80958d8bd28aa123d0 /xmlhelp | |
| parent | c7f60050da130eaeab11a53142a65b61c92c34a1 (diff) | |
reduce static_initialization_and_destruction chain
Change-Id: I962aeac0c7feeabb7963016d5afcfeca5a48ccfe
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
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); |