[Libreoffice-commits] core.git: xmlsecurity/inc xmlsecurity/source xmlsecurity/uiconfig
Miklos Vajna
vmiklos at collabora.co.uk
Wed Nov 16 15:52:45 UTC 2016
xmlsecurity/inc/digitalsignaturesdialog.hxx | 6 ++---
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 18 ++++++++---------
xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui | 5 ++--
3 files changed, 15 insertions(+), 14 deletions(-)
New commits:
commit ece5862b5dbe6b7af28465ae3d452c548e37e7a3
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Nov 16 16:25:00 2016 +0100
xmlsecurity: fix alignment for XAdES checkbox
And rename it to AdES, as the PDF PAdES generation will be affected by
this checkbox in the near future.
Change-Id: I06121e4eb9debac7a55a737a71780c2fa5c4d084
Reviewed-on: https://gerrit.libreoffice.org/30908
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Tor Lillqvist <tml at collabora.com>
diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx
index c9226e6..4c3c6de 100644
--- a/xmlsecurity/inc/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx
@@ -70,7 +70,7 @@ private:
VclPtr<FixedImage> m_pSigsOldSignatureImg;
VclPtr<FixedText> m_pSigsOldSignatureFI;
- VclPtr<CheckBox> m_pXAdESCompliantCB;
+ VclPtr<CheckBox> m_pAdESCompliantCB;
VclPtr<PushButton> m_pViewBtn;
VclPtr<PushButton> m_pAddBtn;
@@ -84,9 +84,9 @@ private:
bool m_bHasDocumentSignature;
bool m_bWarningShowSignMacro;
- bool m_bXAdESCompliant;
+ bool m_bAdESCompliant;
- DECL_LINK(XAdESCompliantCheckBoxHdl, CheckBox&, void);
+ DECL_LINK(AdESCompliantCheckBoxHdl, CheckBox&, void);
DECL_LINK(ViewButtonHdl, Button*, void);
DECL_LINK(AddButtonHdl, Button*, void);
DECL_LINK(RemoveButtonHdl, Button*, void);
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index c48c5ad..a3dd54a 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -116,7 +116,7 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
get(m_pHintDocFT, "dochint");
get(m_pHintBasicFT, "macrohint");
get(m_pHintPackageFT, "packagehint");
- get(m_pXAdESCompliantCB, "xadescompliant");
+ get(m_pAdESCompliantCB, "adescompliant");
get(m_pViewBtn, "view");
get(m_pAddBtn, "sign");
get(m_pRemoveBtn, "remove");
@@ -130,7 +130,7 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
get(m_pSigsOldSignatureImg, "oldsignatureimg");
get(m_pSigsOldSignatureFI, "oldsignatureft");
- m_bXAdESCompliant = !DocumentSignatureHelper::isODFPre_1_2(m_sODFVersion);
+ m_bAdESCompliant = !DocumentSignatureHelper::isODFPre_1_2(m_sODFVersion);
Size aControlSize(275, 109);
const long nControlWidth = aControlSize.Width();
@@ -154,8 +154,8 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
m_pSignaturesLB->SetSelectHdl( LINK( this, DigitalSignaturesDialog, SignatureHighlightHdl ) );
m_pSignaturesLB->SetDoubleClickHdl( LINK( this, DigitalSignaturesDialog, SignatureSelectHdl ) );
- m_pXAdESCompliantCB->SetToggleHdl( LINK( this, DigitalSignaturesDialog, XAdESCompliantCheckBoxHdl ) );
- m_pXAdESCompliantCB->Check(m_bXAdESCompliant);
+ m_pAdESCompliantCB->SetToggleHdl( LINK( this, DigitalSignaturesDialog, AdESCompliantCheckBoxHdl ) );
+ m_pAdESCompliantCB->Check(m_bAdESCompliant);
m_pViewBtn->SetClickHdl( LINK( this, DigitalSignaturesDialog, ViewButtonHdl ) );
m_pViewBtn->Disable();
@@ -202,7 +202,7 @@ void DigitalSignaturesDialog::dispose()
m_pSigsNotvalidatedFI.clear();
m_pSigsOldSignatureImg.clear();
m_pSigsOldSignatureFI.clear();
- m_pXAdESCompliantCB.clear();
+ m_pAdESCompliantCB.clear();
m_pViewBtn.clear();
m_pAddBtn.clear();
m_pRemoveBtn.clear();
@@ -357,7 +357,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureHighlightHdl, SvTreeListBox*,
IMPL_LINK_NOARG(DigitalSignaturesDialog, OKButtonHdl, Button*, void)
{
- maSignatureManager.write(m_bXAdESCompliant);
+ maSignatureManager.write(m_bAdESCompliant);
EndDialog(RET_OK);
}
@@ -368,9 +368,9 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureSelectHdl, SvTreeListBox*, boo
return false;
}
-IMPL_LINK_NOARG(DigitalSignaturesDialog, XAdESCompliantCheckBoxHdl, CheckBox&, void)
+IMPL_LINK_NOARG(DigitalSignaturesDialog, AdESCompliantCheckBoxHdl, CheckBox&, void)
{
- m_bXAdESCompliant = m_pXAdESCompliantCB->IsChecked();
+ m_bAdESCompliant = m_pAdESCompliantCB->IsChecked();
}
IMPL_LINK_NOARG(DigitalSignaturesDialog, ViewButtonHdl, Button*, void)
@@ -390,7 +390,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl, Button*, void)
if ( aChooser->Execute() == RET_OK )
{
sal_Int32 nSecurityId;
- if (!maSignatureManager.add(aChooser->GetSelectedCertificate(), aChooser->GetDescription(), nSecurityId, m_bXAdESCompliant))
+ if (!maSignatureManager.add(aChooser->GetSelectedCertificate(), aChooser->GetDescription(), nSecurityId, m_bAdESCompliant))
return;
mbSignaturesChanged = true;
diff --git a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
index 10c0685..1e82fdd 100644
--- a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
+++ b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
@@ -367,11 +367,12 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="xadescompliant">
- <property name="label" translatable="yes">Use XAdES-compliant signature when there is a choice</property>
+ <object class="GtkCheckButton" id="adescompliant">
+ <property name="label" translatable="yes">Use AdES-compliant signature when there is a choice</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="halign">start</property>
</object>
<packing>
<property name="expand">False</property>
More information about the Libreoffice-commits
mailing list