summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-08-21 10:04:53 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-08-21 10:17:48 +0100
commit24e76b6506a309c5564cf46dc23df06993a002c7 (patch)
tree9501d1858d1d27b7da2a3c369c55e0e4c09de855
parentbf2c2ec5d8fb6bf4b49015f8a68e8f3dd058c965 (diff)
QueryBox QBX_CONFIRM_DELETE_TOOLBAR -> MessageDialog + string
Change-Id: If03a966ab6519d1335903b7d76cb44c38113a4a3
-rw-r--r--cui/source/customize/cfg.cxx4
-rw-r--r--cui/source/customize/cfg.hrc1
-rw-r--r--cui/source/customize/cfg.src6
-rw-r--r--cui/source/inc/cuires.hrc2
4 files changed, 6 insertions, 7 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 79dba76a9819..21fced93706c 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2995,8 +2995,8 @@ bool SvxToolbarConfigPage::DeleteSelectedContent()
if ( m_pContentsListBox->GetEntryCount() == 0 &&
GetTopLevelSelection()->IsDeletable() )
{
- QueryBox qbox( this,
- CUI_RES( QBX_CONFIRM_DELETE_TOOLBAR ) );
+ MessageDialog qbox(this,
+ CUI_RES(RID_SXVSTR_CONFIRM_DELETE_TOOLBAR), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO);
if ( qbox.Execute() == RET_YES )
{
diff --git a/cui/source/customize/cfg.hrc b/cui/source/customize/cfg.hrc
index 44d8f870db63..5fc6d73d9dd5 100644
--- a/cui/source/customize/cfg.hrc
+++ b/cui/source/customize/cfg.hrc
@@ -38,6 +38,5 @@
#define MODIFY_TOOLBAR_CONTENT (61 + CFG_OFFSET)
#define QBX_CONFIRM_RESTORE_DEFAULT (66 + CFG_OFFSET)
-#define QBX_CONFIRM_DELETE_TOOLBAR (67 + CFG_OFFSET)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index a61a82c5975f..08f1c7208556 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -217,11 +217,9 @@ String RID_SVXSTR_TOOLBAR_NAME
Text [ en-US ] = "Toolbar Name" ;
};
-QueryBox QBX_CONFIRM_DELETE_TOOLBAR
+String RID_SXVSTR_CONFIRM_DELETE_TOOLBAR
{
- Message [ en-US ] = "There are no more commands on the toolbar. Do you want to delete the toolbar?";
- BUTTONS = WB_YES_NO ;
- DEFBUTTON = WB_DEF_NO ;
+ Text [ en-US ] = "There are no more commands on the toolbar. Do you want to delete the toolbar?";
};
/* Translators: Do not translate %SAVE IN SELECTION% It is a placeholder
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index a948b277ff84..b0e48e5f1b14 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -408,6 +408,8 @@
#define RID_SVXSTR_NORESULTS (RID_SVX_START + 1281)
#define RID_SVXSTR_APPLYPERSONA (RID_SVX_START + 1282)
+#define RID_SXVSTR_CONFIRM_DELETE_TOOLBAR (RID_SVX_START + 1283)
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */