summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2014-08-15 20:16:18 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-08-15 23:30:19 +0200
commit0494f0029ffbd17c1355437352bf42b193eab27e (patch)
treea81465578f55b0d6ad0d415307bb37337f06d423 /xmlsecurity
parent2e3d7c742a1c1253c4bb2af1c3d1b1506d2e7af4 (diff)
ErrorBox RID_XMLSECDLG_OLD_ODF_FORMAT to String
Change-Id: I474efcf128b990d148584292422cefa71a3c3c76
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx4
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc2
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.src8
3 files changed, 6 insertions, 8 deletions
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 590a2f2c70a1..1b516ca76a48 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -54,7 +54,7 @@
#include "helpids.hrc"
#include "resourcemanager.hxx"
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <unotools/configitem.hxx>
using namespace ::com::sun::star::security;
@@ -289,7 +289,7 @@ bool DigitalSignaturesDialog::canAddRemove()
if ( (!bSave1_1 && bDoc1_1) || (bSave1_1 && bDoc1_1) )
{
//#4
- ErrorBox err(NULL, XMLSEC_RES(RID_XMLSECDLG_OLD_ODF_FORMAT));
+ MessageDialog err(NULL, XMLSEC_RES(STR_XMLSECDLG_OLD_ODF_FORMAT));
err.Execute();
ret = false;
}
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
index b6f3cc13949a..72985550d4cb 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc
@@ -23,7 +23,7 @@
//global.hrc in xmlsecurity/inc starts at 1000
#define RID_DIGITALSIGNATUREDLG_START 2000
-#define RID_XMLSECDLG_OLD_ODF_FORMAT RID_DIGITALSIGNATUREDLG_START
+#define STR_XMLSECDLG_OLD_ODF_FORMAT RID_DIGITALSIGNATUREDLG_START
#define MSG_XMLSECDLG_QUERY_REMOVEDOCSIGNBEFORESIGN (RID_DIGITALSIGNATUREDLG_START + 1)
#endif
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
index d4baf8f69bd0..37b37db99530 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*r Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -21,11 +21,9 @@
#include "helpids.hrc"
#include "digitalsignaturesdialog.hrc"
-ErrorBox RID_XMLSECDLG_OLD_ODF_FORMAT
+String STR_XMLSECDLG_OLD_ODF_FORMAT
{
- Buttons = WB_OK ;
- DefButton = WB_DEF_OK ;
- Message [ en-US ] =
+ Text [ en-US ] =
"This document contains signatures in ODF 1.1 (OpenOffice.org 2.x) format. "
"Signing documents in %PRODUCTNAME %PRODUCTVERSION requires ODF 1.2 format version. "
"Thus no signatures can be added or removed to this document.\n\n"