From 3236e205f4b0ab43fb11f8ce3ebe8cfa749da6d5 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Fri, 15 Aug 2014 20:43:16 +0200
Subject: ErrorBox RID_ERR_NEEDTYPESELECTION to String

Change-Id: Ia7b4807bc3847a50f753541b0495d36176603e63
---
 extensions/source/abpilot/abpresid.hrc          | 14 ++------------
 extensions/source/abpilot/abspilot.src          |  7 ++-----
 extensions/source/abpilot/typeselectionpage.cxx |  4 ++--
 3 files changed, 6 insertions(+), 19 deletions(-)

(limited to 'extensions/source/abpilot')

diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc
index 2b0681e29672..ac716b0c44ec 100644
--- a/extensions/source/abpilot/abpresid.hrc
+++ b/extensions/source/abpilot/abpresid.hrc
@@ -27,7 +27,6 @@
 
 #define RID_PAGE_START                  RID_ABP_START
 #define RID_STRING_START                RID_ABP_START
-#define RID_ERRORBOX_START              RID_ABP_START
 #define RID_UNTYPED_START               RID_ABP_START
 #define RID_QUERYBOX_START              RID_ABP_START
 #define RID_BITMAP_START                RID_ABP_START
@@ -46,16 +45,10 @@
 #define RID_STR_TABLE_SELECTION         ( RID_STRING_START +  9 )
 #define RID_STR_MANUAL_FIELD_MAPPING    ( RID_STRING_START +  10 )
 #define RID_STR_FINAL_CONFIRM           ( RID_STRING_START +  11 )
+#define RID_STR_NEEDTYPESELECTION       ( RID_STRING_START +  12 )
 // please adjust RID_STRING_END (below) when adding new strings
 
-#define RID_STRING_END                  RID_STR_FINAL_CONFIRM
-
-// error boxes
-
-#define RID_ERR_NEEDTYPESELECTION       ( RID_ERRORBOX_START +  0 )
-// please adjust RID_ERRORBOX_END (below) when adding new error boxes
-
-#define RID_ERRORBOX_END                RID_ERR_NEEDTYPESELECTION
+#define RID_STRING_END                  RID_STR_NEEDTYPESELECTION
 
 // query boxes
 
@@ -85,9 +78,6 @@
 #if RID_STRING_END > RID_ABP_END
     #error "please adjust the resource id ranges!!"
 #endif
-#if RID_ERRORBOX_END > RID_ABP_END
-    #error "please adjust the resource id ranges!!"
-#endif
 #if RID_QUERYBOX_END > RID_ABP_END
     #error "please adjust the resource id ranges!!"
 #endif
diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src
index 7bf3cbb2f656..985915b3e0a9 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -49,12 +49,9 @@ String RID_STR_FINAL_CONFIRM
     Text [ en-US ] = "Data Source Title";
 };
 
-
-ErrorBox RID_ERR_NEEDTYPESELECTION
+String RID_STR_NEEDTYPESELECTION
 {
-    Buttons = WB_OK;
-
-    Message [ en-US ] = "Please select a type of address book.";
+    Text [ en-US ] = "Please select a type of address book.";
 };
 
 QueryBox RID_QRY_NOTABLES
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index a2615d81f0d6..79361869e8b7 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -20,7 +20,7 @@
 #include "typeselectionpage.hxx"
 #include "addresssettings.hxx"
 #include "abspilot.hxx"
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <com/sun/star/sdbc/DriverManager.hpp>
 #include <comphelper/processfactory.hxx>
@@ -226,7 +226,7 @@ namespace abp
 
         if (AST_INVALID == getSelectedType( ))
         {
-            ErrorBox aError(this, ModuleRes(RID_ERR_NEEDTYPESELECTION));
+            MessageDialog aError(this, ModuleRes(RID_STR_NEEDTYPESELECTION));
             aError.Execute();
             return false;
         }
-- 
cgit