InfoBox IBX_MNUCFG_ALREADY_INCLUDED to String

Change-Id: I343948a9a5e093f210cae1049caa92eeb614a2d7

cui/source/customize/cfg.cxx

@@ -24,6 +24,7 @@
 #include <time.h>
 
 #include <vcl/help.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/toolbox.hxx>
@@ -2085,8 +2086,8 @@ IMPL_LINK( SvxConfigPage, AsyncInfoMsg, OUString*, pMsg )
     (void)pMsg;
 
     // Asynchronous msg because of D&D
-    InfoBox( this, CUI_RES(
-        IBX_MNUCFG_ALREADY_INCLUDED ) ).Execute();
+    MessageDialog( this, CUI_RES(
+        RID_SVXSTR_MNUCFG_ALREADY_INCLUDED ), VCL_MESSAGE_INFO ).Execute();
 
     return 0;
 }

cui/source/customize/cfg.hrc

@@ -37,7 +37,6 @@
 #define MODIFY_TOOLBAR (60 + CFG_OFFSET)
 #define MODIFY_TOOLBAR_CONTENT (61 + CFG_OFFSET)
 
-#define IBX_MNUCFG_ALREADY_INCLUDED (63 + CFG_OFFSET)
 #define QBX_CONFIRM_RESET (64 + CFG_OFFSET)
 #define QBX_CONFIRM_DELETE_MENU (65 + CFG_OFFSET)
 #define QBX_CONFIRM_RESTORE_DEFAULT (66 + CFG_OFFSET)

cui/source/customize/cfg.src

@@ -263,9 +263,9 @@ QueryBox QBX_CONFIRM_RESTORE_DEFAULT
     DEFBUTTON = WB_DEF_NO ;
 };
 
-InfoBox IBX_MNUCFG_ALREADY_INCLUDED
+String RID_SVXSTR_MNUCFG_ALREADY_INCLUDED
 {
-    Message [ en-US ] = "Function is already included in this popup." ;
+    Text [ en-US ] = "Function is already included in this popup." ;
 };
 
 String RID_SVXSTR_LABEL_NEW_NAME

cui/source/inc/cuires.hrc

@@ -179,6 +179,7 @@
 #define RID_SVXSTR_HYPDLG_MACROACT3         (RID_SVX_START + 552)
 #define RID_SVXSTR_HYPERDLG_FORM_BUTTON     (RID_SVX_START +  813)
 #define RID_SVXSTR_HYPERDLG_FROM_TEXT       (RID_SVX_START +  814)
+#define RID_SVXSTR_MNUCFG_ALREADY_INCLUDED  (RID_SVX_START +  816)
 
 // icon choice
 #define RID_SVXSTR_ICONCHOICEDLG_RESETBUT   (RID_SVX_START + 580)

sfx2/source/menu/menu.hrc

@@ -22,8 +22,6 @@
 
 #include <sfx2/sfx.hrc>
 
-#define IBX_MNUCFG_ALREADY_INCLUDED         (RID_SFX_MENU_START+2)
-
 #define STR_MENU_CFGITEM                    RID_SFX_MENU_START+1
 #define STR_MENU_ADDONS                     RID_SFX_MENU_START+2
 #define STR_MENU_ADDONHELP                  RID_SFX_MENU_START+3