xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit d22ab7b444a4e16dc2bd1f7d15fa36a848eaaaed
Author:     Arnaud VERSINI <arnaud.vers...@libreoffice.org>
AuthorDate: Mon Jul 10 21:26:15 2023 +0200
Commit:     Arnaud Versini <arnaud.vers...@libreoffice.org>
CommitDate: Mon Jul 17 10:58:27 2023 +0200

    xmlsecurity : simplify DigitalSignaturesDialog::canAddRemove.
    
    (!a && b) || (a && b) => b
    
    Change-Id: Iee9ae38d9dc5f6aa94eaff61b3937633f5da7af1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154285
    Tested-by: Jenkins
    Reviewed-by: Arnaud Versini <arnaud.vers...@libreoffice.org>

diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx 
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 9a6222c59e1e..2e14e609773f 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -91,11 +91,6 @@ namespace
     public:
     virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames 
) override;
         SaveODFItem();
-        //See group ODF in Common.xcs
-        bool isLessODF1_2() const
-        {
-            return m_nODF < 3;
-        }
     };
 
     void SaveODFItem::ImplCommit() {}
@@ -295,13 +290,12 @@ bool DigitalSignaturesDialog::canAddRemove()
     OSL_ASSERT(maSignatureManager.getStore().is());
     bool bDoc1_1 = DocumentSignatureHelper::isODFPre_1_2(m_sODFVersion);
     SaveODFItem item;
-    bool bSave1_1 = item.isLessODF1_2();
 
     // see specification
     //cvs: specs/www/appwide/security/Electronic_Signatures_and_Security.sxw
     //Paragraph 'Behavior with regard to ODF 1.2'
     //For both, macro and document
-    if ( (!bSave1_1  && bDoc1_1) || (bSave1_1 && bDoc1_1) )
+    if ( bDoc1_1 )
     {
         //#4
         std::unique_ptr<weld::MessageDialog> 
xBox(Application::CreateMessageDialog(m_xDialog.get(),

Reply via email to