oox/source/drawingml/customshapepresetdata.cxx | 6 +++--- xmlsecurity/source/helper/documentsignaturemanager.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 90a77e9c13eb9b2aa6e83653d9d2d1409bc47f36 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Mon Nov 14 09:25:27 2016 +0100 oox, xmlsecurity: fix recently introduced style problems These files had a consistent style previously, keep them that way. Change-Id: I6347efd4a301ddd758f4661778c0dfb68585940d diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx index df9307e..175e291 100644 --- a/oox/source/drawingml/customshapepresetdata.cxx +++ b/oox/source/drawingml/customshapepresetdata.cxx @@ -318,10 +318,10 @@ void lcl_parseHandleRange(std::vector<beans::PropertyValue>& rHandle, const OStr void lcl_parseHandleRef(std::vector<beans::PropertyValue>& rHandle, const OString& rValue, const OUString& rName) { static const char aPrefix[] = "\", Handle = (long) 0, Value = (any) { (long) "; - const sal_Int32 nCheck= SAL_N_ELEMENTS( aPrefix ) - 1; - const sal_Int32 nStart= SAL_N_ELEMENTS( "Name = \"" ) - 1 + rName.getLength(); + const sal_Int32 nCheck= SAL_N_ELEMENTS(aPrefix) - 1; + const sal_Int32 nStart= SAL_N_ELEMENTS("Name = \"") - 1 + rName.getLength(); - if ( rValue.copy( nStart , nCheck ).equalsL( aPrefix, nCheck ) ) + if (rValue.copy(nStart , nCheck).equalsL(aPrefix, nCheck)) { sal_Int32 nIndex = nStart + nCheck; beans::PropertyValue aPropertyValue; diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx index 8d6bb46..f10c277 100644 --- a/xmlsecurity/source/helper/documentsignaturemanager.cxx +++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx @@ -279,7 +279,7 @@ bool DocumentSignatureManager::add(const uno::Reference<security::XCertificate>& maSignatureHelper.SetX509Certificate(nSecurityId, xCert->getIssuerName(), aCertSerial, aStrBuffer.makeStringAndClear(), aCertDigest); - uno::Sequence< uno::Reference< security::XCertificate > > aCertPath = getSecurityEnvironment()->buildCertificatePath( xCert ); + uno::Sequence< uno::Reference< security::XCertificate > > aCertPath = getSecurityEnvironment()->buildCertificatePath(xCert); const uno::Reference< security::XCertificate >* pCertPath = aCertPath.getConstArray(); sal_Int32 nCnt = aCertPath.getLength(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits