summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2014-08-18 02:21:44 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-08-18 02:21:44 +0200
commit4ca5a663ab36d41fed65c5e708b12937137e3c31 (patch)
tree9f3dfa90dd2524564892c1019510e7124d1912ff /sfx2
parent06a485f02b544ff87a023fe885736e35074bfc40 (diff)
InfoBox MSG_CANT_QUIT to String
Change-Id: I68fed7d2f0eea7fde60707e48349230d8a8d5c73
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/app.hrc4
-rw-r--r--sfx2/source/appl/app.src4
-rw-r--r--sfx2/source/appl/appquit.cxx4
3 files changed, 5 insertions, 7 deletions
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 74e6226d6d1d..b9297a858da4 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -21,11 +21,9 @@
#include <sfx2/sfx.hrc>
-// #defines *****************************************************************
-
#define STR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START+7)
#define STR_NO_ABS_URI_REF (RID_SFX_APP_START+8)
-#define MSG_CANT_QUIT (RID_SFX_APP_START+10)
+#define STR_CANT_QUIT (RID_SFX_APP_START+10)
#define STR_ISMODIFIED (RID_SFX_APP_START+11)
#define RID_FULLSCREENTOOLBOX (RID_SFX_APP_START+42)
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index d1ddf93221ed..524628a353d0 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -205,9 +205,9 @@ String GID_CONTROLS
Text [ en-US ] = "Controls" ;
};
-InfoBox MSG_CANT_QUIT
+String STR_CANT_QUIT
{
- Message [ en-US ] = "The application cannot be terminated at the moment.\nPlease wait until all print jobs and/or\nOLE actions have finished and close all dialogs." ;
+ Text [ en-US ] = "The application cannot be terminated at the moment.\nPlease wait until all print jobs and/or\nOLE actions have finished and close all dialogs." ;
};
String STR_ISMODIFIED
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 4ec7bb1e256f..da121d3d3690 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -21,7 +21,7 @@
#include <basic/sbstar.hxx>
#include <svl/svdde.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <svl/eitem.hxx>
#include <unotools/saveopt.hxx>
@@ -65,7 +65,7 @@ bool SfxApplication::QueryExit_Impl()
if ( !bQuit )
{
// Not really exit, only minimize
- InfoBox aInfoBox( NULL, SfxResId(MSG_CANT_QUIT) );
+ MessageDialog aInfoBox( NULL, SfxResId(STR_CANT_QUIT), VCL_MESSAGE_INFO );
aInfoBox.Execute();
OSL_TRACE( "QueryExit => sal_False (in use)" );
return false;