InfoBox MSG_WRONG_TABLENAME and MSG_ERR_TABLE_MERGE to String

Change-Id: I36fc0ed4f67c0af467a8dc593950a9c53a5ec53b

5 files changed, 12 insertions, 10 deletions

diff --git a/sw/source/ui/table/table.src b/sw/source/ui/table/table.src
index e9ade9395209..a81454be47bb 100644
--- a/sw/source/ui/table/table.src
+++ b/sw/source/ui/table/table.src
@@ -18,9 +18,9 @@
  */
 
 #include "table.hrc"
-InfoBox MSG_ERR_TABLE_MERGE
+String STR_ERR_TABLE_MERGE
 {
-    Message [ en-US ] = "Selected table cells are too complex to merge." ;
+    Text [ en-US ] = "Selected table cells are too complex to merge." ;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index ab8aa95b237d..aecc3bdea670 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -19,6 +19,7 @@
 
 #include <hintids.hxx>
 #include <comphelper/string.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
@@ -601,7 +602,7 @@ int  SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
     OUString sTblName = m_pNameED->GetText();
     if(sTblName.indexOf(' ') != -1)
     {
-        InfoBox(this, SW_RES(MSG_WRONG_TABLENAME)).Execute();
+        MessageDialog(this, SW_RES(STR_WRONG_TABLENAME), VCL_MESSAGE_INFO).Execute();
         m_pNameED->GrabFocus();
         return KEEP_PAGE;
     }
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index 0de5c8822bda..af7f01f43d8c 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -19,9 +19,9 @@
 
 #include "table.hrc"
 
-InfoBox MSG_WRONG_TABLENAME
+String STR_WRONG_TABLENAME
 {
-    Message [ en-US ] = "The name of the table must not contain spaces." ;
+    Text [ en-US ] = "The name of the table must not contain spaces." ;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/table.hrc b/sw/source/uibase/inc/table.hrc
index f7ce08d9a17c..d01c9920b538 100644
--- a/sw/source/uibase/inc/table.hrc
+++ b/sw/source/uibase/inc/table.hrc
@@ -21,11 +21,11 @@
 
 #define DLG_ROW_HEIGHT          (RC_TABLE_BEGIN + 4)
 
-#define MSG_ERR_TABLE_MERGE     (RC_TABLE_BEGIN + 7)
+#define STR_ERR_TABLE_MERGE     (RC_TABLE_BEGIN + 7)
 
-#define MSG_WRONG_TABLENAME     (RC_TABLE_BEGIN + 13)
+#define STR_WRONG_TABLENAME     (RC_TABLE_BEGIN + 13)
 
-#define TABLE_ACT_END           MSG_WRONG_TABLENAME
+#define TABLE_ACT_END           STR_WRONG_TABLENAME
 
 #if TABLE_ACT_END > RC_TABLE_END
 #error Resource-Id Ueberlauf in #file, #line
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index da67f6f3edee..283808f00ab3 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -40,6 +40,7 @@
 #include <svx/svxdlg.hxx>
 #include <svl/zformat.hxx>
 #include <sfx2/bindings.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/msgbox.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
@@ -734,8 +735,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
                         break;
                     case TBLMERGE_TOOCOMPLEX:
                     {
-                        InfoBox aInfoBox( GetView().GetWindow(),
-                                    SW_RES( MSG_ERR_TABLE_MERGE ) );
+                        MessageDialog aInfoBox( GetView().GetWindow(),
+                                    SW_RES( STR_ERR_TABLE_MERGE ), VCL_MESSAGE_INFO );
                         aInfoBox.Execute();
                         break;
                     }