Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
f9a14f3d
Kaydet (Commit)
f9a14f3d
authored
Haz 21, 2017
tarafından
Thorsten Behrens
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
gpg4libre: fix build for windows and mac
Change-Id: I3e36b22cefba4c6195bcf8b85b3f7a2cc101b845
üst
b962b047
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
xsecctl.cxx
xmlsecurity/source/helper/xsecctl.cxx
+5
-1
xsec_xmlsec.cxx
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
+8
-2
No files found.
xmlsecurity/source/helper/xsecctl.cxx
Dosyayı görüntüle @
f9a14f3d
...
...
@@ -22,7 +22,9 @@
#include "documentsignaturehelper.hxx"
#include "framework/saxeventkeeperimpl.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/XReferenceResolvedBroadcaster.hpp>
...
...
@@ -125,10 +127,12 @@ void XSecController::createXSecComponent( )
cssu
::
Reference
<
cssl
::
XMultiComponentFactory
>
xMCF
(
mxCtx
->
getServiceManager
()
);
#if !defined(MACOSX) && !defined(WNT)
uno
::
Reference
<
lang
::
XServiceInfo
>
xServiceInfo
(
m_xSecurityContext
,
cssu
::
UNO_QUERY
);
if
(
xServiceInfo
->
getImplementationName
()
==
"com.sun.star.xml.security.gpg.XMLSecurityContext_GpgImpl"
)
m_xXMLSignature
.
set
(
new
XMLSignature_GpgImpl
());
else
// xmlsec or mscrypt
#endif
m_xXMLSignature
.
set
(
xMCF
->
createInstanceWithContext
(
"com.sun.star.xml.crypto.XMLSignature"
,
mxCtx
),
cssu
::
UNO_QUERY
);
bool
bSuccess
=
m_xXMLSignature
.
is
();
...
...
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
Dosyayı görüntüle @
f9a14f3d
...
...
@@ -26,7 +26,10 @@
#include "xmlsec/xmlelementwrapper_xmlsecimpl.hxx"
#include "xmlsec/xmldocumentwrapper_xmlsecimpl.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
::
com
::
sun
::
star
::
uno
;
...
...
@@ -41,11 +44,14 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_xmlsec_component_getFactory( const sal_
Reference
<
XInterface
>
xFactory
;
if
(
pImplName
!=
nullptr
)
{
#if !defined(MACOSX) && !defined(WNT)
if
(
XMLSignature_GpgImpl
::
impl_getImplementationName
().
equalsAscii
(
pImplName
)
)
{
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
(
XMLElementWrapper_XmlSecImpl_createInstance
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment