From d27cdf1caf4359b5a8b1b8af1b1ec1ede406d8ad Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 21 Aug 2014 12:24:07 +0100 Subject: QueryBox QUERY_DELETE_CONFIRM -> MessageDialog + string Change-Id: Ieae9977fd77f7b28991771a31c18e15be4a4f0dd --- cui/source/inc/cuires.hrc | 2 +- cui/source/options/dbregister.cxx | 7 +------ cui/source/options/doclinkdialog.src | 5 ++--- 3 files changed, 4 insertions(+), 10 deletions(-) (limited to 'cui') diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index ca444371bb0e..3f912465c618 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -96,7 +96,7 @@ // options #define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162) -#define QUERY_DELETE_CONFIRM (RID_SVX_START + 1110) +#define RID_SVXSTR_QUERY_DELETE_CONFIRM (RID_SVX_START + 1110) #define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840) #define STR_LINKEDDOC_DOESNOTEXIST (RID_SVX_START + 1111) #define STR_LINKEDDOC_NO_SYSTEM_FILE (RID_SVX_START + 1169) diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index dd380e7800ed..303a7b570183 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -256,8 +256,6 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet* rSet ) } } - - void DbRegistrationOptionsPage::FillUserData() { HeaderBar &rBar = pPathBox->GetTheHeaderBar(); @@ -269,13 +267,12 @@ void DbRegistrationOptionsPage::FillUserData() SetUserData( aUserData ); } - IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl) { SvTreeListEntry* pEntry = pPathBox->FirstSelected(); if ( pEntry ) { - QueryBox aQuery(this,CUI_RES(QUERY_DELETE_CONFIRM)); + MessageDialog aQuery(this, CUI_RES(RID_SVXSTR_QUERY_DELETE_CONFIRM), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); if ( aQuery.Execute() == RET_YES ) pPathBox->GetModel()->Remove(pEntry); } @@ -289,8 +286,6 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl) return 0; } - - IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl) { SvTreeListEntry* pEntry = pPathBox->GetCurEntry(); diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src index 059f54fa1ebc..6e93f0c373fa 100644 --- a/cui/source/options/doclinkdialog.src +++ b/cui/source/options/doclinkdialog.src @@ -34,10 +34,9 @@ String STR_NAME_CONFLICT Text [ en-US ] = "The name '$file$' is already used for another database.\nPlease choose a different name."; }; -QueryBox QUERY_DELETE_CONFIRM +String RID_SVXSTR_QUERY_DELETE_CONFIRM { - Buttons = WB_YES_NO ; - Message [ en-US ] = "Do you want to delete the entry?" ; + Text [ en-US ] = "Do you want to delete the entry?" ; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit