[Libreoffice-commits] .: 2 commits - extensions/source xmlsecurity/source

[Thomas Arnhold]

 extensions/source/plugin/win/winmgr.cxx                        |   20 ----------
 xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx |   18 ---------
 2 files changed, 38 deletions(-)

New commits:
commit 3e39bb8d56c5f3e0fd1d83a0c445f060a11a21c8
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun Feb 20 18:58:10 2011 +0100

    Remove hard-coded debug stuff

diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx
index e94394f..657a879 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -64,20 +64,6 @@ using namespace com::sun::star::plugin;
 
 typedef map< OString, OUString, less< OString > > PluginLocationMap;
 
-
-#if OSL_DEBUG_LEVEL > 1
-#include <stdio.h>
-
-static void logPlugin( OUString const & path_ )
-{
-    static FILE * s_file = 0;
-    if (! s_file)
-        s_file = fopen( "d:\\plugins.log", "a+" );
-    OString path( OUStringToOString( path_, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( s_file, "%s\n", path.getStr() );
-}
-#endif
-
 //__________________________________________________________________________________________________
 static void addPluginsFromPath( const TCHAR * pPluginsPath, PluginLocationMap & rPlugins )
 {
@@ -121,9 +107,6 @@ static void addPluginsFromPath( const TCHAR * pPluginsPath, PluginLocationMap &
 
             OUString path( OStringToOUString( arComplete, RTL_TEXTENCODING_MS_1252 ) );
             rPlugins[ aName ] = path;
-#if OSL_DEBUG_LEVEL > 1
-            logPlugin( path );
-#endif
         }
 
         if (! ::FindNextFile( hFind, &aFindData ))
@@ -252,9 +235,6 @@ static void add_MozPlugin( HKEY hKey, PluginLocationMap & rPlugins )
              rPlugins.find( aName ) == rPlugins.end())
         {
             rPlugins[ aName ] = aUPath;
-#if OSL_DEBUG_LEVEL > 1
-            logPlugin( aUPath );
-#endif
         }
     }
 }
commit 6c6b8a45a379b2579f60471efdb7970ce4ad96c6
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun Feb 20 18:54:06 2011 +0100

    Remove dead code

diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index a21e06f..6dd1ab1 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -33,15 +33,11 @@
 
 #include "com/sun/star/xml/crypto/SecurityOperationStatus.hdl"
 #include "xmlsignature_mscryptimpl.hxx"
-
 #include "xmldocumentwrapper_xmlsecimpl.hxx"
-
 #include "xmlelementwrapper_xmlsecimpl.hxx"
-
 #include "securityenvironment_mscryptimpl.hxx"
 #include "xmlstreamio.hxx"
 #include "errorcallback.hxx"
-
 #include "xmlsec/xmlsec.h"
 #include "xmlsec/xmldsig.h"
 #include "xmlsec/crypto.h"
@@ -175,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() ;
@@ -220,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
@@ -241,7 +227,6 @@ SAL_CALL XMLSignature_MSCryptImpl :: validate(
     if( pDsigCtx == NULL )
     {
         pSecEnv->destroyKeysManager( pMngr ) ; //i39448
-        //throw XMLSignatureException() ;
         clearErrorRecorder();
         return aTemplate;
     }
@@ -321,9 +306,6 @@ 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() ) ;
 }