1 files changed, 4 insertions, 26 deletions
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index 80db62742f24..eb1dd5615065 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,21 +33,11 @@
 
 #include "com/sun/star/xml/crypto/SecurityOperationStatus.hdl"
 #include "xmlsignature_mscryptimpl.hxx"
-
-#ifndef _XMLDOCUMENTWRAPPER_XMLSECIMPL_HXX_
 #include "xmldocumentwrapper_xmlsecimpl.hxx"
-#endif
-
-#ifndef _XMLELEMENTWRAPPER_XMLSECIMPL_HXX_
 #include "xmlelementwrapper_xmlsecimpl.hxx"
-#endif
-
-#ifndef _SECURITYENVIRONMENT_MSCRYPTIMPL_HXX_
 #include "securityenvironment_mscryptimpl.hxx"
-#endif
 #include "xmlstreamio.hxx"
 #include "errorcallback.hxx"
-
 #include "xmlsec/xmlsec.h"
 #include "xmlsec/xmldsig.h"
 #include "xmlsec/crypto.h"
@@ -180,7 +171,6 @@ SAL_CALL XMLSignature_MSCryptImpl :: validate(
     xmlSecKeysMngrPtr pMngr = NULL ;
     xmlSecDSigCtxPtr pDsigCtx = NULL ;
     xmlNodePtr pNode = NULL ;
-    //sal_Bool valid ;
 
     if( !aTemplate.is() )
         throw RuntimeException() ;
@@ -225,15 +215,6 @@ SAL_CALL XMLSignature_MSCryptImpl :: validate(
             throw RuntimeException() ;
     }
 
-    //added for test: save the result
-    /*
-    {
-        FILE *dstFile = fopen( "c:\\1.txt", "w" ) ;
-        xmlDocDump( dstFile, pNode->doc) ;
-        fclose( dstFile ) ;
-    }
-    */
-
      setErrorRecorder( );
 
     pMngr = pSecEnv->createKeysManager() ; //i39448
@@ -246,7 +227,6 @@ SAL_CALL XMLSignature_MSCryptImpl :: validate(
     if( pDsigCtx == NULL )
     {
         pSecEnv->destroyKeysManager( pMngr ) ; //i39448
-        //throw XMLSignatureException() ;
         clearErrorRecorder();
         return aTemplate;
     }
@@ -312,12 +292,12 @@ Sequence< OUString > SAL_CALL XMLSignature_MSCryptImpl :: getSupportedServiceNam
 Sequence< OUString > XMLSignature_MSCryptImpl :: impl_getSupportedServiceNames() {
     ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
     Sequence< OUString > seqServiceNames( 1 ) ;
-    seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLSignature" ) ;
+    seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignature")) ;
     return seqServiceNames ;
 }
 
 OUString XMLSignature_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) {
-    return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl" ) ;
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl")) ;
 }
 
 //Helper for registry
@@ -326,9 +306,7 @@ Reference< XInterface > SAL_CALL XMLSignature_MSCryptImpl :: impl_createInstance
 }
 
 Reference< XSingleServiceFactory > XMLSignature_MSCryptImpl :: impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
-    //Reference< XSingleServiceFactory > xFactory ;
-    //xFactory = ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName , impl_createInstance , impl_getSupportedServiceNames ) ;
-    //return xFactory ;
     return ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName() , impl_createInstance , impl_getSupportedServiceNames() ) ;
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */