InfoBox to String

Change-Id: Ic12f04bf80639d89ecc531bceb8378c7d97e9325

4 files changed, 19 insertions, 23 deletions

diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index d9f461a9cf05..1cf86cdb54c0 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -35,12 +35,12 @@
 #define RID_DLG_ALIEN_WARNING           ( RC_DIALOG_BEGIN + 0)
 #define STR_RESET                       ( RC_DIALOG_BEGIN + 0)
 #define MSG_OVERWRITE                   ( RC_DIALOG_BEGIN + 1)
-#define MSG_TABPAGE_INVALIDNAME         ( RC_DIALOG_BEGIN + 13)
-#define MSG_TABPAGE_INVALIDSTYLE        ( RC_DIALOG_BEGIN + 14)
-#define MSG_POOL_STYLE_NAME             ( RC_DIALOG_BEGIN + 16)
-#define MSG_TABPAGE_INVALIDPARENT       ( RC_DIALOG_BEGIN + 18)
+#define STR_TABPAGE_INVALIDNAME         ( RC_DIALOG_BEGIN + 13)
+#define STR_TABPAGE_INVALIDSTYLE        ( RC_DIALOG_BEGIN + 14)
+#define STR_POOL_STYLE_NAME             ( RC_DIALOG_BEGIN + 16)
+#define STR_TABPAGE_INVALIDPARENT       ( RC_DIALOG_BEGIN + 18)
 
-#define STR_DELETE_STYLE                ( RC_DIALOG_BEGIN + 18)
+#define STR_DELETE_STYLE                ( RC_DIALOG_BEGIN + 19)
 #define STR_DELETE_STYLE_USED           ( RC_DIALOG_BEGIN + 20)
 
 #define MN_CONTEXT_TEMPLDLG             ( RC_DIALOG_BEGIN + 46)
diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src
index 8d8273a341e9..83e258949adb 100644
--- a/sfx2/source/dialog/dialog.src
+++ b/sfx2/source/dialog/dialog.src
@@ -30,27 +30,21 @@ String STR_APPLY
 {
     Text [ en-US ] = "Apply";
 };
-InfoBox MSG_TABPAGE_INVALIDNAME
+String STR_TABPAGE_INVALIDNAME
 {
-    BUTTONS = WB_OK ;
-    DEFBUTTON = WB_DEF_OK ;
-    Message [ en-US ] = "This name is already in use." ;
+    Text [ en-US ] = "This name is already in use." ;
 };
-InfoBox MSG_TABPAGE_INVALIDSTYLE
+String STR_TABPAGE_INVALIDSTYLE
 {
-    BUTTONS = WB_OK ;
-    DEFBUTTON = WB_DEF_OK ;
-    Message [ en-US ] = "This Style does not exist." ;
+    Text [ en-US ] = "This Style does not exist." ;
 };
-InfoBox MSG_TABPAGE_INVALIDPARENT
+String STR_TABPAGE_INVALIDPARENT
 {
-    BUTTONS = WB_OK ;
-    DEFBUTTON = WB_DEF_OK ;
-    Message [ en-US ] = "This Style cannot be used as a base Style,\nbecause it would result in a recursive reference." ;
+    Text [ en-US ] = "This Style cannot be used as a base Style,\nbecause it would result in a recursive reference." ;
 };
-InfoBox MSG_POOL_STYLE_NAME
+String STR_POOL_STYLE_NAME
 {
-    Message [ en-US ] = "Name already exists as a default Style.\nPlease choose another name." ;
+    Text [ en-US ] = "Name already exists as a default Style.\nPlease choose another name." ;
 };
 String STR_DELETE_STYLE_USED
 {
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 2a7aff7f29cb..90c11e82533f 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/string.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/field.hxx>
 #include <svl/eitem.hxx>
@@ -538,7 +539,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
 
         if (!pStyle->SetName(comphelper::string::stripStart(m_pNameRw->GetText(), ' ')))
         {
-            InfoBox aBox( this, SfxResId( MSG_TABPAGE_INVALIDNAME ) );
+            MessageDialog aBox( this, SfxResId( STR_TABPAGE_INVALIDNAME ), VCL_MESSAGE_INFO );
             aBox.Execute();
             m_pNameRw->GrabFocus();
             m_pNameRw->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
@@ -555,7 +556,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
         {
             if ( !pStyle->SetFollow( aFollowEntry ) )
             {
-                InfoBox aBox( this, SfxResId( MSG_TABPAGE_INVALIDSTYLE ) );
+                MessageDialog aBox( this, SfxResId( STR_TABPAGE_INVALIDSTYLE ), VCL_MESSAGE_INFO );
                 aBox.Execute();
                 m_pFollowLb->GrabFocus();
                 return SfxTabPage::KEEP_PAGE;
@@ -575,7 +576,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
         {
             if ( !pStyle->SetParent( aParentEntry ) )
             {
-                InfoBox aBox( this, SfxResId( MSG_TABPAGE_INVALIDPARENT ) );
+                MessageDialog aBox( this, SfxResId( STR_TABPAGE_INVALIDPARENT ), VCL_MESSAGE_INFO );
                 aBox.Execute();
                 m_pBaseLb->GrabFocus();
                 return SfxTabPage::KEEP_PAGE;
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index c8fd34ab0d5c..b2927b692375 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/newstyle.hxx>
 #include "dialog.hrc"
 #include <sfx2/sfxresid.hxx>
+#include <vcl/layout.hxx>
 
 // PRIVATE METHODES ------------------------------------------------------
 
@@ -36,7 +37,7 @@ IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, pControl )
     {
         if ( !pStyle->IsUserDefined() )
         {
-            InfoBox( this, SfxResId( MSG_POOL_STYLE_NAME ) ).Execute();
+            MessageDialog( this, SfxResId( STR_POOL_STYLE_NAME ), VCL_MESSAGE_INFO ).Execute();
             return 0;
         }