[Libreoffice-commits] core.git: 5 commits - cpputools/source desktop/source extensions/source include/tools offapi/com offapi/UnoApi_offapi.mk reportdesign/source toolkit/source tools/source xmlsecurity/source
Noel Grandin
noel at peralex.com
Mon Jun 10 01:21:27 PDT 2013
cpputools/source/unoexe/unoexe.cxx | 7
desktop/source/offacc/acceptor.cxx | 11 -
extensions/source/propctrlr/buttonnavigationhandler.cxx | 5
include/tools/diagnose_ex.h | 4
offapi/UnoApi_offapi.mk | 8 -
offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl | 5
offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl | 5
offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl | 14 -
offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl | 12 -
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 5
reportdesign/source/ui/inspection/GeometryHandler.cxx | 6
reportdesign/source/ui/inspection/ReportComponentHandler.cxx | 3
toolkit/source/controls/grid/gridcontrol.cxx | 4
tools/source/debug/debug.cxx | 7
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 5
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx | 13 -
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx | 74 ++--------
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx | 5
xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx | 5
xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx | 11 -
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 12 -
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx | 16 --
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 5
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx | 11 -
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 11 -
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 21 --
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 24 +--
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 5
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx | 11 -
xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 12 -
xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx | 15 --
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 5
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx | 11 -
33 files changed, 103 insertions(+), 265 deletions(-)
New commits:
commit 2cb247a12d682d7cda0483570b38b4469c360a94
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jun 7 14:44:48 2013 +0200
fix file and lineno info for DBG_UNHANDLED_EXCEPTION
which I broke in commit 863d38fbfa4fb4861e476828c46410602100919e
"move DBG_UNHANDLED_EXCEPTION out of line"
Change-Id: Ic30e985cc356d81013ced1ce74ec6c78469d9882
diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index 4c27193..50a400d 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
@@ -42,7 +42,7 @@
#include <typeinfo>
#include <tools/toolsdllapi.h>
- TOOLS_DLLPUBLIC void DbgUnhandledException(const ::com::sun::star::uno::Any& caughtException, const char* currentFunction);
+ TOOLS_DLLPUBLIC void DbgUnhandledException(const ::com::sun::star::uno::Any& caughtException, const char* currentFunction, const char* fileAndLineNo);
/** reports a caught UNO exception via OSL diagnostics
@@ -50,7 +50,7 @@
handling is not correct ....
*/
#define DBG_UNHANDLED_EXCEPTION() \
- DbgUnhandledException( ::cppu::getCaughtException(), BOOST_CURRENT_FUNCTION);
+ DbgUnhandledException( ::cppu::getCaughtException(), BOOST_CURRENT_FUNCTION, SAL_DETAIL_WHERE);
#else // OSL_DEBUG_LEVEL
#define DBG_UNHANDLED_EXCEPTION()
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 3f950ca..49da308 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -1589,7 +1589,7 @@ void DbgOutf( const sal_Char*, ... ) {}
#if OSL_DEBUG_LEVEL > 0
-TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const char* currentFunction)
+TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const char* currentFunction, const char* fileAndLineNo)
{
OString sMessage( "caught an exception!" );
sMessage += "\nin function:";
@@ -1628,7 +1628,10 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any & caught, const c
}
}
sMessage += "\n";
- OSL_ENSURE( false, sMessage.getStr() );
+
+ SAL_DETAIL_LOG_FORMAT(
+ SAL_DETAIL_ENABLE_LOG_WARN, SAL_DETAIL_LOG_LEVEL_WARN,
+ "legacy.osl", fileAndLineNo, "%s", sMessage.getStr());
}
#endif // OSL_DEBUG_LEVEL
commit 177f01b9fe7ef0d4ea08b5c6fb8afa82a51c8d1d
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jun 6 17:11:33 2013 +0200
fdo#46808, Convert form::inspection::FormComponentPropertyHandler
.. to new style service
Change-Id: Iee4681f94dc9874271dc8a1d5d74e161d7691a29
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx
index 382451a..b0bfc62 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.cxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx
@@ -22,6 +22,7 @@
#include "formmetadata.hxx"
#include "pushbuttonnavigation.hxx"
+#include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp>
#include <tools/debug.hxx>
//------------------------------------------------------------------------
@@ -52,9 +53,7 @@ namespace pcr
{
DBG_CTOR( ButtonNavigationHandler, NULL );
- m_xSlaveHandler.set( m_xContext->getServiceManager()->createInstanceWithContext(
- OUString( "com.sun.star.form.inspection.FormComponentPropertyHandler" ), m_xContext ),
- UNO_QUERY_THROW);
+ m_xSlaveHandler = css::form::inspection::FormComponentPropertyHandler::create( m_xContext );
}
//--------------------------------------------------------------------
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 5835d63..929fe9f 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -181,6 +181,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/contr
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/inspection,\
DefaultFormComponentInspectorModel \
+ FormComponentPropertyHandler \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runtime,\
FormController \
@@ -924,7 +925,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/in
CellBindingPropertyHandler \
EditPropertyHandler \
EventHandler \
- FormComponentPropertyHandler \
SubmissionPropertyHandler \
XMLFormsPropertyHandler \
XSDValidationPropertyHandler \
diff --git a/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl b/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
index 4fbe59d..1208373 100644
--- a/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
+++ b/offapi/com/sun/star/form/inspection/FormComponentPropertyHandler.idl
@@ -31,10 +31,7 @@ module com { module sun { module star { module form { module inspection {
@see com::sun::star::inspection::XPropertyHandler
@see com::sun::star::form::FormComponents
*/
-service FormComponentPropertyHandler
-{
- interface com::sun::star::inspection::XPropertyHandler;
-};
+service FormComponentPropertyHandler : com::sun::star::inspection::XPropertyHandler;
}; }; }; }; };
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 72842e7..261c6b57 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -25,6 +25,7 @@
#include "uistrings.hrc"
#include <toolkit/helper/vclunohelper.hxx>
#include <unotools/syslocale.hxx>
+#include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp>
#include <com/sun/star/inspection/PropertyControlType.hpp>
#include <com/sun/star/inspection/PropertyLineElement.hpp>
#include <com/sun/star/chart/ChartDataRowSource.hpp>
@@ -63,8 +64,8 @@ DataProviderHandler::DataProviderHandler(uno::Reference< uno::XComponentContext
{
try
{
- m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW);
- m_xTypeConverter.set(script::Converter::create(m_xContext));
+ m_xFormComponentHandler = form::inspection::FormComponentPropertyHandler::create(m_xContext);
+ m_xTypeConverter = script::Converter::create(m_xContext);
}catch(const uno::Exception &)
{
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index ece222b..3c9339b 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -34,6 +34,7 @@
#include <tools/diagnose_ex.h>
#include <tools/StringListResource.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
+#include "com/sun/star/form/inspection/FormComponentPropertyHandler.hpp"
#include "com/sun/star/inspection/StringRepresentation.hpp"
#include <com/sun/star/inspection/PropertyLineElement.hpp>
#include <com/sun/star/inspection/PropertyControlType.hpp>
@@ -238,9 +239,8 @@ GeometryHandler::GeometryHandler(uno::Reference< uno::XComponentContext > const
DBG_CTOR(rpt_GeometryHandler,NULL);
try
{
- const uno::Reference< lang::XMultiComponentFactory > xFac = m_xContext->getServiceManager();
- m_xFormComponentHandler.set(xFac->createInstanceWithContext(OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW);
- m_xTypeConverter.set(script::Converter::create(context));
+ m_xFormComponentHandler = form::inspection::FormComponentPropertyHandler::create(m_xContext);
+ m_xTypeConverter = script::Converter::create(context);
loadDefaultFunctions();
}
catch(const uno::Exception&)
diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
index df01a77..2aa83e7 100644
--- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
+++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
@@ -23,6 +23,7 @@
#include <comphelper/types.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <unotools/syslocale.hxx>
+#include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp>
#include <com/sun/star/inspection/PropertyControlType.hpp>
#include <com/sun/star/report/XReportDefinition.hpp>
#include <com/sun/star/report/XSection.hpp>
@@ -45,7 +46,7 @@ ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentCo
{
try
{
- m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW);
+ m_xFormComponentHandler = form::inspection::FormComponentPropertyHandler::create(m_xContext);
}catch(const uno::Exception &)
{
commit 9db162b6048284ae43dd0be45694ade2d0800bd7
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jun 6 16:38:03 2013 +0200
fdo#46808, Use service constructor for connection::Acceptor
Change-Id: I0e69e43b5e6c6907447d6a8c23c0579b88ceb9a3
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 073a975..54be5c8 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -43,7 +43,7 @@
#include <com/sun/star/container/XSet.hpp>
#include <com/sun/star/loader/XImplementationLoader.hpp>
#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/connection/XAcceptor.hpp>
+#include <com/sun/star/connection/Acceptor.hpp>
#include <com/sun/star/connection/XConnection.hpp>
#include <com/sun/star/bridge/XBridgeFactory.hpp>
#include <com/sun/star/bridge/XBridge.hpp>
@@ -547,10 +547,7 @@ SAL_IMPLEMENT_MAIN()
OUString aConnectDescr( aUnoUrl.getToken( 0, ';', nIndex ).copy( 4 ) ); // uno:CONNECTDESCR;iiop;InstanceName
OUString aInstanceName( aUnoUrl.getToken( 1, ';', nIndex ) );
- Reference< XAcceptor > xAcceptor;
- createInstance(
- xAcceptor, xContext,
- OUString("com.sun.star.connection.Acceptor") );
+ Reference< XAcceptor > xAcceptor = Acceptor::create(xContext);
// init params
Sequence< Any > aInitParams( aParams.getLength() );
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index dd06969..9266f56 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -20,6 +20,7 @@
#include "acceptor.hxx"
#include <com/sun/star/bridge/BridgeFactory.hpp>
+#include <com/sun/star/connection/Acceptor.hpp>
#include <com/sun/star/uno/XNamingService.hpp>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/factory.hxx>
@@ -51,9 +52,7 @@ Acceptor::Acceptor( const Reference< XComponentContext >& rxContext )
, m_bInit(sal_False)
, m_bDying(false)
{
- m_rAcceptor.set(
- m_rContext->getServiceManager()->createInstanceWithContext("com.sun.star.connection.Acceptor", m_rContext),
- UNO_QUERY );
+ m_rAcceptor = css::connection::Acceptor::create(m_rContext);
m_rBridgeFactory = BridgeFactory::create(m_rContext);
}
@@ -286,11 +285,11 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL offacc_component_getFactory(const sal_Char
Reference< XMultiServiceFactory > xServiceManager(
reinterpret_cast< XMultiServiceFactory* >(pServiceManager));
- if (Acceptor::impl_getImplementationName().equalsAscii( pImplementationName ) )
+ if (desktop::Acceptor::impl_getImplementationName().equalsAscii( pImplementationName ) )
{
xFactory = Reference< XSingleServiceFactory >( cppu::createSingleFactory(
- xServiceManager, Acceptor::impl_getImplementationName(),
- Acceptor::impl_getInstance, Acceptor::impl_getSupportedServiceNames()) );
+ xServiceManager, desktop::Acceptor::impl_getImplementationName(),
+ desktop::Acceptor::impl_getInstance, desktop::Acceptor::impl_getSupportedServiceNames()) );
}
// Factory is valid - service was found.
commit 34e5e9c650ef8653b12d16a1d5de535b5f5b3ead
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jun 6 16:02:46 2013 +0200
fdo#46808, Convert awt::grid::DefaultGridColumnModel to new style
Change-Id: Id1b63847e21954c689dfa3c549713dbf5b1858c3
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 081a0d3..5835d63 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -64,6 +64,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\
UnoControlDialogModelProvider \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\
+ DefaultGridColumnModel \
DefaultGridDataModel \
SortableGridDataModel \
))
@@ -579,7 +580,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\
UnoControlTimeFieldModel \
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/grid,\
- DefaultGridColumnModel \
GridColumn \
UnoControlGrid \
UnoControlGridModel \
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
index 3ff19f0..4f7a9a8 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
@@ -28,10 +28,7 @@
/** If you do not want to implement the XGridColumnModel yourself, use this service.
@since OOo 3.3
*/
-service DefaultGridColumnModel
-{
- interface com::sun::star::awt::grid::XGridColumnModel;
-};
+service DefaultGridColumnModel : com::sun::star::awt::grid::XGridColumnModel;
}; }; }; };};
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 8b04f51..939e6f1 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -27,7 +27,7 @@
#include <com/sun/star/awt/grid/XMutableGridDataModel.hpp>
#include <com/sun/star/awt/grid/DefaultGridDataModel.hpp>
#include <com/sun/star/awt/grid/SortableGridDataModel.hpp>
-#include <com/sun/star/awt/grid/XGridColumnModel.hpp>
+#include <com/sun/star/awt/grid/DefaultGridColumnModel.hpp>
#include <toolkit/helper/unopropertyarrayhelper.hxx>
#include <toolkit/helper/property.hxx>
#include <com/sun/star/awt/XVclWindowPeer.hpp>
@@ -61,7 +61,7 @@ namespace
Reference< XGridColumnModel > lcl_getDefaultColumnModel_throw( const Reference<XComponentContext> & i_context )
{
- Reference< XGridColumnModel > const xColumnModel( i_context->getServiceManager()->createInstanceWithContext( "com.sun.star.awt.grid.DefaultGridColumnModel", i_context ), UNO_QUERY_THROW );
+ Reference< XGridColumnModel > const xColumnModel = DefaultGridColumnModel::create( i_context );
return xColumnModel;
}
}
commit 670e2329df5cccaacd0e43d3656aeb112488e8ef
Author: Noel Grandin <noel at peralex.com>
Date: Wed Jun 5 13:30:21 2013 +0200
fdo#46808, Convert xml::crypto services to new style
Also remove the unnecessary XInitialization implementations.
Change-Id: I81f32b2cdcf69b84fe4b15382f9294073a7f2f20
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 1342d3f..081a0d3 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -451,8 +451,10 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xforms,\
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/crypto,\
NSSInitializer \
+ SecurityEnvironment \
SEInitializer \
XMLEncryptionTemplate \
+ XMLSecurityContext \
XMLSignatureTemplate \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/dom,\
@@ -1583,9 +1585,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\
XMLImportFilter \
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto,\
- SecurityEnvironment \
XMLEncryption \
- XMLSecurityContext \
XMLSignature \
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto/sax,\
diff --git a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
index 18d12a9..b73e838 100644
--- a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
@@ -21,25 +21,17 @@
/** -- idl definition -- **/
-#ifndef __com_sun_star_xml_crypto_securityenvironment_idl_
-#define __com_sun_star_xml_crypto_securityenvironment_idl_
+#ifndef __com_sun_star_xml_crypto_SecurityEnvironment_idl_
+#define __com_sun_star_xml_crypto_SecurityEnvironment_idl_
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/crypto/XSecurityEnvironment.idl>
-#include <com/sun/star/lang/XUnoTunnel.idl>
-#include <com/sun/star/lang/XInitialization.idl>
module com { module sun { module star { module xml { module crypto {
/**
* Service of XSecurityEnvironment
*/
-service SecurityEnvironment {
- interface com::sun::star::xml::crypto::XSecurityEnvironment ;
- interface com::sun::star::lang::XInitialization ;
- interface com::sun::star::lang::XUnoTunnel;
-} ;
+service SecurityEnvironment : XSecurityEnvironment;
} ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
index 90c3211..1d84197 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
@@ -21,23 +21,17 @@
/** -- idl definition -- **/
-#ifndef __com_sun_star_xml_crypto_xmlsecuritycontext_idl_
-#define __com_sun_star_xml_crypto_xmlsecuritycontext_idl_
+#ifndef __com_sun_star_xml_crypto_XMLSecurityContext_idl_
+#define __com_sun_star_xml_crypto_XMLSecurityContext_idl_
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
-#include <com/sun/star/lang/XInitialization.idl>
module com { module sun { module star { module xml { module crypto {
/**
* Service of XMLSecurityContext
*/
-service XMLSecurityContext {
- interface com::sun::star::xml::crypto::XXMLSecurityContext ;
- interface com::sun::star::lang::XInitialization ;
-} ;
+service XMLSecurityContext : XXMLSecurityContext;
} ; } ; } ; } ; } ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index ef23b20..066fd34 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -174,11 +174,6 @@ SecurityEnvironment_MSCryptImpl :: ~SecurityEnvironment_MSCryptImpl() {
}
-/* XInitialization */
-void SAL_CALL SecurityEnvironment_MSCryptImpl :: initialize( const Sequence< Any >& /*aArguments*/ ) throw( Exception, RuntimeException ) {
- //TODO
-} ;
-
/* XServiceInfo */
OUString SAL_CALL SecurityEnvironment_MSCryptImpl :: getImplementationName() throw( RuntimeException ) {
return impl_getImplementationName() ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index 5a5101a..ef8d77e 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -31,14 +31,13 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#include <com/sun/star/security/XCertificate.hpp>
#include <com/sun/star/security/CertificateCharacters.hpp>
@@ -51,10 +50,9 @@
#include "sal/types.h"
-class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper4<
+class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper3<
::com::sun::star::xml::crypto::XSecurityEnvironment ,
- ::com::sun::star::lang::XInitialization ,
- ::com::sun::star::lang::XServiceInfo ,
+ ::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XUnoTunnel >
{
private :
@@ -129,11 +127,6 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper4<
throw (::com::sun::star::uno::RuntimeException);
- //Methods from XInitialization
- virtual void SAL_CALL initialize(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments
- ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
-
//Methods from XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
index 36ea290..af584e2 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
@@ -24,19 +24,17 @@
#include "xmlsecurity/xmlsec-wrapper.h"
#include "xmlsec/mscrypto/app.h"
+#include "com/sun/star/xml/crypto/SecurityEnvironment.hpp"
+#include "com/sun/star/xml/crypto/XMLSecurityContext.hpp"
+#include "comphelper/processfactory.hxx"
namespace cssu = com::sun::star::uno;
namespace cssl = com::sun::star::lang;
namespace cssxc = com::sun::star::xml::crypto;
-#define SERVICE_NAME "com.sun.star.xml.crypto.SEInitializer"
-#define IMPLEMENTATION_NAME "com.sun.star.xml.security.bridge.xmlsec.SEInitializer_MSCryptImpl"
-#define SECURITY_ENVIRONMENT "com.sun.star.xml.crypto.SecurityEnvironment"
-#define SECURITY_CONTEXT "com.sun.star.xml.crypto.XMLSecurityContext"
-
SEInitializer_MSCryptImpl::SEInitializer_MSCryptImpl(
- const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > &rxMSF)
- :mxMSF( rxMSF )
+ const cssu::Reference< cssu::XComponentContext > &rxContext)
+ :mxContext( rxContext )
{
}
@@ -74,33 +72,11 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
try {
/* Build Security Environment */
- const OUString sSecyrutyEnvironment ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_ENVIRONMENT ) );
- cssu::Reference< cssxc::XSecurityEnvironment > xSecEnv( mxMSF->createInstance ( sSecyrutyEnvironment ), cssu::UNO_QUERY );
- if( !xSecEnv.is() )
- {
- if( n_hStoreHandle != NULL )
- {
- CertCloseStore( n_hStoreHandle, CERT_CLOSE_STORE_FORCE_FLAG ) ;
- }
-
- xmlSecMSCryptoAppShutdown() ;
- return NULL;
- }
+ cssu::Reference< cssxc::XSecurityEnvironment > xSecEnv = cssxc::SecurityEnvironment::create( mxContext );
/* Setup key slot and certDb */
- cssu::Reference< cssl::XUnoTunnel > xEnvTunnel( xSecEnv , cssu::UNO_QUERY ) ;
- if( !xEnvTunnel.is() )
- {
- if( n_hStoreHandle != NULL )
- {
- CertCloseStore( n_hStoreHandle, CERT_CLOSE_STORE_FORCE_FLAG ) ;
- }
-
- xmlSecMSCryptoAppShutdown() ;
- return NULL;
- }
-
- SecurityEnvironment_MSCryptImpl* pSecEnv = ( SecurityEnvironment_MSCryptImpl* )xEnvTunnel->getSomething( SecurityEnvironment_MSCryptImpl::getUnoTunnelId() ) ;
+ cssu::Reference< cssl::XUnoTunnel > xSecEnvTunnel( xSecEnv, cssu::UNO_QUERY_THROW );
+ SecurityEnvironment_MSCryptImpl* pSecEnv = ( SecurityEnvironment_MSCryptImpl* )xSecEnvTunnel->getSomething( SecurityEnvironment_MSCryptImpl::getUnoTunnelId() ) ;
if( pSecEnv == NULL )
{
if( n_hStoreHandle != NULL )
@@ -123,18 +99,7 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
}
/* Build XML Security Context */
- const OUString sSecyrutyContext ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_CONTEXT ) );
- cssu::Reference< cssxc::XXMLSecurityContext > xSecCtx( mxMSF->createInstance ( sSecyrutyContext ), cssu::UNO_QUERY );
- if( !xSecCtx.is() )
- {
- if( n_hStoreHandle != NULL )
- {
- CertCloseStore( n_hStoreHandle, CERT_CLOSE_STORE_FORCE_FLAG ) ;
- }
-
- xmlSecMSCryptoAppShutdown() ;
- return NULL;
- }
+ cssu::Reference< cssxc::XXMLSecurityContext > xSecCtx = cssxc::XMLSecurityContext::create( mxContext );
xSecCtx->setDefaultSecurityEnvironmentIndex(xSecCtx->addSecurityEnvironment( xSecEnv )) ;
return xSecCtx;
@@ -181,46 +146,47 @@ void SAL_CALL SEInitializer_MSCryptImpl::freeSecurityContext( const cssu::Refere
xmlSecMSCryptoAppShutdown() ;
}
-OUString SEInitializer_MSCryptImpl_getImplementationName ()
+OUString SEInitializer_MSCryptImpl_getImplementationName()
throw (cssu::RuntimeException)
{
- return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
+ return OUString( "com.sun.star.xml.security.bridge.xmlsec.SEInitializer_MSCryptImpl" );
}
-sal_Bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const OUString& rServiceName )
throw (cssu::RuntimeException)
{
- return ServiceName == SERVICE_NAME;
+ return rServiceName == "com.sun.star.xml.crypto.SEInitializer";
}
-cssu::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames( )
+cssu::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames()
throw (cssu::RuntimeException)
{
cssu::Sequence < OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+ pArray[0] = OUString( "com.sun.star.xml.crypto.SEInitializer" );
return aRet;
}
-#undef SERVICE_NAME
cssu::Reference< cssu::XInterface > SAL_CALL SEInitializer_MSCryptImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > & rSMgr)
throw( cssu::Exception )
{
- return (cppu::OWeakObject*) new SEInitializer_MSCryptImpl(rSMgr);
+ return (cppu::OWeakObject*) new SEInitializer_MSCryptImpl( comphelper::getComponentContext(rSMgr) );
}
/* XServiceInfo */
-OUString SAL_CALL SEInitializer_MSCryptImpl::getImplementationName( )
+OUString SAL_CALL SEInitializer_MSCryptImpl::getImplementationName()
throw (cssu::RuntimeException)
{
return SEInitializer_MSCryptImpl_getImplementationName();
}
+
sal_Bool SAL_CALL SEInitializer_MSCryptImpl::supportsService( const OUString& rServiceName )
throw (cssu::RuntimeException)
{
return SEInitializer_MSCryptImpl_supportsService( rServiceName );
}
-cssu::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl::getSupportedServiceNames( )
+
+cssu::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl::getSupportedServiceNames()
throw (cssu::RuntimeException)
{
return SEInitializer_MSCryptImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
index e622f93..eb81b7f 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
@@ -25,6 +25,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/implbase2.hxx>
#include <libxml/tree.h>
@@ -51,10 +52,10 @@ class SEInitializer_MSCryptImpl : public cppu::WeakImplHelper2
******************************************************************************/
{
private:
- com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF;
+ com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
public:
- SEInitializer_MSCryptImpl(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > &rxMSF);
+ SEInitializer_MSCryptImpl(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > &rxContext);
virtual ~SEInitializer_MSCryptImpl();
/* XSEInitializer */
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
index 5020c2c..c5117b7 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
@@ -318,11 +318,6 @@ XMLEncryption_MSCryptImpl :: decrypt(
return aTemplate;
}
-/* XInitialization */
-void SAL_CALL XMLEncryption_MSCryptImpl :: initialize( const Sequence< Any >& /*aArguments*/ ) throw( Exception, RuntimeException ) {
- // TBD
-} ;
-
/* XServiceInfo */
OUString SAL_CALL XMLEncryption_MSCryptImpl :: getImplementationName() throw( RuntimeException ) {
return impl_getImplementationName() ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
index 80fe3ff..56d238d 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
@@ -23,21 +23,19 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/xml/crypto/XXMLEncryption.hpp>
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-class XMLEncryption_MSCryptImpl : public ::cppu::WeakImplHelper3<
+class XMLEncryption_MSCryptImpl : public ::cppu::WeakImplHelper2<
::com::sun::star::xml::crypto::XXMLEncryption ,
- ::com::sun::star::lang::XInitialization ,
::com::sun::star::lang::XServiceInfo >
{
private :
@@ -61,11 +59,6 @@ class XMLEncryption_MSCryptImpl : public ::cppu::WeakImplHelper3<
) throw( com::sun::star::xml::crypto::XMLEncryptionException ,
com::sun::star::uno::SecurityException) ;
- //Methods from XInitialization
- virtual void SAL_CALL initialize(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments
- ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
-
//Methods from XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index fd67c7e..599bd0a 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
@@ -34,9 +34,8 @@ using ::com::sun::star::lang::XSingleServiceFactory ;
using ::com::sun::star::xml::crypto::XSecurityEnvironment ;
using ::com::sun::star::xml::crypto::XXMLSecurityContext ;
-XMLSecurityContext_MSCryptImpl :: XMLSecurityContext_MSCryptImpl( const Reference< XMultiServiceFactory >& aFactory )
+XMLSecurityContext_MSCryptImpl :: XMLSecurityContext_MSCryptImpl()
://m_pKeysMngr( NULL ) ,
- m_xServiceManager( aFactory ),
m_xSecurityEnvironment( NULL )
{
//Init xmlsec library
@@ -117,11 +116,6 @@ void SAL_CALL XMLSecurityContext_MSCryptImpl::setDefaultSecurityEnvironmentIndex
//dummy
}
-/* XInitialization */
-void SAL_CALL XMLSecurityContext_MSCryptImpl :: initialize( const Sequence< Any >& /*aArguments*/ ) throw( Exception, RuntimeException ) {
- // TBD
-} ;
-
/* XServiceInfo */
OUString SAL_CALL XMLSecurityContext_MSCryptImpl :: getImplementationName() throw( RuntimeException ) {
return impl_getImplementationName() ;
@@ -156,8 +150,8 @@ OUString XMLSecurityContext_MSCryptImpl :: impl_getImplementationName() throw( R
}
//Helper for registry
-Reference< XInterface > SAL_CALL XMLSecurityContext_MSCryptImpl :: impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
- return Reference< XInterface >( *new XMLSecurityContext_MSCryptImpl( aServiceManager ) ) ;
+Reference< XInterface > SAL_CALL XMLSecurityContext_MSCryptImpl :: impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) {
+ return Reference< XInterface >( *new XMLSecurityContext_MSCryptImpl ) ;
}
Reference< XSingleServiceFactory > XMLSecurityContext_MSCryptImpl :: impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
index 16416b8..aee4d17 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
@@ -23,32 +23,29 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper3<
+class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper2<
::com::sun::star::xml::crypto::XXMLSecurityContext ,
- ::com::sun::star::lang::XInitialization ,
::com::sun::star::lang::XServiceInfo >
{
private :
//xmlSecKeysMngrPtr m_pKeysMngr ;
::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment ;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ;
public :
- XMLSecurityContext_MSCryptImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aFactory ) ;
- virtual ~XMLSecurityContext_MSCryptImpl() ;
+ XMLSecurityContext_MSCryptImpl();
+ virtual ~XMLSecurityContext_MSCryptImpl();
//Methods from XXMLSecurityContext
virtual sal_Int32 SAL_CALL addSecurityEnvironment(
@@ -75,11 +72,6 @@ class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper3<
throw (::com::sun::star::uno::RuntimeException);
- //Methods from XInitialization
- virtual void SAL_CALL initialize(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments
- ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
-
//Methods from XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index 2f3907a..9e90863 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -248,11 +248,6 @@ SAL_CALL XMLSignature_MSCryptImpl :: validate(
return aTemplate;
}
-/* XInitialization */
-void SAL_CALL XMLSignature_MSCryptImpl :: initialize( const Sequence< Any >& /*aArguments*/ ) throw( Exception, RuntimeException ) {
- // TBD
-} ;
-
/* XServiceInfo */
OUString SAL_CALL XMLSignature_MSCryptImpl :: getImplementationName() throw( RuntimeException ) {
return impl_getImplementationName() ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
index 3d231ad..ba9a6f5 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
@@ -23,21 +23,19 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/xml/crypto/XXMLSignature.hpp>
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-class XMLSignature_MSCryptImpl : public ::cppu::WeakImplHelper3<
+class XMLSignature_MSCryptImpl : public ::cppu::WeakImplHelper2<
::com::sun::star::xml::crypto::XXMLSignature ,
- ::com::sun::star::lang::XInitialization ,
::com::sun::star::lang::XServiceInfo >
{
private :
@@ -61,11 +59,6 @@ class XMLSignature_MSCryptImpl : public ::cppu::WeakImplHelper3<
com::sun::star::uno::SecurityException,
com::sun::star::xml::crypto::XMLSignatureException);
- //Methods from XInitialization
- virtual void SAL_CALL initialize(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments
- ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
-
//Methods from XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 1d38b2a..08c020d 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -118,7 +118,7 @@ char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* /*arg*/ )
return NULL;
}
-SecurityEnvironment_NssImpl :: SecurityEnvironment_NssImpl( const Reference< XMultiServiceFactory >& ) :
+SecurityEnvironment_NssImpl :: SecurityEnvironment_NssImpl() :
m_pHandler( NULL ) , m_tSymKeyList() , m_tPubKeyList() , m_tPriKeyList() {
PK11_SetPasswordFunc( GetPasswordFunction ) ;
@@ -155,11 +155,6 @@ SecurityEnvironment_NssImpl :: ~SecurityEnvironment_NssImpl() {
}
}
-/* XInitialization */
-void SAL_CALL SecurityEnvironment_NssImpl :: initialize( const Sequence< Any >& ) throw( Exception, RuntimeException ) {
- // TBD
-} ;
-
/* XServiceInfo */
OUString SAL_CALL SecurityEnvironment_NssImpl :: getImplementationName() throw( RuntimeException ) {
return impl_getImplementationName() ;
@@ -194,8 +189,8 @@ OUString SecurityEnvironment_NssImpl :: impl_getImplementationName() throw( Runt
}
//Helper for registry
-Reference< XInterface > SAL_CALL SecurityEnvironment_NssImpl :: impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
- return Reference< XInterface >( *new SecurityEnvironment_NssImpl( aServiceManager ) ) ;
+Reference< XInterface > SAL_CALL SecurityEnvironment_NssImpl :: impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) {
+ return Reference< XInterface >( *new SecurityEnvironment_NssImpl ) ;
}
Reference< XSingleServiceFactory > SecurityEnvironment_NssImpl :: impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index 4829099..cefc23f 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -23,14 +23,13 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#include <com/sun/star/security/XCertificate.hpp>
#include <com/sun/star/security/CertificateCharacters.hpp>
@@ -46,10 +45,9 @@
#include "xmlsecurity/xmlsec-wrapper.h"
-class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper4<
+class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper3<
::com::sun::star::xml::crypto::XSecurityEnvironment ,
- ::com::sun::star::lang::XInitialization ,
- ::com::sun::star::lang::XServiceInfo ,
+ ::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XUnoTunnel >
{
private :
@@ -66,16 +64,11 @@ private :
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ;
public :
- SecurityEnvironment_NssImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aFactory ) ;
- virtual ~SecurityEnvironment_NssImpl() ;
+ SecurityEnvironment_NssImpl();
+ virtual ~SecurityEnvironment_NssImpl();
//Methods from XSecurityEnvironment
- //Methods from XInitialization
- virtual void SAL_CALL initialize(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments
- ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
-
//Methods from XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
@@ -113,7 +106,7 @@ private :
static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
- //Native mehtods
+ //Native methods
virtual CERTCertDBHandle* getCertDb() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
virtual void setCertDb( CERTCertDBHandle* aCertDb ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
@@ -141,7 +134,7 @@ private :
virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromAscii( const OUString& asciiCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
- //Native mehtods
+ //Native methods
virtual xmlSecKeysMngrPtr createKeysManager() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
virtual void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index 015f656..41c2378 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -33,6 +33,8 @@
#include <osl/file.hxx>
#include <osl/thread.h>
#include <rtl/logfile.hxx>
+#include <com/sun/star/xml/crypto/SecurityEnvironment.hpp>
+#include <com/sun/star/xml/crypto/XMLSecurityContext.hpp>
#include "seinitializer_nssimpl.hxx"
#include "securityenvironment_nssimpl.hxx"
@@ -51,9 +53,6 @@ namespace cssxc = css::xml::crypto;
using namespace com::sun::star;
#define SE_SERVICE_NAME "com.sun.star.xml.crypto.SEInitializer"
-#define IMPLEMENTATION_NAME "com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl"
-#define SECURITY_ENVIRONMENT "com.sun.star.xml.crypto.SecurityEnvironment"
-#define SECURITY_CONTEXT "com.sun.star.xml.crypto.XMLSecurityContext"
SEInitializer_NssImpl::SEInitializer_NssImpl( const css::uno::Reference< css::uno::XComponentContext > &rxContext )
{
@@ -79,19 +78,13 @@ uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL
try
{
/* Build XML Security Context */
- const OUString sSecyrutyContext ( SECURITY_CONTEXT );
- uno::Reference< cssxc::XXMLSecurityContext > xSecCtx( m_xContext->getServiceManager()->createInstanceWithContext(sSecyrutyContext, m_xContext), uno::UNO_QUERY );
- if( !xSecCtx.is() )
- return NULL;
-
- const OUString sSecyrutyEnvironment ( SECURITY_ENVIRONMENT );
- uno::Reference< cssxc::XSecurityEnvironment > xSecEnv( m_xContext->getServiceManager()->createInstanceWithContext(sSecyrutyEnvironment, m_xContext), uno::UNO_QUERY );
- uno::Reference< cssl::XUnoTunnel > xEnvTunnel( xSecEnv , uno::UNO_QUERY ) ;
- if( !xEnvTunnel.is() )
- return NULL;
+ uno::Reference< cssxc::XXMLSecurityContext > xSecCtx = cssxc::XMLSecurityContext::create( m_xContext );
+
+ uno::Reference< cssxc::XSecurityEnvironment > xSecEnv = cssxc::SecurityEnvironment::create( m_xContext );
+ uno::Reference< lang::XUnoTunnel > xSecEnvTunnel(xSecEnv, uno::UNO_QUERY_THROW);
SecurityEnvironment_NssImpl* pSecEnv = reinterpret_cast<SecurityEnvironment_NssImpl*>(
sal::static_int_cast<sal_uIntPtr>(
- xEnvTunnel->getSomething(SecurityEnvironment_NssImpl::getUnoTunnelId() ))) ;
+ xSecEnvTunnel->getSomething(SecurityEnvironment_NssImpl::getUnoTunnelId() ))) ;
pSecEnv->setCertDb(pCertHandle);
sal_Int32 n = xSecCtx->addSecurityEnvironment(xSecEnv);
@@ -122,8 +115,7 @@ void SAL_CALL SEInitializer_NssImpl::freeSecurityContext( const uno::Reference<
OUString SEInitializer_NssImpl_getImplementationName ()
throw (uno::RuntimeException)
{
-
- return OUString ( IMPLEMENTATION_NAME );
+ return OUString ("com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl" );
}
sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const OUString& ServiceName )
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index ff797df..86d6c80 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -306,11 +306,6 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt(
return aTemplate;
}
-/* XInitialization */
-void SAL_CALL XMLEncryption_NssImpl :: initialize( const Sequence< Any >& /*aArguments*/ ) throw( Exception, RuntimeException ) {
- // TBD
-} ;
-
/* XServiceInfo */
OUString SAL_CALL XMLEncryption_NssImpl :: getImplementationName() throw( RuntimeException ) {
return impl_getImplementationName() ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
index 2c56aea..433a6d8 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
@@ -23,21 +23,19 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/xml/crypto/XXMLEncryption.hpp>
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper3<
+class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper2<
::com::sun::star::xml::crypto::XXMLEncryption ,
- ::com::sun::star::lang::XInitialization ,
::com::sun::star::lang::XServiceInfo >
{
private :
@@ -61,11 +59,6 @@ class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper3<
) throw( com::sun::star::xml::crypto::XMLEncryptionException ,
com::sun::star::uno::SecurityException) ;
- //Methods from XInitialization
- virtual void SAL_CALL initialize(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments
- ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
-
//Methods from XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
index cd3c863..3ded9ab 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
@@ -34,9 +34,8 @@ using ::com::sun::star::lang::XSingleServiceFactory ;
using ::com::sun::star::xml::crypto::XSecurityEnvironment ;
using ::com::sun::star::xml::crypto::XXMLSecurityContext ;
-XMLSecurityContext_NssImpl :: XMLSecurityContext_NssImpl( const Reference< XMultiServiceFactory >& aFactory )
+XMLSecurityContext_NssImpl :: XMLSecurityContext_NssImpl()
://i39448 : m_pKeysMngr( NULL ) ,
- m_xServiceManager( aFactory ) ,
m_nDefaultEnvIndex(-1)
//m_xSecurityEnvironment( NULL )
{
@@ -130,11 +129,6 @@ void SAL_CALL XMLSecurityContext_NssImpl::setDefaultSecurityEnvironmentIndex( sa
//i39448 : old methods deleted
-/* XInitialization */
-void SAL_CALL XMLSecurityContext_NssImpl :: initialize( const Sequence< Any >& /*aArguments*/ ) throw( Exception, RuntimeException ) {
- // TBD
-} ;
-
/* XServiceInfo */
OUString SAL_CALL XMLSecurityContext_NssImpl :: getImplementationName() throw( RuntimeException ) {
return impl_getImplementationName() ;
@@ -169,8 +163,8 @@ OUString XMLSecurityContext_NssImpl :: impl_getImplementationName() throw( Runti
}
//Helper for registry
-Reference< XInterface > SAL_CALL XMLSecurityContext_NssImpl :: impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) {
- return Reference< XInterface >( *new XMLSecurityContext_NssImpl( aServiceManager ) ) ;
+Reference< XInterface > SAL_CALL XMLSecurityContext_NssImpl :: impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) {
+ return Reference< XInterface >( *new XMLSecurityContext_NssImpl ) ;
}
Reference< XSingleServiceFactory > XMLSecurityContext_NssImpl :: impl_createFactory( const Reference< XMultiServiceFactory >& aServiceManager ) {
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
index 9e9928a..e48cb23 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
@@ -23,23 +23,21 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
#include <vector>
-class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper3<
+class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper2<
::com::sun::star::xml::crypto::XXMLSecurityContext ,
- ::com::sun::star::lang::XInitialization ,
::com::sun::star::lang::XServiceInfo >
{
private :
@@ -47,12 +45,10 @@ class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper3<
//::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment ;
std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > > m_vSecurityEnvironments;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ;
-
sal_Int32 m_nDefaultEnvIndex;
public :
- XMLSecurityContext_NssImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aFactory ) ;
+ XMLSecurityContext_NssImpl() ;
virtual ~XMLSecurityContext_NssImpl() ;
//Methods from XXMLSecurityContext
@@ -79,11 +75,6 @@ class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper3<
virtual void SAL_CALL setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex )
throw (::com::sun::star::uno::RuntimeException);
- //Methods from XInitialization
- virtual void SAL_CALL initialize(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments
- ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
-
//Methods from XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 9d7029c..11c5a8f 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -271,11 +271,6 @@ SAL_CALL XMLSignature_NssImpl :: validate(
return aTemplate;
}
-/* XInitialization */
-void SAL_CALL XMLSignature_NssImpl :: initialize( const Sequence< Any >& /*aArguments*/ ) throw( Exception, RuntimeException ) {
- // TBD
-} ;
-
/* XServiceInfo */
OUString SAL_CALL XMLSignature_NssImpl :: getImplementationName() throw( RuntimeException ) {
return impl_getImplementationName() ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
index b3f123c..6c27b53 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
@@ -23,21 +23,19 @@
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/xml/crypto/XXMLSignature.hpp>
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-class XMLSignature_NssImpl : public ::cppu::WeakImplHelper3<
+class XMLSignature_NssImpl : public ::cppu::WeakImplHelper2<
::com::sun::star::xml::crypto::XXMLSignature ,
- ::com::sun::star::lang::XInitialization ,
::com::sun::star::lang::XServiceInfo >
{
private :
@@ -61,11 +59,6 @@ class XMLSignature_NssImpl : public ::cppu::WeakImplHelper3<
com::sun::star::uno::SecurityException,
com::sun::star::xml::crypto::XMLSignatureException);
- //Methods from XInitialization
- virtual void SAL_CALL initialize(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments
- ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
-
//Methods from XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
More information about the Libreoffice-commits
mailing list