desktop/source/app/app.cxx | 8 ++++----
desktop/source/app/desktop.hrc | 4 ++--
desktop/source/app/desktop.src | 6 ++----
3 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 36efd0f9c7e4ce6217c981fc439274a036bb02c1
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Aug 16 12:13:38 2014 +0100
try that ErrorBox removal again
Change-Id: I1d2f24def771651d36f06432c20e80429379c9fe
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 8eed982..0332f90 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -92,7 +92,7 @@
#include <svtools/menuoptions.hxx>
#include <rtl/bootstrap.hxx>
#include <vcl/help.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <vcl/settings.hxx>
#include <sfx2/sfx.hrc>
#include <sfx2/app.hxx>
@@ -768,7 +768,7 @@ void Desktop::HandleBootstrapPathErrors(
::utl::Bootstrap::Status aBootstrapStat
OUString const aMessage(aDiagnosticMessage + "\n");
- ErrorBox aBootstrapFailedBox( NULL, WB_OK, aMessage );
+ MessageDialog aBootstrapFailedBox(NULL, aMessage);
aBootstrapFailedBox.SetText( aProductKey );
aBootstrapFailedBox.Execute();
}
@@ -1173,7 +1173,7 @@ void restartOnMac(bool passArguments) {
ResMgr *resMgr = Desktop::GetDesktopResManager();
OUString aMessage = ResId(STR_LO_MUST_BE_RESTARTED, *resMgr).toString();
- ErrorBox aRestartBox( NULL, WB_OK, aMessage );
+ MessageDialog aRestartBox(NULL, aMessage);
aRestartBox.Execute();
#else
OUString execUrl;
@@ -2434,7 +2434,7 @@ void Desktop::OpenClients()
ResMgr* pDtResMgr = GetDesktopResManager();
if( pDtResMgr )
{
- ErrorBox aBox( NULL, ResId( EBX_ERR_PRINTDISABLED, *pDtResMgr
) );
+ MessageDialog aBox(NULL, ResId(STR_ERR_PRINTDISABLED,
*pDtResMgr));
aBox.Execute();
}
}
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index e9caf4a..8a7affc 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -28,8 +28,6 @@
#define QBX_USERDATALOCKED (RID_DESKTOP_DIALOG_START+100)
-#define EBX_ERR_PRINTDISABLED (RID_DESKTOP_DIALOG_START+190)
-
#define STR_RECOVER_QUERY (RID_DESKTOP_STRING_START+0)
#define STR_RECOVER_TITLE (RID_DESKTOP_STRING_START+1)
#define STR_RECOVER_PREPARED (RID_DESKTOP_STRING_START+2)
@@ -52,6 +50,8 @@
#define STR_ASK_START_SETUP_MANUALLY (RID_DESKTOP_STRING_START+152)
+#define STR_ERR_PRINTDISABLED (RID_DESKTOP_STRING_START+153)
+
#define STR_INTERNAL_ERRMSG (RID_DESKTOP_STRING_START+161)
#define STR_LO_MUST_BE_RESTARTED (RID_DESKTOP_STRING_START+162)
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index 1036b21..b109a0e 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -151,11 +151,9 @@ String STR_TITLE_USERDATALOCKED
Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION";
};
-ErrorBox EBX_ERR_PRINTDISABLED
+String STR_ERR_PRINTDISABLED
{
- Buttons = WB_OK ;
- DefButton = WB_DEF_OK ;
- Message [ en-US ] = "Printing is disabled. No documents can be printed.";
+ Text [ en-US ] = "Printing is disabled. No documents can be printed.";
};
String STR_TITLE_EXPIRED
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
