summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2014-08-18 03:12:06 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-08-18 03:12:06 +0200
commit15344d0415f153ba579ad132266c47990a8c9515 (patch)
tree2d3de1d103adc94c38ec78f19378cb6aa57bbe96 /sw/source
parent94cbfebdc62c3862e502c28dbd65de02fcab5730 (diff)
InfoBox MSG_ERR_INSERT_GLOS to String
Change-Id: Ie72cb6796e3996d7050b771f7ab92e4ab5a6d72b
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/ui/dochdl/dochdl.src5
-rw-r--r--sw/source/uibase/dochdl/gloshdl.cxx3
-rw-r--r--sw/source/uibase/uiview/view.hrc4
-rw-r--r--sw/source/uibase/uiview/view.src4
4 files changed, 6 insertions, 10 deletions
diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src
index 30e92f46bc66..1cecbbf322df 100644
--- a/sw/source/ui/dochdl/dochdl.src
+++ b/sw/source/ui/dochdl/dochdl.src
@@ -29,11 +29,6 @@ String STR_NO_TABLE
Text [ en-US ] = "A table cannot be inserted into another table. However, you can paste the data into the document when the cursor is not in a table.";
};
-InfoBox MSG_ERR_INSERT_GLOS
-{
- Message [ en-US ] = "AutoText could not be created." ;
-};
-
String STR_CLPBRD_FORMAT_ERROR
{
Text [ en-US ] = "Requested clipboard format is not available." ;
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 3ab01b141698..686efcd60b94 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -50,6 +50,7 @@
#include <dochdl.hrc>
#include <swerror.h>
#include <frmmgr.hxx>
+#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
#include <editeng/acorrcfg.hxx>
@@ -331,7 +332,7 @@ bool SwGlossaryHdl::NewGlossary(const OUString& rName, const OUString& rShortNam
rCfg.IsSaveRelFile(), pOnlyTxt );
if(nSuccess == (sal_uInt16) -1 )
{
- InfoBox(pWrtShell->GetView().GetWindow(), SW_RES(MSG_ERR_INSERT_GLOS)).Execute();
+ MessageDialog(pWrtShell->GetView().GetWindow(), SW_RES(STR_ERR_INSERT_GLOS), VCL_MESSAGE_INFO).Execute();
}
if( !pCurGrp )
rStatGlossaries.PutGroupDoc( pTmp );
diff --git a/sw/source/uibase/uiview/view.hrc b/sw/source/uibase/uiview/view.hrc
index aa55887e0f6a..b90d5dae054b 100644
--- a/sw/source/uibase/uiview/view.hrc
+++ b/sw/source/uibase/uiview/view.hrc
@@ -50,9 +50,9 @@
#define STR_SAVEACOPY_SRC (RC_VIEW_BEGIN + 34)
-// MSG
+#define STR_ERR_INSERT_GLOS (RC_VIEW_BEGIN + 35)
-#define MSG_ERR_INSERT_GLOS (RC_VIEW_BEGIN)
+// MSG
#define MSG_ERR_NO_FAX (RC_VIEW_BEGIN + 5)
#define MSG_ERR_SRCSTREAM (RC_VIEW_BEGIN + 6)
diff --git a/sw/source/uibase/uiview/view.src b/sw/source/uibase/uiview/view.src
index 17794b074479..e85ad5dd7209 100644
--- a/sw/source/uibase/uiview/view.src
+++ b/sw/source/uibase/uiview/view.src
@@ -36,9 +36,9 @@ InfoBox MSG_NO_MERGE_ENTRY
{
Message [ en-US ] = "Could not merge documents." ;
};
-InfoBox MSG_ERR_INSERT_GLOS
+String STR_ERR_INSERT_GLOS
{
- Message [ en-US ] = "AutoText could not be created." ;
+ Text [ en-US ] = "AutoText could not be created." ;
};
InfoBox MSG_ERR_SRCSTREAM
{