3 files changed, 2 insertions, 13 deletions
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 8c19cd8bde66..278af5a99388 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -27,7 +27,6 @@
 #include "indexfieldscontrol.hxx"
 #include "indexcollection.hxx"
 #include <vcl/layout.hxx>
-#include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include "UITools.hxx"
@@ -573,7 +572,8 @@ namespace dbaui
 
             if (aSelected->isModified() || aSelected->isNew())
             {
-                QueryBox aQuestion(this, ModuleRes(QUERY_SAVE_CURRENT_INDEX));
+                MessageDialog aQuestion(this, "SaveIndexDialog",
+                                        "dbaccess/ui/saveindexdialog.ui");
                 nResponse = aQuestion.Execute();
             }
         }
diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src
index 2ee7a377dcaf..12ea5d0e494f 100644
--- a/dbaccess/source/ui/dlg/indexdialog.src
+++ b/dbaccess/source/ui/dlg/indexdialog.src
@@ -63,16 +63,6 @@ String STR_NEED_INDEX_FIELDS
     Text [ en-US ] = "The index must contain at least one field.";
 };
 
-QueryBox QUERY_SAVE_CURRENT_INDEX
-{
-    Title [ en-US ] = "Exit Index Design";
-
-    Message [ en-US ] = "Do you want to save the changes made to the current index?";
-
-    Buttons = WB_YES_NO_CANCEL;
-    DefButton = WB_DEF_YES;
-};
-
 String STR_INDEX_NAME_ALREADY_USED
 {
     Text [ en-US ] = "There is already another index named \"$name$\".";
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 8edf0a4e40c0..1851aaab999f 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -101,7 +101,6 @@
 // query boxes
 
 #define TABLE_DESIGN_SAVEMODIFIED       RID_QUERYBOX_START +  5
-#define QUERY_SAVE_CURRENT_INDEX        RID_QUERYBOX_START +  7
 #define RELATION_DESIGN_SAVEMODIFIED    RID_QUERYBOX_START +  9
 #define TABLE_DESIGN_ALL_ROWS_DELETED   RID_QUERYBOX_START + 13