[Libreoffice-commits] core.git: xmlsecurity/source xmlsecurity/workben
Jelle van der Waa
jelle at vdwaa.nl
Sun Aug 11 12:38:19 PDT 2013
xmlsecurity/source/component/certificatecontainer.cxx | 16 ----------
xmlsecurity/source/framework/xsec_framework.cxx | 3 -
xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 7 ----
xmlsecurity/source/helper/xmlsignaturehelper2.hxx | 5 ---
xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx | 3 -
xmlsecurity/workben/signaturetest.cxx | 11 ------
6 files changed, 45 deletions(-)
New commits:
commit 1452e5659796db395efa222d50cc8158275c5442
Author: Jelle van der Waa <jelle at vdwaa.nl>
Date: Sun Aug 11 14:51:09 2013 +0200
fdo#62475 removed pointless comments
Change-Id: I02b264a9661bcefaea96d6c5743352914154427d
Reviewed-on: https://gerrit.libreoffice.org/5345
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx
index f96f766..a1bd01b 100644
--- a/xmlsecurity/source/component/certificatecontainer.cxx
+++ b/xmlsecurity/source/component/certificatecontainer.cxx
@@ -42,7 +42,6 @@ CertificateContainer::searchMap( const OUString & url, const OUString & certific
return ret;
}
-// -------------------------------------------------------------------
sal_Bool
CertificateContainer::isTemporaryCertificate ( const OUString & url, const OUString & certificate_name )
@@ -51,8 +50,6 @@ CertificateContainer::isTemporaryCertificate ( const OUString & url, const OUStr
return searchMap( url, certificate_name, certMap);
}
-// -------------------------------------------------------------------
-
sal_Bool
CertificateContainer::isCertificateTrust ( const OUString & url, const OUString & certificate_name )
throw(::com::sun::star::uno::RuntimeException)
@@ -60,7 +57,6 @@ CertificateContainer::isCertificateTrust ( const OUString & url, const OUString
return searchMap( url, certificate_name, certTrustMap);
}
-// -------------------------------------------------------------------
sal_Bool
CertificateContainer::addCertificate( const OUString & url, const OUString & certificate_name, ::sal_Bool trust )
throw(::com::sun::star::uno::RuntimeException)
@@ -74,7 +70,6 @@ CertificateContainer::addCertificate( const OUString & url, const OUString & cer
return true;
}
-//-------------------------------------------------------------------------
::security::CertificateContainerStatus
CertificateContainer::hasCertificate( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException)
{
@@ -89,7 +84,6 @@ CertificateContainer::hasCertificate( const OUString & url, const OUString & cer
return security::CertificateContainerStatus_NOCERT;
}
}
-//-------------------------------------------------------------------------
OUString SAL_CALL
CertificateContainer::getImplementationName( )
@@ -98,8 +92,6 @@ CertificateContainer::getImplementationName( )
return impl_getStaticImplementationName();
}
-//-------------------------------------------------------------------------
-
sal_Bool SAL_CALL
CertificateContainer::supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException)
@@ -110,8 +102,6 @@ CertificateContainer::supportsService( const OUString& ServiceName )
return sal_False;
}
-//-------------------------------------------------------------------------
-
Sequence< OUString > SAL_CALL
CertificateContainer::getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException)
@@ -119,8 +109,6 @@ CertificateContainer::getSupportedServiceNames( )
return impl_getStaticSupportedServiceNames();
}
-//-------------------------------------------------------------------------
-
Sequence< OUString > SAL_CALL
CertificateContainer::impl_getStaticSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException)
@@ -130,8 +118,6 @@ CertificateContainer::impl_getStaticSupportedServiceNames( )
return aRet;
}
-//-------------------------------------------------------------------------
-
OUString SAL_CALL
CertificateContainer::impl_getStaticImplementationName()
throw(::com::sun::star::uno::RuntimeException)
@@ -139,8 +125,6 @@ CertificateContainer::impl_getStaticImplementationName()
return OUString("com.sun.star.security.CertificateContainer");
}
-//-------------------------------------------------------------------------
-
Reference< XInterface > SAL_CALL CertificateContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager )
throw( RuntimeException )
{
diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx
index 3f84347..6f0c002 100644
--- a/xmlsecurity/source/framework/xsec_framework.cxx
+++ b/xmlsecurity/source/framework/xsec_framework.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include <osl/mutex.hxx>
@@ -41,7 +40,6 @@ using namespace ::com::sun::star::registry;
extern "C"
{
-//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsec_fw_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
@@ -153,5 +151,4 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsec_fw_component_getFactory(
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index 663ba8a..95ba032 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <xmlsecurity/xmlsignaturehelper.hxx>
#include <xmlsignaturehelper2.hxx>
@@ -63,9 +62,7 @@ void SAL_CALL ImplXMLSignatureListener::signatureVerified( sal_Int32 securityId,
maVerifyResultListenerListener.Call( &aResult );
}
-// ---------------------------------------------------------------------------------
// XDocumentHandler
-// ---------------------------------------------------------------------------------
void SAL_CALL ImplXMLSignatureListener::startDocument( )
throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException)
{
@@ -143,9 +140,7 @@ void SAL_CALL ImplXMLSignatureListener::setDocumentLocator( const com::sun::star
}
}
-// ---------------------------------------------------------------------------------
// XUriBinding
-// ---------------------------------------------------------------------------------
UriBindingHelper::UriBindingHelper()
{
@@ -156,7 +151,6 @@ UriBindingHelper::UriBindingHelper( const com::sun::star::uno::Reference < com::
mxStorage = rxStorage;
}
-
void SAL_CALL UriBindingHelper::setUriBinding( const OUString& /*uri*/, const uno::Reference< io::XInputStream >&)
throw (uno::Exception, uno::RuntimeException)
{
@@ -217,5 +211,4 @@ uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno
return xInStream;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
index 53a216a..00571e9 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
@@ -36,7 +36,6 @@ namespace embed {
class XStorage; }
}}}
-
// MT: Not needed any more, remove later...
class ImplXMLSignatureListener : public cppu::WeakImplHelper3
@@ -95,10 +94,7 @@ public:
throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
};
-
-// ---------------------------------------------------------------------------------
// XUriBinding
-// ---------------------------------------------------------------------------------
class UriBindingHelper : public cppu::WeakImplHelper1
<
@@ -108,7 +104,6 @@ class UriBindingHelper : public cppu::WeakImplHelper1
private:
com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxStorage;
-
public:
UriBindingHelper();
UriBindingHelper( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage );
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
index c5117b7..0cfe3e6 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sal/config.h>
#include <rtl/uuid.h>
#include "xmlencryption_mscryptimpl.hxx"
@@ -281,7 +280,6 @@ XMLEncryption_MSCryptImpl :: decrypt(
return aTemplate;
}
aTemplate->setStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
- /*----------------------------------------
if( pEncCtx->resultReplaced != 0 ) {
pContent = pEncryptedData ;
@@ -301,7 +299,6 @@ XMLEncryption_MSCryptImpl :: decrypt(
xmlSecEncCtxDestroy( pEncCtx ) ;
throw RuntimeException() ;
}
- ----------------------------------------*/
//Destroy the encryption context
xmlSecEncCtxDestroy( pEncCtx ) ;
diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx
index 676357f..1346ac3 100644
--- a/xmlsecurity/workben/signaturetest.cxx
+++ b/xmlsecurity/workben/signaturetest.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sal/main.h>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
@@ -66,8 +65,6 @@ void Main();
#define BUTTONHEIGHT 22
#define BUTTONSPACE 20
-// -----------------------------------------------------------------------
-
SAL_IMPLEMENT_MAIN()
{
uno::Reference< lang::XMultiServiceFactory > xMSF;
@@ -102,8 +99,6 @@ void Main();
return 0;
}
-// -----------------------------------------------------------------------
-
class MyWin : public WorkWindow
{
private:
@@ -141,8 +136,6 @@ public:
};
-// -----------------------------------------------------------------------
-
void Main()
{
MyWin aMainWin( NULL, WB_APP | WB_STDWORK | WB_3DLOOK);
@@ -151,8 +144,6 @@ void Main()
Application::Execute();
}
-// -----------------------------------------------------------------------
-
MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
WorkWindow( pParent, nWinStyle ),
maTokenLine( this ),
@@ -214,7 +205,6 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
nY += EDITHEIGHT*3/2;
-
maFixedTextDOCFileName.SetPosSizePixel( TEXTFIELDSTARTX, nY, TEXTFIELDWIDTH, EDITHEIGHT );
maFixedTextDOCFileName.SetText( OUString("Office File:") );
maFixedTextDOCFileName.Show();
@@ -290,7 +280,6 @@ IMPL_LINK_NOARG(MyWin, DigitalSignaturesWithServiceHdl)
security::DocumentDigitalSignatures::createDefault(comphelper::getProcessComponentContext()) );
xD->signDocumentContent( xStore, NULL );
-
return 0;
}
More information about the Libreoffice-commits
mailing list