summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2014-08-18 03:16:06 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-08-18 03:16:06 +0200
commitcf65baa920e67578f706750989a8686220e36c14 (patch)
treeab0e4f292ddf92d3ab1668afc8a6d91d6e709afc
parent15344d0415f153ba579ad132266c47990a8c9515 (diff)
InfoBox MSG_DOUBLE_SHORTNAME and MSG_NO_GLOSSARIES to String
Change-Id: Ie3934ebc3209b8ba0358cca5fad9883e3b8cd262
-rw-r--r--sw/source/ui/misc/glossary.cxx6
-rw-r--r--sw/source/ui/misc/glossary.src8
-rw-r--r--sw/source/uibase/inc/misc.hrc4
3 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 187029f3fefc..0e83851720ab 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -430,7 +430,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
const OUString aShortName(m_pShortNameEdit->GetText());
if(pGlossaryHdl->HasShortName(aShortName))
{
- InfoBox(this, SW_RES(MSG_DOUBLE_SHORTNAME)).Execute();
+ MessageDialog(this, SW_RES(STR_DOUBLE_SHORTNAME), VCL_MESSAGE_INFO).Execute();
m_pShortNameEdit->SetSelection(Selection(0, SELECTION_MAX));
m_pShortNameEdit->GrabFocus();
return 1;
@@ -567,7 +567,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
Init();
else
{
- InfoBox(this, SW_RES( MSG_NO_GLOSSARIES )).Execute();
+ MessageDialog(this, SW_RES( STR_NO_GLOSSARIES ), VCL_MESSAGE_INFO).Execute();
}
}
}
@@ -785,7 +785,7 @@ IMPL_LINK_NOARG(SwNewGlosNameDlg, Rename)
if( pDlg->pGlossaryHdl->HasShortName(m_pNewShort->GetText())
&& sNew != m_pOldShort->GetText() )
{
- InfoBox(this, SW_RES(MSG_DOUBLE_SHORTNAME)).Execute();
+ MessageDialog(this, SW_RES(STR_DOUBLE_SHORTNAME), VCL_MESSAGE_INFO).Execute();
m_pNewShort->GrabFocus();
}
else
diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src
index 020f03e8a581..28d8f5b8d6a2 100644
--- a/sw/source/ui/misc/glossary.src
+++ b/sw/source/ui/misc/glossary.src
@@ -22,9 +22,9 @@
#include "helpid.h"
#include "access.hrc"
-InfoBox MSG_DOUBLE_SHORTNAME
+String STR_DOUBLE_SHORTNAME
{
- Message [ en-US ] = "Shortcut name already exists. Please choose another name." ;
+ Text [ en-US ] = "Shortcut name already exists. Please choose another name." ;
};
QueryBox MSG_QUERY_DELETE
{
@@ -48,9 +48,9 @@ String STR_SAVE_GLOSSARY
{
Text[ en-US ] = "Save AutoText";
};
-InfoBox MSG_NO_GLOSSARIES
+String STR_NO_GLOSSARIES
{
- Message [ en-US ] = "There is no AutoText in this file.";
+ Text [ en-US ] = "There is no AutoText in this file.";
};
String STR_MY_AUTOTEXT
diff --git a/sw/source/uibase/inc/misc.hrc b/sw/source/uibase/inc/misc.hrc
index 7112850be031..dac7b9722db8 100644
--- a/sw/source/uibase/inc/misc.hrc
+++ b/sw/source/uibase/inc/misc.hrc
@@ -28,11 +28,11 @@
#define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 31)
-#define MSG_DOUBLE_SHORTNAME (RC_MISC_BEGIN + 30)
+#define STR_DOUBLE_SHORTNAME (RC_MISC_BEGIN + 30)
#define MSG_QUERY_DELETE (RC_MISC_BEGIN + 31)
#define STR_QUERY_DELETE_GROUP1 (RC_MISC_BEGIN + 32)
#define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33)
-#define MSG_NO_GLOSSARIES (RC_MISC_BEGIN + 34)
+#define STR_NO_GLOSSARIES (RC_MISC_BEGIN + 34)
#define MSG_SRTERR (RC_MISC_BEGIN + 42)