[Libreoffice-commits] core.git: 2 commits - cui/source desktop/source

[Markus Mohrhard]

 cui/source/options/optjava.cxx |    1 +
 desktop/source/app/app.cxx     |    4 ++--
 desktop/source/app/desktop.hrc |    4 ++--
 desktop/source/app/desktop.src |    6 ++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 549fd2d229c0f7b6538a73c902f2fa5cf06d180b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Aug 16 00:39:23 2014 +0200

    fix build
    
    Change-Id: I770b941c065ca41541f27d01f78727d9d0e32a7e

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 92bc52a..77f9e69 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -32,6 +32,7 @@
 #include <vcl/help.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/msgbox.hxx>
 #include <vcl/waitobj.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/imagemgr.hxx>
commit b8cf71937ff604e50b709246383942b6d90b35e6
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Aug 16 00:30:57 2014 +0200

    Revert "ErrorBox EBX_ERR_PRINTDISABLED to String"
    
    This reverts commit 90aecb31139a6743fd00c87585a82406e7d9f075.

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index cd5d860..8eed982 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/layout.hxx>
+#include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
 #include <sfx2/sfx.hrc>
 #include <sfx2/app.hxx>
@@ -2434,7 +2434,7 @@ void Desktop::OpenClients()
             ResMgr* pDtResMgr = GetDesktopResManager();
             if( pDtResMgr )
             {
-                MessageDialog aBox( NULL, ResId( STR_ERR_PRINTDISABLED, *pDtResMgr ) );
+                ErrorBox aBox( NULL, ResId( EBX_ERR_PRINTDISABLED, *pDtResMgr ) );
                 aBox.Execute();
             }
         }
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index 8a7affc..e9caf4a 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -28,6 +28,8 @@
 
 #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)
@@ -50,8 +52,6 @@
 
 #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 b109a0e..1036b21 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -151,9 +151,11 @@ String STR_TITLE_USERDATALOCKED
     Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION";
 };
 
-String STR_ERR_PRINTDISABLED
+ErrorBox EBX_ERR_PRINTDISABLED
 {
-    Text [ en-US ] = "Printing is disabled. No documents can be printed.";
+    Buttons = WB_OK ;
+    DefButton = WB_DEF_OK ;
+    Message [ en-US ] = "Printing is disabled. No documents can be printed.";
 };
 
 String STR_TITLE_EXPIRED