From 7e61e4f32aed3822b1f1e08db460085536a0ca28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 21 Aug 2014 14:25:22 +0100
Subject: [PATCH] QueryBox QUERY_SAVE_TABLE_EDIT_INDEXES -> MessageDialog +
 string

Change-Id: I36e6d376936caa847e68a43f64c8fe892afba1ca
---
 dbaccess/source/ui/inc/dbu_resource.hrc            | 4 ++--
 dbaccess/source/ui/tabledesign/TableController.cxx | 4 ++--
 dbaccess/source/ui/tabledesign/table.src           | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 62fc267772c3..dae43c4310a6 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -62,7 +62,7 @@
 #define RID_STR_UNO_END                 RID_STR_UNO_START       + 20    // 414 - 433
 
 #define RID_STR_GEN_START               RID_STR_UNO_END
-#define RID_STR_GEN_END                 RID_STR_GEN_START       + 64    // 434 - 493
+#define RID_STR_GEN_END                 RID_STR_GEN_START       + 65    // 434 - 493
 
 #define RID_STR_APP_START               RID_STR_GEN_END
 #define RID_STR_APP_END                 RID_STR_APP_START       + 40    //   494 - 533
@@ -103,7 +103,6 @@
 #define QUERY_BRW_SAVEMODIFIED          RID_QUERYBOX_START +  1
 #define TABLE_DESIGN_SAVEMODIFIED       RID_QUERYBOX_START +  5
 #define QUERY_SAVE_CURRENT_INDEX        RID_QUERYBOX_START +  7
-#define QUERY_SAVE_TABLE_EDIT_INDEXES   RID_QUERYBOX_START +  8
 #define RELATION_DESIGN_SAVEMODIFIED    RID_QUERYBOX_START +  9
 #define TABLE_DESIGN_ALL_ROWS_DELETED   RID_QUERYBOX_START + 13
 
@@ -223,6 +222,7 @@
 #define STR_QUERY_BRW_DELETE_ROWS           RID_STR_GEN_START + 61
 #define STR_QUERY_CONNECTION_LOST           RID_STR_GEN_START + 62
 #define STR_QUERY_USERADMIN_DELETE_USER     RID_STR_GEN_START + 63
+#define STR_QUERY_SAVE_TABLE_EDIT_INDEXES   RID_STR_GEN_START + 64
 
 // untyped resources
 
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index f95f098ff509..b2565c92f65a 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -65,7 +65,7 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <tools/diagnose_ex.h>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 
 #include <boost/mem_fn.hpp>
 #include <boost/bind.hpp>
@@ -447,7 +447,7 @@ void OTableController::doEditIndexes()
     // table needs to be saved before editing indexes
     if (m_bNew || isModified())
     {
-        QueryBox aAsk(getView(), ModuleRes(QUERY_SAVE_TABLE_EDIT_INDEXES));
+        MessageDialog aAsk(getView(), ModuleRes(STR_QUERY_SAVE_TABLE_EDIT_INDEXES), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO);
         if (RET_YES != aAsk.Execute())
             return;
 
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index ffe540315a3f..dcc6d5179017 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -343,11 +343,9 @@ String STR_TABLEDESIGN_DATASOURCE_DELETED
     Text [ en-US ] = "The table filter could not be adjusted because the data source has been deleted.";
 };
 
-QueryBox QUERY_SAVE_TABLE_EDIT_INDEXES
+String STR_QUERY_SAVE_TABLE_EDIT_INDEXES
 {
-    Message [ en-US ] = "Before you can edit the indexes of a table, you have to save it.\nDo you want to save the changes now?";
-
-    Buttons = WB_YES_NO ;
+    Text [ en-US ] = "Before you can edit the indexes of a table, you have to save it.\nDo you want to save the changes now?";
 };
 
 String STR_TABLEDESIGN_NO_PRIM_KEY_HEAD