From b13936abe9b8b3571da7058b573e4e6456559dec Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 22 Aug 2014 08:54:32 +0100 Subject: QueryBox MSG_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN -> MessageDialog + string Change-Id: I9dcbc271dac9a2395bf2a7adb160c965627a0277 --- xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 5 ++--- xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc | 2 +- xmlsecurity/source/dialogs/digitalsignaturesdialog.src | 6 ++---- 3 files changed, 5 insertions(+), 8 deletions(-) (limited to 'xmlsecurity/source') diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 53ea3c925718..c0c08d7a88da 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -54,7 +54,6 @@ #include "helpids.hrc" #include "resourcemanager.hxx" -#include #include #include @@ -308,8 +307,8 @@ bool DigitalSignaturesDialog::canAddRemove() //It the user presses 'Add' or 'Remove' several times then, then the warning //is shown every time until the user presses 'OK'. From then on, the warning //is not displayed anymore as long as the signatures dialog is alive. - if (QueryBox( - NULL, XMLSEC_RES(MSG_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN)).Execute() == RET_NO) + if (MessageDialog( + NULL, XMLSEC_RES(STR_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute() == RET_NO) ret = false; else m_bWarningShowSignMacro = true; diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc index 72985550d4cb..51dee1c5aa8b 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc @@ -24,7 +24,7 @@ #define RID_DIGITALSIGNATUREDLG_START 2000 #define STR_XMLSECDLG_OLD_ODF_FORMAT RID_DIGITALSIGNATUREDLG_START -#define MSG_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN (RID_DIGITALSIGNATUREDLG_START + 1) +#define STR_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN (RID_DIGITALSIGNATUREDLG_START + 1) #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src index 37b37db99530..69db6f009362 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src @@ -30,11 +30,9 @@ String STR_XMLSECDLG_OLD_ODF_FORMAT "Save document in ODF 1.2 format and add all desired signatures again."; }; -QueryBox MSG_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN +String STR_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN { - Buttons = WB_YES_NO ; - DefButton = WB_DEF_NO ; - Message [ en-US ] = "Adding or removing a macro signature will remove all document signatures.\n" + Text [ en-US ] = "Adding or removing a macro signature will remove all document signatures.\n" "Do you really want to continue?"; }; -- cgit