diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-25 13:41:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-25 16:45:25 +0100 |
| commit | 25e71834a4fd7ed1c6a6f098f176119af0710f11 (patch) | |
| tree | 45f5bb45f7a6c6ece7252081c2e748594bd6d22b /dbaccess/source | |
| parent | 35376f92eac8bf0aca872f04d8cc46cec273d687 (diff) | |
convert RELATION_DESIGN_SAVEMODIFIED with custom buttons to .ui
Change-Id: Ifc0ccdf278e9f249845cf8bc12eece8f5a5f0d86
Diffstat (limited to 'dbaccess/source')
| -rw-r--r-- | dbaccess/source/ui/inc/dbu_resource.hrc | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/relationdesign/RelationController.cxx | 5 | ||||
| -rw-r--r-- | dbaccess/source/ui/relationdesign/relation.src | 7 |
3 files changed, 3 insertions, 10 deletions
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index 1851aaab999f..c7efd79ec25d 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 RELATION_DESIGN_SAVEMODIFIED RID_QUERYBOX_START + 9 #define TABLE_DESIGN_ALL_ROWS_DELETED RID_QUERYBOX_START + 13 // images diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 49f2f7ba72b0..0237d46212e4 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -56,7 +56,7 @@ #include <com/sun/star/io/XActiveDataSink.hpp> #include "sqlmessage.hxx" #include "RelationController.hxx" -#include <vcl/msgbox.hxx> +#include <vcl/layout.hxx> #include "TableWindowData.hxx" #include "UITools.hxx" #include "RTableConnectionData.hxx" @@ -255,7 +255,8 @@ short ORelationController::saveModified() short nSaved = RET_YES; if(haveDataSource() && isModified()) { - QueryBox aQry(getView(), ModuleRes(RELATION_DESIGN_SAVEMODIFIED)); + MessageDialog aQry(getView(), "DesignSaveModifiedDialog", + "dbaccess/ui/designsavemodifieddialog.ui"); nSaved = aQry.Execute(); if(nSaved == RET_YES) Execute(ID_BROWSER_SAVEDOC,Sequence<PropertyValue>()); diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src index 153d1730b5fa..a74275ebacf2 100644 --- a/dbaccess/source/ui/relationdesign/relation.src +++ b/dbaccess/source/ui/relationdesign/relation.src @@ -47,13 +47,6 @@ String STR_RELATIONDESIGN_NOT_AVAILABLE Text [ en-US ] = "The database does not support relations." ; }; -QueryBox RELATION_DESIGN_SAVEMODIFIED -{ - Buttons = WB_YES_NO_CANCEL ; - DefButton = WB_DEF_YES ; - Message [ en-US ] = "The relation design has been changed.\nDo you want to save the changes?" ; -}; - String STR_QUERY_REL_DELETE_WINDOW { Text [ en-US ] = "When you delete this table all corresponding relations will be deleted as well. Continue?"; |