QueryBox RID_QRY_* -> MessageDialog + string

Change-Id: I3349a513a1e1b6fefd1f0f07a8a0798a325d87db

3 files changed, 9 insertions, 26 deletions

diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc
index ac716b0c44ec..2ab08ccc3da6 100644
--- a/extensions/source/abpilot/abpresid.hrc
+++ b/extensions/source/abpilot/abpresid.hrc
@@ -28,7 +28,6 @@
 #define RID_PAGE_START                  RID_ABP_START
 #define RID_STRING_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
 
 // strings
@@ -46,18 +45,11 @@
 #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 )
+#define RID_STR_QRY_NO_EVO_GW           ( RID_STRING_START +  13 )
+#define RID_STR_QRY_NOTABLES            ( RID_STRING_START +  14 )
 // please adjust RID_STRING_END (below) when adding new strings
 
-#define RID_STRING_END                  RID_STR_NEEDTYPESELECTION
-
-// query boxes
-
-#define RID_QRY_NOTABLES                ( RID_QUERYBOX_START +  0 )
-// please adjust RID_QUERYBOX_END (below) when adding new query boxes
-
-#define RID_QRY_NO_EVO_GW               ( RID_QUERYBOX_START +  1 )
-
-#define RID_QUERYBOX_END                RID_QRY_NO_EVO_GW
+#define RID_STRING_END                  RID_STR_QRY_NOTABLES
 
 // untyped resources
 
@@ -78,9 +70,6 @@
 #if RID_STRING_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
 #if RID_UNTYPED_END > RID_ABP_END
     #error "please adjust the resource id ranges!!"
 #endif
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index a93dd1e4833d..bfe4cb17e423 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -28,7 +28,7 @@
 #include "admininvokationpage.hxx"
 #include "tableselectionpage.hxx"
 #include <vcl/waitobj.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/settings.hxx>
 #include "abpfinalpage.hxx"
 #include "fieldmappingpage.hxx"
@@ -276,7 +276,7 @@ namespace abp
 
             if ( aTables.empty() )
             {
-                if ( RET_YES != QueryBox( this, ModuleRes( ( getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_QRY_NO_EVO_GW : RID_QRY_NOTABLES ) ) ).Execute() )
+                if (RET_YES != MessageDialog(this, ModuleRes(( getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_STR_QRY_NO_EVO_GW : RID_STR_QRY_NOTABLES)), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute())
                 {
                     // cannot ask the user, or the user chose to use this data source, though there are no tables
                     bAllow = false;
diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src
index 985915b3e0a9..bb8ac22156dd 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -54,20 +54,14 @@ String RID_STR_NEEDTYPESELECTION
     Text [ en-US ] = "Please select a type of address book.";
 };
 
-QueryBox RID_QRY_NOTABLES
+String RID_STR_QRY_NOTABLES
 {
-    Buttons = WB_YES_NO;
-    DefButton = WB_DEF_NO;
-
-    Message [ en-US ] = "The data source does not contain any tables.\nDo you want to set it up as an address data source, anyway?";
+    Text [ en-US ] = "The data source does not contain any tables.\nDo you want to set it up as an address data source, anyway?";
 };
 
-QueryBox RID_QRY_NO_EVO_GW
+String RID_STR_QRY_NO_EVO_GW
 {
-    Buttons = WB_YES_NO;
-    DefButton = WB_DEF_NO;
-
-    Message [ en-US ] = "You don't seem to have any GroupWise account configured in Evolution.\nDo you want to set it up as an address data source, anyway?";
+    Text [ en-US ] = "You don't seem to have any GroupWise account configured in Evolution.\nDo you want to set it up as an address data source, anyway?";
 };
 
 String RID_STR_DEFAULT_NAME