desktop/source/app/app.cxx | 8 ++------
desktop/source/app/desktop.hrc | 1 +
desktop/source/app/desktop.src | 5 +++++
3 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 000d3aaca5e8b0bab4689f753e8025d73e5bcded
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Apr 17 20:16:55 2013 +0200
desktop: add STR_BOOTSTRAP_ERR_USERINSTALL_FAILED
... or why do we handle this case separately to put up a generic
"internal error" message?
Change-Id: Id51534adb0092cdd459c1811dac0385f0dcbaddb
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 2e8fe11..2f0ecf6 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1003,7 +1003,7 @@ void Desktop::HandleBootstrapErrors(
OUString aMessage;
OUStringBuffer aDiagnosticMessage( 100 );
OUString aErrorMsg;
- aErrorMsg = GetMsgString( STR_BOOTSTRAP_ERR_INTERNAL,
+ aErrorMsg = GetMsgString( STR_BOOTSTRAP_ERR_USERINSTALL_FAILED,
OUString( "User installation could not be completed" ) );
aDiagnosticMessage.append( aErrorMsg );
aMessage = MakeStartupErrorMessage(
aDiagnosticMessage.makeStringAndClear() );
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index 4cf74f0..18d66e4 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -43,6 +43,7 @@
#define STR_BOOTSTRAP_ERR_FILE_MISSING (RID_DESKTOP_STRING_START+106)
#define STR_BOOTSTRAP_ERR_NO_SUPPORT (RID_DESKTOP_STRING_START+107)
#define STR_BOOTSTRAP_ERR_LANGUAGE_MISSING (RID_DESKTOP_STRING_START+108)
+#define STR_BOOTSTRAP_ERR_USERINSTALL_FAILED (RID_DESKTOP_STRING_START+109)
#define STR_BOOTSTRAP_ERR_NO_CFG_SERVICE (RID_DESKTOP_STRING_START+121)
#define STR_BOOTSTRAP_ERR_CFG_DATAACCESS (RID_DESKTOP_STRING_START+122)
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index c6372d8..367bc12 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -80,6 +80,11 @@ String STR_BOOTSTRAP_ERR_LANGUAGE_MISSING
Text [ en-US ] = "The user interface language cannot be determined.";
};
+String STR_BOOTSTRAP_ERR_USERINSTALL_FAILED
+{
+ Text [ en-US ] = "User installation could not be completed. ";
+};
+
String STR_BOOTSTRAP_ERR_NO_CFG_SERVICE
{
Text [ en-US ] = "The configuration service is not available.";
commit 47754fe3ed8359a393c20996d70770c1dcd92207
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Apr 17 20:15:18 2013 +0200
Desktop::HandleBootstrapPathErrors: try to not be totally useless
Change-Id: I400790635849171f710fbc70969dbd337ffe6859
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 8ca7705..2e8fe11 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -748,11 +748,7 @@ void Desktop::HandleBootstrapPathErrors(
::utl::Bootstrap::Status aBootstrapStat
if ( !aTemp.isEmpty() )
aProductKey = aTemp;
- OUString aMessage;
- OUStringBuffer aBuffer( 100 );
- aBuffer.append( aDiagnosticMessage );
-
- aBuffer.appendAscii( "\n" );
+ OUString const aMessage(aDiagnosticMessage + "\n");
ErrorBox aBootstrapFailedBox( NULL, WB_OK, aMessage );
aBootstrapFailedBox.SetText( aProductKey );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
