Kaydet (Commit) f9a14f3d authored tarafından Thorsten Behrens's avatar Thorsten Behrens

gpg4libre: fix build for windows and mac

Change-Id: I3e36b22cefba4c6195bcf8b85b3f7a2cc101b845
üst b962b047
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
#include "documentsignaturehelper.hxx" #include "documentsignaturehelper.hxx"
#include "framework/saxeventkeeperimpl.hxx" #include "framework/saxeventkeeperimpl.hxx"
#include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx" #include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx"
#include "gpg/xmlsignature_gpgimpl.hxx" #if !defined(MACOSX) && !defined(WNT)
# include "gpg/xmlsignature_gpgimpl.hxx"
#endif
#include <com/sun/star/xml/crypto/sax/ElementMarkPriority.hpp> #include <com/sun/star/xml/crypto/sax/ElementMarkPriority.hpp>
#include <com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.hpp> #include <com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.hpp>
...@@ -125,10 +127,12 @@ void XSecController::createXSecComponent( ) ...@@ -125,10 +127,12 @@ void XSecController::createXSecComponent( )
cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() ); cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
#if !defined(MACOSX) && !defined(WNT)
uno::Reference< lang::XServiceInfo > xServiceInfo( m_xSecurityContext, cssu::UNO_QUERY ); uno::Reference< lang::XServiceInfo > xServiceInfo( m_xSecurityContext, cssu::UNO_QUERY );
if (xServiceInfo->getImplementationName() == "com.sun.star.xml.security.gpg.XMLSecurityContext_GpgImpl") if (xServiceInfo->getImplementationName() == "com.sun.star.xml.security.gpg.XMLSecurityContext_GpgImpl")
m_xXMLSignature.set(new XMLSignature_GpgImpl()); m_xXMLSignature.set(new XMLSignature_GpgImpl());
else // xmlsec or mscrypt else // xmlsec or mscrypt
#endif
m_xXMLSignature.set(xMCF->createInstanceWithContext("com.sun.star.xml.crypto.XMLSignature", mxCtx), cssu::UNO_QUERY); m_xXMLSignature.set(xMCF->createInstanceWithContext("com.sun.star.xml.crypto.XMLSignature", mxCtx), cssu::UNO_QUERY);
bool bSuccess = m_xXMLSignature.is(); bool bSuccess = m_xXMLSignature.is();
......
...@@ -26,7 +26,10 @@ ...@@ -26,7 +26,10 @@
#include "xmlsec/xmlelementwrapper_xmlsecimpl.hxx" #include "xmlsec/xmlelementwrapper_xmlsecimpl.hxx"
#include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx" #include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx"
#include "xsec_xmlsec.hxx" #include "xsec_xmlsec.hxx"
#include "gpg/xmlsignature_gpgimpl.hxx"
#if !defined(MACOSX) && !defined(WNT)
# include "gpg/xmlsignature_gpgimpl.hxx"
#endif
using namespace ::cppu; using namespace ::cppu;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
...@@ -41,11 +44,14 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_xmlsec_component_getFactory( const sal_ ...@@ -41,11 +44,14 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_xmlsec_component_getFactory( const sal_
Reference< XInterface > xFactory ; Reference< XInterface > xFactory ;
if( pImplName != nullptr ) { if( pImplName != nullptr ) {
#if !defined(MACOSX) && !defined(WNT)
if( XMLSignature_GpgImpl::impl_getImplementationName().equalsAscii( pImplName ) ) if( XMLSignature_GpgImpl::impl_getImplementationName().equalsAscii( pImplName ) )
{ {
xFactory = XMLSignature_GpgImpl::impl_createFactory( static_cast< XMultiServiceFactory* >( pServiceManager ) ) ; xFactory = XMLSignature_GpgImpl::impl_createFactory( static_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
} }
else if( XMLElementWrapper_XmlSecImpl_getImplementationName().equalsAscii( pImplName ) ) else
#endif
if( XMLElementWrapper_XmlSecImpl_getImplementationName().equalsAscii( pImplName ) )
{ {
xFactory = cppu::createSingleComponentFactory( xFactory = cppu::createSingleComponentFactory(
XMLElementWrapper_XmlSecImpl_createInstance, XMLElementWrapper_XmlSecImpl_createInstance,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment