1 files changed, 17 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index bba615e0ebbc..731ffe85d83b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -492,7 +492,12 @@ void Desktop::Init()
     {
         // prepare language
         if ( !LanguageSelection::prepareLanguage() )
-            SetBootstrapError( BE_LANGUAGE_MISSING );
+        {
+            if ( LanguageSelection::getStatus() == LanguageSelection::LS_STATUS_CANNOT_DETERMINE_LANGUAGE )
+                SetBootstrapError( BE_LANGUAGE_MISSING );
+            else
+                SetBootstrapError( BE_OFFICECONFIG_BROKEN );
+        }
     }
 
     if ( GetBootstrapError() == BE_OK )
@@ -873,6 +878,17 @@ void Desktop::HandleBootstrapErrors( BootstrapError aBootstrapError )
 
         FatalError( aMessage);
     }
+    else if ( aBootstrapError == BE_OFFICECONFIG_BROKEN )
+    {
+        OUString aMessage;
+        OUStringBuffer aDiagnosticMessage( 100 );
+        OUString aErrorMsg;
+        aErrorMsg = GetMsgString( STR_CONFIG_ERR_ACCESS_GENERAL,
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "A general error occurred while accessing your central configuration." )) );
+        aDiagnosticMessage.append( aErrorMsg );
+        aMessage = MakeStartupErrorMessage( aDiagnosticMessage.makeStringAndClear() );
+        FatalError(aMessage);
+    }
     else if ( aBootstrapError == BE_USERINSTALL_FAILED )
     {
         OUString aMessage;