ErrorBoxes from datanavi to String

Change-Id: Ibb3b11da89468822d64c4c2bc2463ea82339f8af

2 files changed, 16 insertions, 26 deletions

diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index a0a2890b3b76..6708f9081bcb 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1484,10 +1484,8 @@ namespace svxform
                         if ( m_pModelsBox->GetEntryPos( sNewName ) != LISTBOX_ENTRY_NOTFOUND )
                         {
                             // error: model name already exists
-                            ErrorBox aErrBox( this, SVX_RES( RID_ERR_DOUBLE_MODELNAME ) );
-                            OUString sMessText = aErrBox.GetMessText();
-                            sMessText = sMessText.replaceFirst( MSG_VARIABLE, sNewName );
-                            aErrBox.SetMessText( sMessText );
+                            MessageDialog aErrBox( this, SVX_RES( RID_STR_DOUBLE_MODELNAME ) );
+                            aErrBox.set_primary_text(aErrBox.get_primary_text().replaceFirst(MSG_VARIABLE, sNewName));
                             aErrBox.Execute();
                             bShowDialog = true;
                         }
@@ -2445,10 +2443,8 @@ namespace svxform
              ( bIsHandleBinding && sNewName.isEmpty() ) )
         {
             // Error and don't close the dialog
-            ErrorBox aErrBox( this, SVX_RES( RID_ERR_INVALID_XMLNAME ) );
-            OUString sMessText = aErrBox.GetMessText();
-            sMessText = sMessText.replaceFirst( MSG_VARIABLE, sNewName );
-            aErrBox.SetMessText( sMessText );
+            MessageDialog aErrBox( this, SVX_RES( RID_STR_INVALID_XMLNAME ) );
+            aErrBox.set_primary_text(aErrBox.get_primary_text().replaceFirst(MSG_VARIABLE, sNewName));
             aErrBox.Execute();
             return 0;
         }
@@ -3063,10 +3059,8 @@ namespace svxform
         {
             if ( !m_pConditionDlg->GetUIHelper()->isValidPrefixName( sPrefix ) )
             {
-                ErrorBox aErrBox( this, SVX_RES( RID_ERR_INVALID_XMLPREFIX ) );
-                OUString sMessText = aErrBox.GetMessText();
-                sMessText = sMessText.replaceFirst( MSG_VARIABLE, sPrefix );
-                aErrBox.SetMessText( sMessText );
+                MessageDialog aErrBox( this, SVX_RES( RID_STR_INVALID_XMLPREFIX ) );
+                aErrBox.set_primary_text(aErrBox.get_primary_text().replaceFirst(MSG_VARIABLE, sPrefix));
                 aErrBox.Execute();
                 return 0;
             }
@@ -3132,8 +3126,8 @@ namespace svxform
         OUString sName(m_pNameED->GetText());
         if(sName.isEmpty()) {
 
-            ErrorBox aErrorBox(this,SVX_RES(RID_ERR_EMPTY_SUBMISSIONNAME));
-            aErrorBox.SetText( Application::GetDisplayName() );
+            MessageDialog aErrorBox(this,SVX_RES(RID_STR_EMPTY_SUBMISSIONNAME));
+            aErrorBox.set_primary_text( Application::GetDisplayName() );
             aErrorBox.Execute();
             return 0;
         }
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 62ac6094d244..2f75ef3360de 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -108,28 +108,24 @@ MessBox RID_QRY_LINK_WARNING
     Message [ en-US ] = "This instance is linked with the form.\n\nThe changes you make to this instance will be lost when the form is reloaded.\n\nHow do you want to proceed?" ;
 };
 
-ErrorBox RID_ERR_INVALID_XMLNAME
+String RID_STR_INVALID_XMLNAME
 {
-    Buttons = WB_OK ;
-    Message [ en-US ] = "The name '%1' is not valid in XML. Please enter a different name." ;
+    Text [ en-US ] = "The name '%1' is not valid in XML. Please enter a different name." ;
 };
 
-ErrorBox RID_ERR_INVALID_XMLPREFIX
+String RID_STR_INVALID_XMLPREFIX
 {
-    Buttons = WB_OK ;
-    Message [ en-US ] = "The prefix '%1' is not valid in XML. Please enter a different prefix." ;
+    Text [ en-US ] = "The prefix '%1' is not valid in XML. Please enter a different prefix." ;
 };
 
-ErrorBox RID_ERR_DOUBLE_MODELNAME
+String RID_STR_DOUBLE_MODELNAME
 {
-    Buttons = WB_OK ;
-    Message [ en-US ] = "The name '%1' already exists. Please enter a new name." ;
+    Text [ en-US ] = "The name '%1' already exists. Please enter a new name." ;
 };
 
-ErrorBox RID_ERR_EMPTY_SUBMISSIONNAME
+String RID_STR_EMPTY_SUBMISSIONNAME
 {
-    Buttons = WB_OK ;
-    Message [ en-US ] = "The submission must have a name." ;
+    Text [ en-US ] = "The submission must have a name." ;
 };
 
 Menu RID_MENU_DATANAVIGATOR