cppunit/ExternalPackage_cppunit.mk | 2 xmlsecurity/Library_xsec_xmlsec.mk | 1 xmlsecurity/source/helper/xmlsignaturehelper.cxx | 1 xmlsecurity/source/xmlsec/serialnumberadapter.cxx | 99 ++++++++++++ xmlsecurity/source/xmlsec/serialnumberadapter.hxx | 49 +++++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 3 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx | 6 xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx | 3 xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx | 6 xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 70 +------- xmlsecurity/util/xsec_xmlsec.component | 2 xmlsecurity/util/xsec_xmlsec.windows.component | 2 12 files changed, 175 insertions(+), 69 deletions(-)
New commits: commit 6f067655b316f3e06bad8f786d31369e1174ea23 Author: Stephan Bergmann <[email protected]> Date: Fri Dec 7 07:53:15 2012 +0100 Typo Change-Id: Iff8315535293613423199aaffeac904e721928bf diff --git a/cppunit/ExternalPackage_cppunit.mk b/cppunit/ExternalPackage_cppunit.mk index 3d8ab3f..dfcc659 100644 --- a/cppunit/ExternalPackage_cppunit.mk +++ b/cppunit/ExternalPackage_cppunit.mk @@ -23,7 +23,7 @@ endif else $(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester,src/DllPlugInTester/.libs/DllPlugInTester)) ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/libcppunit-1.13.0.dylib,src/cppunit/.libs/libcppunit-1.1.3.0.dylib)) +$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/libcppunit-1.13.0.dylib,src/cppunit/.libs/libcppunit-1.13.0.dylib)) else ifeq ($(OS),AIX) $(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.a,src/cppunit/.libs/libcppunit-1.13.a)) else ifeq ($(OS),OPENBSD) commit 973a16f9e6a6da4f975413af253265618d1b0b67 Author: Stephan Bergmann <[email protected]> Date: Thu Dec 6 23:40:13 2012 +0100 Adapt to XComponentContext Change-Id: I2f2c745245722f90b8101995367c55878d568703 diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx index c09d112..fbbb16a 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx @@ -19,7 +19,6 @@ #include "xmldocumentwrapper_xmlsecimpl.hxx" -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <xmloff/attrlist.hxx> #include "xmlelementwrapper_xmlsecimpl.hxx" @@ -1076,7 +1075,7 @@ cssu::Sequence< rtl::OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSuppor #undef SERVICE_NAME cssu::Reference< cssu::XInterface > SAL_CALL XMLDocumentWrapper_XmlSecImpl_createInstance( - const cssu::Reference< cssl::XMultiServiceFactory > &) + const cssu::Reference< cssu::XComponentContext > &) throw( cssu::Exception ) { return (cppu::OWeakObject*) new XMLDocumentWrapper_XmlSecImpl( ); diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx index c519107..1394fa6 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx @@ -34,6 +34,10 @@ #include <libxml/tree.h> +namespace com { namespace sun { namespace star { namespace uno { + class XComponentContext; +} } } } + class XMLDocumentWrapper_XmlSecImpl : public cppu::WeakImplHelper4 < com::sun::star::xml::wrapper::XXMLDocumentWrapper, @@ -262,7 +266,7 @@ com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL XMLDocumentWrapper_XmlSecImpl_createInstance( - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr) + const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > &) throw ( com::sun::star::uno::Exception ); #endif diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx index 57c90a6..d0363b3 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx @@ -23,7 +23,6 @@ #include <cppuhelper/typeprovider.hxx> namespace cssu = com::sun::star::uno; -namespace cssl = com::sun::star::lang; #define SERVICE_NAME "com.sun.star.xml.wrapper.XMLElementWrapper" #define IMPLEMENTATION_NAME "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" @@ -95,7 +94,7 @@ cssu::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupport cssu::Reference< cssu::XInterface > SAL_CALL XMLElementWrapper_XmlSecImpl_createInstance( - const cssu::Reference< cssl::XMultiServiceFactory > &) + const cssu::Reference< cssu::XComponentContext > &) throw( cssu::Exception ) { return (cppu::OWeakObject*) new XMLElementWrapper_XmlSecImpl(NULL); diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx index 6ae4818..73b0b21 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx @@ -28,6 +28,10 @@ #include <libxml/tree.h> +namespace com { namespace sun { namespace star { namespace uno { + class XComponentContext; +} } } } + class XMLElementWrapper_XmlSecImpl : public cppu::WeakImplHelper3 < com::sun::star::xml::wrapper::XXMLElementWrapper, @@ -89,7 +93,7 @@ com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSec com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL XMLElementWrapper_XmlSecImpl_createInstance( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > & rSMgr) + com::sun::star::uno::XComponentContext > &) throw ( com::sun::star::uno::Exception ); #endif diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx index d53d063..c333b35 100644 --- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx +++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx @@ -21,7 +21,6 @@ #include <sal/config.h> #include <cppuhelper/factory.hxx> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include "serialnumberadapter.hxx" #include "xmlelementwrapper_xmlsecimpl.hxx" @@ -45,20 +44,20 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_xmlsec_component_getFactory( const sal_ void* pRet = 0; Reference< XInterface > xFactory ; - if( pImplName != NULL && pServiceManager != NULL ) { + if( pImplName != NULL ) { if( XMLElementWrapper_XmlSecImpl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) ) { - xFactory = Reference< XSingleServiceFactory >( createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + xFactory = cppu::createSingleComponentFactory( + XMLElementWrapper_XmlSecImpl_createInstance, OUString::createFromAscii( pImplName ), - XMLElementWrapper_XmlSecImpl_createInstance, XMLElementWrapper_XmlSecImpl_getSupportedServiceNames() ) ); + XMLElementWrapper_XmlSecImpl_getSupportedServiceNames() ); } else if( XMLDocumentWrapper_XmlSecImpl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) ) { - xFactory = Reference< XSingleServiceFactory >( createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + xFactory = cppu::createSingleComponentFactory( + XMLDocumentWrapper_XmlSecImpl_createInstance, OUString::createFromAscii( pImplName ), - XMLDocumentWrapper_XmlSecImpl_createInstance, XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames() ) ); + XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames() ); } else if( xml_security::serial_number_adapter::implementationName().equals( OUString::createFromAscii( pImplName ) ) ) { commit 3ef014c828e2e1f3f0356e2f3cbc8b0a892f0f24 Author: Stephan Bergmann <[email protected]> Date: Thu Dec 6 23:08:55 2012 +0100 Unused include Change-Id: Ica71cc0eec1054386221c779948381e274ee6475 diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index ca9ef06..51d8111 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/security/SerialNumberAdapter.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/Writer.hpp> commit 5da74dcdea45c0367a54486fab8b790215022678 Author: Stephan Bergmann <[email protected]> Date: Thu Dec 6 23:02:08 2012 +0100 Clean up SerialNumberAdapter implementation Change-Id: Iebf992544cb71fd2e2f4541a5a63fc962150e390 diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 68cdf0a..1396f02 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -84,6 +84,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ xmlsecurity/source/xmlsec/diagnose \ xmlsecurity/source/xmlsec/errorcallback \ xmlsecurity/source/xmlsec/saxhelper \ + xmlsecurity/source/xmlsec/serialnumberadapter \ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl \ xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl \ xmlsecurity/source/xmlsec/xmlstreamio \ diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx new file mode 100644 index 0000000..c441c48 --- /dev/null +++ b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx @@ -0,0 +1,99 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include "sal/config.h" + +#include "boost/noncopyable.hpp" +#include "com/sun/star/lang/XServiceInfo.hpp" +#include "com/sun/star/security/XSerialNumberAdapter.hpp" +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/uno/XInterface.hpp" +#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/supportsservice.hxx" +#include "cppuhelper/weak.hxx" +#include "rtl/ustring.hxx" +#include "sal/types.h" +#include "xmlsecurity/biginteger.hxx" + +#include "serialnumberadapter.hxx" + +namespace { + +class Service: + public cppu::WeakImplHelper2< + css::lang::XServiceInfo, css::security::XSerialNumberAdapter >, + private boost::noncopyable +{ +public: + Service() {} + +private: + virtual ~Service() {} + + virtual OUString SAL_CALL getImplementationName() + throw (css::uno::RuntimeException) + { return xml_security::serial_number_adapter::implementationName(); } + + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) + throw (css::uno::RuntimeException) + { return cppu::supportsService(this, ServiceName); } + + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException) + { return xml_security::serial_number_adapter::serviceNames(); } + + virtual OUString SAL_CALL toString( + css::uno::Sequence< sal_Int8 > const & SerialNumber) + throw (css::uno::RuntimeException) + { return bigIntegerToNumericString(SerialNumber); } + + virtual css::uno::Sequence< sal_Int8 > SAL_CALL toSequence( + OUString const & SerialNumber) + throw (css::uno::RuntimeException) + { return numericStringToBigInteger(SerialNumber); } +}; + +} + +css::uno::Reference< css::uno::XInterface > +xml_security::serial_number_adapter::create( + css::uno::Reference< css::uno::XComponentContext > const &) +{ + return static_cast< cppu::OWeakObject * >(new Service); +} + +OUString xml_security::serial_number_adapter::implementationName() + throw (css::uno::RuntimeException) +{ + return OUString("com.sun.star.comp.security.SerialNumberAdapter"); +} + +css::uno::Sequence< OUString > +xml_security::serial_number_adapter::serviceNames() + throw (css::uno::RuntimeException) +{ + css::uno::Sequence< OUString > s(1); + s[0] = "com.sun.star.security.SerialNumberAdapter"; + return s; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx new file mode 100644 index 0000000..987d00c --- /dev/null +++ b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx @@ -0,0 +1,49 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_SERIALNUMBERADAPTER_HXX +#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_SERIALNUMBERADAPTER_HXX + +#include "sal/config.h" + +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/Sequence.hxx" +#include "sal/types.h" + +namespace com { namespace sun { namespace star { namespace uno { + class XComponentContext; + class XInterface; +} } } } +namespace rtl { class OUString; } + +namespace xml_security { namespace serial_number_adapter { + +css::uno::Reference< css::uno::XInterface > SAL_CALL create( + css::uno::Reference< css::uno::XComponentContext > const &); + +rtl::OUString implementationName() throw (css::uno::RuntimeException); + +css::uno::Sequence< rtl::OUString > serviceNames() + throw (css::uno::RuntimeException); + +} } + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx index 7d50c78..d53d063 100644 --- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx +++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx @@ -19,64 +19,17 @@ #include <sal/config.h> -#include <stdio.h> -#include <osl/mutex.hxx> -#include <osl/thread.h> #include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/security/XSerialNumberAdapter.hpp> +#include "serialnumberadapter.hxx" #include "xmlelementwrapper_xmlsecimpl.hxx" #include "xmldocumentwrapper_xmlsecimpl.hxx" -#include "xmlsecurity/biginteger.hxx" -using namespace ::rtl; using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::registry; - -namespace -{ -class SerialNumberAdapterImpl : public WeakImplHelper1< - ::com::sun::star::security::XSerialNumberAdapter > -{ - virtual OUString SAL_CALL toString( const Sequence< sal_Int8 >& rSerialNumber ) - throw (RuntimeException) - { - return bigIntegerToNumericString(rSerialNumber); - } - virtual Sequence< sal_Int8 > SAL_CALL toSequence( const OUString& rSerialNumber ) - throw (RuntimeException) - { - return numericStringToBigInteger(rSerialNumber); - } -}; - -OUString SerialNumberAdapterImpl_getImplementationName() - throw (RuntimeException) -{ - return OUString( "com.sun.star.security.SerialNumberAdapter"); -} - -Sequence< OUString > SerialNumberAdapterImpl_getSupportedServiceNames() - throw (RuntimeException) -{ - Sequence < OUString > aRet(1); - OUString* pArray = aRet.getArray(); - pArray[0] = OUString( "com.sun.star.security.SerialNumberAdapter" ); - return aRet; -} - -Reference< XInterface > SerialNumberAdapterImpl_createInstance( - const Reference< XComponentContext > &) throw( Exception ) -{ - return Reference< XInterface >( *new SerialNumberAdapterImpl() ); -} - -} extern "C" { @@ -107,12 +60,12 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_xmlsec_component_getFactory( const sal_ OUString::createFromAscii( pImplName ), XMLDocumentWrapper_XmlSecImpl_createInstance, XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames() ) ); } - else if( SerialNumberAdapterImpl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) ) + else if( xml_security::serial_number_adapter::implementationName().equals( OUString::createFromAscii( pImplName ) ) ) { xFactory = ::cppu::createSingleComponentFactory( - SerialNumberAdapterImpl_createInstance, + xml_security::serial_number_adapter::create, OUString::createFromAscii( pImplName ), - SerialNumberAdapterImpl_getSupportedServiceNames() ); + xml_security::serial_number_adapter::serviceNames() ); } } diff --git a/xmlsecurity/util/xsec_xmlsec.component b/xmlsecurity/util/xsec_xmlsec.component index a505452..4a78caf 100644 --- a/xmlsecurity/util/xsec_xmlsec.component +++ b/xmlsecurity/util/xsec_xmlsec.component @@ -19,7 +19,7 @@ <component loader="com.sun.star.loader.SharedLibrary" prefix="xsec_xmlsec" xmlns="http://openoffice.org/2010/uno-components";> - <implementation name="com.sun.star.security.SerialNumberAdapter"> + <implementation name="com.sun.star.comp.security.SerialNumberAdapter"> <service name="com.sun.star.security.SerialNumberAdapter"/> </implementation> <implementation name="com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl"> diff --git a/xmlsecurity/util/xsec_xmlsec.windows.component b/xmlsecurity/util/xsec_xmlsec.windows.component index a813859..6498e83 100644 --- a/xmlsecurity/util/xsec_xmlsec.windows.component +++ b/xmlsecurity/util/xsec_xmlsec.windows.component @@ -19,7 +19,7 @@ <component loader="com.sun.star.loader.SharedLibrary" prefix="xsec_xmlsec" xmlns="http://openoffice.org/2010/uno-components";> - <implementation name="com.sun.star.security.SerialNumberAdapter"> + <implementation name="com.sun.star.comp.security.SerialNumberAdapter"> <service name="com.sun.star.security.SerialNumberAdapter"/> </implementation> <implementation name="com.sun.star.xml.security.bridge.xmlsec.NSSInitializer_NssImpl"> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
