diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-29 10:21:34 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-07 17:42:04 +0200 |
| commit | 5f46289c6a2b3f144a14bc0537d7d775d40323fc (patch) | |
| tree | e01ea84cbd9e0adffdb83468e446195a65151b87 /xmlsecurity | |
| parent | cae9449e06a66df417176e0c162bba3a6d743bd6 (diff) | |
sfx2 classification: don't sort items on the toolbar listbox
Assuming the policy follows a least-confidential -> most-confidential
order, doing a lexicographical sort on the category names does more harm
than good. So use a vector instead of a name-indexed map for categories.
Also, don't duplicate the label map for the current state, but just
store the state in the same category structure that is used for other
(currently not used) categories as well.
Change-Id: I1672192e572abfc22b6aeeb152ee7484086cea91
(cherry picked from commit 900fccc29257d2e226dfcd0fc9ef54f1f5b52ec8)
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/qa/unit/signing/signing.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index f52a2f96e44a..984e06d88fd6 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -212,7 +212,7 @@ void SigningTest::testOOXMLPartial() SignatureState nActual = pObjectShell->GetDocumentSignatureState(); CPPUNIT_ASSERT_MESSAGE( (OString::number( - static_cast<std::underlying_type<SignatureState>::type>(nActual)) + static_cast<std::underlying_type<SignatureState>::type>(nActual)) .getStr()), (nActual == SignatureState::NOTVALIDATED || nActual == SignatureState::PARTIAL_OK)); |