diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-06 09:23:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-09 08:34:40 +0000 |
| commit | 6c80a8fe89fadf9a2c7260a09c037a09462f53d1 (patch) | |
| tree | d36da9ee2a5fdc579d2a57ff6ba02deaddfa785a /xmlsecurity/source | |
| parent | e1fc599eb764186e5d511ace9785463eebbc7028 (diff) | |
new loplugin: oncevar
Change-Id: If57390510dde4d166be3141b9f658a7453755d3f
Reviewed-on: https://gerrit.libreoffice.org/19815
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmlsecurity/source')
| -rw-r--r-- | xmlsecurity/source/dialogs/resourcemanager.cxx | 3 | ||||
| -rw-r--r-- | xmlsecurity/source/helper/documentsignaturehelper.cxx | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index dc06278561f8..f6c4ce812c51 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -81,7 +81,6 @@ namespace XmlSec { vector< pair< OUString, OUString > > vecAttrValueOfDN = parseDN(rRawString); OUStringBuffer s1, s2; - OUString sEqual(" = "); typedef vector< pair < OUString, OUString > >::const_iterator CIT; for (CIT i = vecAttrValueOfDN.begin(); i < vecAttrValueOfDN.end(); ++i) { @@ -91,7 +90,7 @@ namespace XmlSec s2.append('\n'); } s1.append(i->second); - s2.append(i->first + sEqual + i->second); + s2.append(i->first + " = " + i->second); } return make_pair(s1.makeStringAndClear(), s2.makeStringAndClear()); } diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 1d78da35c18d..faca8c83170b 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -80,10 +80,6 @@ void ImplFillElementList( const OUString& rRootStorageName, const bool bRecursive, const DocumentSignatureAlgorithm mode) { - OUString aMetaInfName( "META-INF" ); - OUString sMimeTypeName ("mimetype"); - OUString aSep( "/" ); - Reference < css::container::XNameAccess > xElements( rxStore, UNO_QUERY ); Sequence< OUString > aElements = xElements->getElementNames(); sal_Int32 nElements = aElements.getLength(); @@ -92,8 +88,7 @@ void ImplFillElementList( for ( sal_Int32 n = 0; n < nElements; n++ ) { if (mode != OOo3_2Document - && (pNames[n] == aMetaInfName - || pNames[n] == sMimeTypeName)) + && (pNames[n] == "META-INF" || pNames[n] == "mimetype")) { continue; } @@ -117,7 +112,7 @@ void ImplFillElementList( else if ( bRecursive && rxStore->isStorageElement( pNames[n] ) ) { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( pNames[n], css::embed::ElementModes::READ ); - OUString aFullRootName( rRootStorageName + sEncName + aSep ); + OUString aFullRootName( rRootStorageName + sEncName + "/" ); ImplFillElementList(rList, xSubStore, aFullRootName, bRecursive, mode); } } |