summaryrefslogtreecommitdiff
path: root/sfx2/source/appl
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-02-01 22:39:43 +0100
committerThorsten Behrens <tbehrens@novell.com>2011-02-02 14:33:30 +0100
commit44eaa36c4ce25a7c861455e9dbe6c2c959adecb4 (patch)
tree19c82ec00585a64c9b897c99d0db96b2838fbe4f /sfx2/source/appl
parent7922cf1235dac54df4c15533aaa01973e27c0652 (diff)
wikihelp: Do not check for existence of the localized help.
In case we do not have the help installed, it is up to the online service to decide the fallback in case a language version is not available. Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
Diffstat (limited to 'sfx2/source/appl')
-rw-r--r--sfx2/source/appl/sfxhelp.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 53c15ce730..586515c36d 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -113,7 +113,10 @@ void NoHelpErrorBox::RequestHelp( const HelpEvent& )
#define STARTERLIST 0
-rtl::OUString HelpLocaleString()
+static bool impl_hasHelpInstalled();
+
+/// Return the locale we prefer for displaying help
+static rtl::OUString HelpLocaleString()
{
static rtl::OUString aLocaleStr;
if (!aLocaleStr.getLength())
@@ -124,7 +127,7 @@ rtl::OUString HelpLocaleString()
::utl::ConfigManager::LOCALE );
aLocale >>= aLocaleStr;
bool bOk = aLocaleStr.getLength() != 0;
- if ( bOk )
+ if ( impl_hasHelpInstalled() && bOk )
{
rtl::OUString aBaseInstallPath;
// utl::Bootstrap::PathStatus aBaseLocateResult =