.

2026-02-21 23:36:39 +08:00 · 2017-05-25 16:41:19 +03:00
1 changed files with 9 additions and 9 deletions
--- a/DesktopEditor/xmlsec/src/src/OOXMLVerifier.cpp
+++ b/DesktopEditor/xmlsec/src/src/OOXMLVerifier.cpp
@ -177,7 +177,15 @@ public:
        std::wstring sSetupID = FindFirstChild(GetObjectById("idOfficeObject"), L"SetupID").GetText();
        m_guid = U_TO_UTF8(sSetupID);

-        // 2) Check files (Manifect)
+        // 2) Images
+        XmlUtils::CXmlNode nodeImageValid = GetObjectById("idValidSigLnImg");
+        if (nodeImageValid.IsValid())
+            m_sImageValidBase64 = GetBase64Image(nodeImageValid);
+        XmlUtils::CXmlNode nodeImageInvalid = GetObjectById("idInvalidSigLnImg");
+        if (nodeImageInvalid.IsValid())
+            m_sImageInvalidBase64 = GetBase64Image(nodeImageInvalid);
+
+        // 3) Check files (Manifect)
        XmlUtils::CXmlNode nodeManifect = GetObjectById("idPackageObject");
        if (!nodeManifect.IsValid())
        {
@ -197,14 +205,6 @@ public:
                return;
        }

-        // 3) Images
-        XmlUtils::CXmlNode nodeImageValid = GetObjectById("idValidSigLnImg");
-        if (nodeImageValid.IsValid())
-            m_sImageValidBase64 = GetBase64Image(nodeImageValid);
-        XmlUtils::CXmlNode nodeImageInvalid = GetObjectById("idInvalidSigLnImg");
-        if (nodeImageInvalid.IsValid())
-            m_sImageInvalidBase64 = GetBase64Image(nodeImageInvalid);
-
        // 4) Objects
        XmlUtils::CXmlNodes nodesReferences;
        m_node.ReadNode(L"SignedInfo").GetNodes(L"Reference", nodesReferences);