[Libreoffice-commits] .: Branch 'libreoffice-3-3' - sfx2/source

[Thorsten Behrens]

 sfx2/source/appl/sfxhelp.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 44eaa36c4ce25a7c861455e9dbe6c2c959adecb4
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Feb 1 22:39:43 2011 +0100

    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 at novell.com>

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 53c15ce..586515c 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 =