summaryrefslogtreecommitdiff
path: root/xmlsecurity/source/component
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:06:19 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:06:19 +0200
commitcdda6341027eb807f9cdeca704011fe3968fe3e3 (patch)
treefd07b7561c849218420a898a9fd853bcc6121332 /xmlsecurity/source/component
parentb52ec9a4fa9b8eb93a181fac3613f1de7d1d0825 (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 0038bc6128921ad380912b18634212681578abfd (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:42 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit d7771bc638587e49ea7225312933c73cfc041439 Author: bjoern.michaelsen@canonical.com <Bjoern Michaelsen> Date: Mon Feb 7 17:18:01 2011 +0100 lp#696527: enable human icon theme in LibreOffice (cherry picked from commit cfa7e88f5959a8b3b729107d61351410be80f49b) Signed-off-by: Thorsten Behrens <tbehrens@novell.com> (cherry picked from commit c1d45fdb7f6380a0e6640a336cd790027e903b4f) Signed-off-by: Cedric Bosdonnat <cedric.bosdonnat.ooo@free.fr> Signed-off-by: Petr Mladek <pmladek@suse.cz> cui/source/options/optgdlg.src | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 474fbc4e896114f138061af9002b88cd675c8f01 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:23 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit 94a2ea07194893531b93b78c2903d96bbc5526ce Author: Petr Mladek <pmladek@suse.cz> Date: Sun Feb 6 18:22:35 2011 +0100 add Ukrainian also into packinfo_office.txt setup_native/source/packinfo/packinfo_office.txt | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) commit e6e8d8ebbe2ef54704a467cf4930494fdf3be6ff Author: Petr Mladek <pmladek@suse.cz> Date: Sun Feb 6 18:06:37 2011 +0100 add Occitan also into packinfo_office.txt build fails witout it setup_native/source/packinfo/packinfo_office.txt | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) commit 7754d67735a8e698d2b7106cae4c6e35eaf3b75b Author: Thorsten Behrens <tbehrens@novell.com> Date: Thu Feb 3 17:28:59 2011 +0100 New mimetype icons for LibreOffice Update from design team, source svg is http://wiki.documentfoundation.org/cgi_img_auth.php/d/d4/LibreOffice_Initial_Icons-pre_final.svg setup_native/source/win32/nsis/ooosetup.ico | Bin 2238 -> 26918 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit adbc618d68569d5b63d1ec87c5d7a9d7f5ba5761 Author: Caolán McNamara <caolanm@redhat.com> Date: Sun Jan 30 20:38:00 2011 +0000 Resolves: rhbz#673819 crash on changing position of drawing object in header The header/footer objects are cunning wrappers to pretend to some parts of the drawing stuff that there are multiple objects, while in reality there is only one. So call HasText actually gets a totally different object from the cast :-( Signed-off-by: David Tardon <dtardon@redhat.com> cui/source/tabpages/swpossizetabpage.cxx | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) commit 13519789cd6c9f86067251c5566f29a96bdaac44 Author: Rene Engelhard <rene@debian.org> Date: Thu Feb 3 00:37:15 2011 +0100 another s/OpenOffice.org/LibreOffice/ in nsplugin extensions/source/nsplugin/source/nsplugin_oo.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c0c2964c3ad1a42a5cd3548b9fcdd1c256c077bf Author: Andras Timar <timar@fsf.hu> Date: Sat Jan 29 12:32:52 2011 +0100 Added Occitan dictionary .../source/packinfo/spellchecker_selection.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit eacd19b0e2eeba91aa1b2387d93e99996c0efae2 Author: Andras Timar <timar@fsf.hu> Date: Sat Jan 29 11:14:10 2011 +0100 Added Ukrainian dictionaries .../source/packinfo/spellchecker_selection.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ecf859006048314ef1c4a4202a642e74a443ebce Author: Tor Lillqvist <tlillqvist@novell.com> Date: Tue Feb 1 14:26:46 2011 +0200 Fix overflow problem in the custom action for UI language de-selection In the _all_ installer we have slightly over 100 LibreOffice UI languages. The code in the custom action that de-selects UI languages based on the Windows UI language(s) and the user's locale had a limit of 100. The consequence was that a few of the alphabetically last LibreOffice UI languages: Ukrainan, Urdu, Uzbek, Venda and Xhosa, were not de-selected even if none of those languages was used by the user or Windows, and thus got installed in a "quick" install and also in a "custom" install unless the person running the installer noticed. Reported by aseques_ on IRC, no bug filed yet. Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch> .../source/win32/customactions/sellang/sellang.cxx | 217 ++++++++++---------- 1 files changed, 104 insertions(+), 113 deletions(-) commit a73c1cff1b27dbef84f0d85d594f9628bb48a827 Author: Thorsten Behrens <tbehrens@novell.com> Date: Wed Jan 26 19:52:02 2011 +0100 Revert "Initial LibO mimetype icon design" This reverts commit bf7cc5f6751d566bccb45b09fb15f82e56fe3333. setup_native/source/win32/nsis/ooosetup.ico | Bin 26918 -> 2238 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit 88a6c07dc231ed3508ffe81ec624a753f4c49e75 Author: Alexander Thurgood <alex.thurgood@gmail.com> Date: Wed Jan 26 18:10:16 2011 +0100 Fix window focus for langpack installation on Mac fdo# 33056 Signed-off-by: Thorsten Behrens <tbehrens@novell.com> .../scripts/osx_install_languagepack.applescript | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit bf7cc5f6751d566bccb45b09fb15f82e56fe3333 Author: Thorsten Behrens <tbehrens@novell.com> Date: Tue Jan 18 10:26:56 2011 +0100 Initial LibO mimetype icon design As per http://luxate.blogspot.com/2011/01/libreoffice-initial-icons-milestone.html updating the LibO mimetype and app icons (and the installer icon, for coherence). setup_native/source/win32/nsis/ooosetup.ico | Bin 2238 -> 26918 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit f7d7948cbe9e38e2e219f6024c0add130a5f6480 Author: Kohei Yoshida <kyoshida@novell.com> Date: Fri Jan 14 11:53:12 2011 -0500 Remove pesky on-line registration menu entry. (fdo#33112) .../uiconfig/sbibliography/menubar/menubar.xml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 3097feb2f56b19a1b10b167f5c5869e2c7920be9 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:56 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit 1b83f908126d09ef6e0015eb531bbd8c4cf57034 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:06 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: components_libreoffice-3.3.1.1 split repo tag: components_libreoffice-3.3.1.2
Diffstat (limited to 'xmlsecurity/source/component')
-rw-r--r--xmlsecurity/source/component/certificatecontainer.cxx50
-rw-r--r--xmlsecurity/source/component/certificatecontainer.hxx30
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.cxx4
-rw-r--r--xmlsecurity/source/component/documentdigitalsignatures.hxx24
-rw-r--r--xmlsecurity/source/component/registerservices.cxx28
-rw-r--r--xmlsecurity/source/component/warnbox.src2
6 files changed, 69 insertions, 69 deletions
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx
index 7759ad731686..a7a41601b66b 100644
--- a/xmlsecurity/source/component/certificatecontainer.cxx
+++ b/xmlsecurity/source/component/certificatecontainer.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -28,13 +28,13 @@
#include "precompiled_xmlsecurity.hxx"
#include <certificatecontainer.hxx>
-
+
#include <sal/config.h>
using namespace ::com::sun::star::uno;
-sal_Bool
+sal_Bool
CertificateContainer::searchMap( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, Map &_certMap )
{
Map::iterator p = _certMap.find(url);
@@ -44,7 +44,7 @@ CertificateContainer::searchMap( const ::rtl::OUString & url, const ::rtl::OUStr
while( p != _certMap.end() )
{
ret = (sal_Bool) (*p).second.equals(certificate_name);
- if( ret )
+ if( ret )
break;
p++;
}
@@ -53,7 +53,7 @@ CertificateContainer::searchMap( const ::rtl::OUString & url, const ::rtl::OUStr
}
// -------------------------------------------------------------------
-sal_Bool
+sal_Bool
CertificateContainer::isTemporaryCertificate ( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name )
throw(::com::sun::star::uno::RuntimeException)
{
@@ -62,7 +62,7 @@ CertificateContainer::isTemporaryCertificate ( const ::rtl::OUString & url, cons
// -------------------------------------------------------------------
-sal_Bool
+sal_Bool
CertificateContainer::isCertificateTrust ( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name )
throw(::com::sun::star::uno::RuntimeException)
{
@@ -70,21 +70,21 @@ CertificateContainer::isCertificateTrust ( const ::rtl::OUString & url, const ::
}
// -------------------------------------------------------------------
-sal_Bool
+sal_Bool
CertificateContainer::addCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, ::sal_Bool trust )
throw(::com::sun::star::uno::RuntimeException)
{
certMap.insert( Map::value_type( url, certificate_name ) );
-
+
//remember that the cert is trusted
if (trust)
certTrustMap.insert( Map::value_type( url, certificate_name ) );
-
+
return true;
}
//-------------------------------------------------------------------------
-::security::CertificateContainerStatus
+::security::CertificateContainerStatus
CertificateContainer::hasCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException)
{
if ( isTemporaryCertificate( url, certificate_name ) )
@@ -100,8 +100,8 @@ CertificateContainer::hasCertificate( const ::rtl::OUString & url, const ::rtl::
}
//-------------------------------------------------------------------------
-::rtl::OUString SAL_CALL
-CertificateContainer::getImplementationName( )
+::rtl::OUString SAL_CALL
+CertificateContainer::getImplementationName( )
throw(::com::sun::star::uno::RuntimeException)
{
return impl_getStaticImplementationName();
@@ -109,8 +109,8 @@ CertificateContainer::getImplementationName( )
//-------------------------------------------------------------------------
-sal_Bool SAL_CALL
-CertificateContainer::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL
+CertificateContainer::supportsService( const ::rtl::OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException)
{
if ( ServiceName.compareToAscii("com.sun.star.security.CertificateContainer") == 0 )
@@ -121,8 +121,8 @@ CertificateContainer::supportsService( const ::rtl::OUString& ServiceName )
//-------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL
-CertificateContainer::getSupportedServiceNames( )
+Sequence< ::rtl::OUString > SAL_CALL
+CertificateContainer::getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException)
{
return impl_getStaticSupportedServiceNames();
@@ -130,8 +130,8 @@ CertificateContainer::getSupportedServiceNames( )
//-------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL
-CertificateContainer::impl_getStaticSupportedServiceNames( )
+Sequence< ::rtl::OUString > SAL_CALL
+CertificateContainer::impl_getStaticSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException)
{
Sequence< ::rtl::OUString > aRet(1);
@@ -141,8 +141,8 @@ CertificateContainer::impl_getStaticSupportedServiceNames( )
//-------------------------------------------------------------------------
-::rtl::OUString SAL_CALL
-CertificateContainer::impl_getStaticImplementationName()
+::rtl::OUString SAL_CALL
+CertificateContainer::impl_getStaticImplementationName()
throw(::com::sun::star::uno::RuntimeException)
{
return ::rtl::OUString::createFromAscii("com.sun.star.security.CertificateContainer");
@@ -150,7 +150,7 @@ CertificateContainer::impl_getStaticImplementationName()
//-------------------------------------------------------------------------
-Reference< XInterface > SAL_CALL CertificateContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager )
+Reference< XInterface > SAL_CALL CertificateContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager )
throw( RuntimeException )
{
return Reference< XInterface >( *new CertificateContainer( xServiceManager ) );
@@ -158,16 +158,16 @@ Reference< XInterface > SAL_CALL CertificateContainer::impl_createInstance( cons
//-------------------------------------------------------------------------
-Reference< XSingleServiceFactory > SAL_CALL
-CertificateContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager )
+Reference< XSingleServiceFactory > SAL_CALL
+CertificateContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager )
throw(RuntimeException)
{
- Reference< XSingleServiceFactory > xReturn( ::cppu::createOneInstanceFactory( ServiceManager,
+ Reference< XSingleServiceFactory > xReturn( ::cppu::createOneInstanceFactory( ServiceManager,
CertificateContainer::impl_getStaticImplementationName(),
CertificateContainer::impl_createInstance,
CertificateContainer::impl_getStaticSupportedServiceNames()));
- return xReturn;
+ return xReturn;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx
index abea11bf61f0..0a0c88c6285d 100644
--- a/xmlsecurity/source/component/certificatecontainer.hxx
+++ b/xmlsecurity/source/component/certificatecontainer.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -51,43 +51,43 @@ using namespace ::com::sun::star::lang;
class CertificateContainer : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::security::XCertificateContainer >
{
private:
- typedef std::map< ::rtl::OUString, ::rtl::OUString > Map;
+ typedef std::map< ::rtl::OUString, ::rtl::OUString > Map;
Map certMap;
Map certTrustMap;
-
+
::sal_Bool SAL_CALL searchMap( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, Map &_certMap );
virtual ::sal_Bool SAL_CALL isTemporaryCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL isCertificateTrust( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
-
+
public:
-
+
CertificateContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ) {};
virtual ~CertificateContainer(){};
-
+
virtual ::sal_Bool SAL_CALL addCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, ::sal_Bool trust ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::security::CertificateContainerStatus SAL_CALL hasCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::security::CertificateContainerStatus SAL_CALL hasCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
// provide factory
- static ::rtl::OUString SAL_CALL
+ static ::rtl::OUString SAL_CALL
impl_getStaticImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
-
+
static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
impl_getStaticSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException);
-
+
static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL
impl_createFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ServiceManager ) throw(::com::sun::star::uno::RuntimeException);
-
+
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) throw( ::com::sun::star::uno::RuntimeException );
-
+
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL
+ virtual ::rtl::OUString SAL_CALL
getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL
+ virtual ::sal_Bool SAL_CALL
supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException);
-
+
};
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index f5930feb7308..ba0d11d00ced 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -441,7 +441,7 @@ void DocumentDigitalSignatures::showCertificate(
//warning free code
//if ( aLocObj.GetProtocol() == INET_PROT_FILE && ( pBroker = ::ucbhelper::ContentBroker::get() ) )
- // xContentProvider = pBroker->getContentProviderInterface();
+ // xContentProvider = pBroker->getContentProviderInterface();
if ( aLocObj.GetProtocol() == INET_PROT_FILE)
{
pBroker = ::ucbhelper::ContentBroker::get();
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx
index 3525370d10b5..204f53cf7f67 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.hxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -37,15 +37,15 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <xmlsecurity/documentsignaturehelper.hxx>
-namespace com { namespace sun { namespace star {
-
+namespace com { namespace sun { namespace star {
+
namespace uno {
class XComponentContext;
}
}}}
-class DocumentDigitalSignatures : public cppu::WeakImplHelper2
-<
+class DocumentDigitalSignatures : public cppu::WeakImplHelper2
+<
com::sun::star::security::XDocumentDigitalSignatures,
com::sun::star::lang::XInitialization
>
@@ -57,8 +57,8 @@ private:
//The number of arguments which were passed in XInitialization::initialize
int m_nArgumentsCount;
//Indicates if the document already contains a document signature
- bool m_bHasDocumentSignature;
-
+ bool m_bHasDocumentSignature;
+
sal_Bool ImplViewSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (::com::sun::star::uno::RuntimeException);
sal_Bool ImplViewSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (::com::sun::star::uno::RuntimeException);
com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > ImplVerifySignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignStream, DocumentSignatureMode eMode ) throw (::com::sun::star::uno::RuntimeException);
@@ -67,11 +67,11 @@ public:
DocumentDigitalSignatures( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext>& rxCtx );
// for service registration...
- static ::rtl::OUString GetImplementationName() throw (com::sun::star::uno::RuntimeException);
- static ::com::sun::star::uno::Sequence < ::rtl::OUString > GetSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
-
+ static ::rtl::OUString GetImplementationName() throw (com::sun::star::uno::RuntimeException);
+ static ::com::sun::star::uno::Sequence < ::rtl::OUString > GetSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
+
//XInitialization
- void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+ 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);
// XDocumentDigitalSignatures
@@ -96,7 +96,7 @@ public:
};
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL DocumentDigitalSignatures_CreateInstance(
+com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL DocumentDigitalSignatures_CreateInstance(
const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rCtx) throw ( com::sun::star::uno::Exception );
#endif // _XMLSECURITY_DOCUMENTDIGITALSIGNATURES_HXX
diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx
index c9f7475abb83..36bddc967aa3 100644
--- a/xmlsecurity/source/component/registerservices.cxx
+++ b/xmlsecurity/source/component/registerservices.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -57,10 +57,10 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
// SERVICE DocumentDigitalSignatures
nPos = 0;
uno::Reference< registry::XRegistryKey > xNewKey(
- reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( DocumentDigitalSignatures::GetImplementationName() ) );
-
+ reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( DocumentDigitalSignatures::GetImplementationName() ) );
+
xNewKey = xNewKey->createKey( rtl::OUString::createFromAscii( "/UNO/SERVICES" ) );
-
+
const uno::Sequence< rtl::OUString >& rSNL = DocumentDigitalSignatures::GetSupportedServiceNames();
const rtl::OUString* pArray = rSNL.getConstArray();
for ( nPos = rSNL.getLength(); nPos--; )
@@ -69,16 +69,16 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
// SERVICE CertificateContainer
nPos = 0;
uno::Reference< registry::XRegistryKey > xNewKeyCertificateContainer(
- reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( CertificateContainer::impl_getStaticImplementationName() ) );
+ reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( CertificateContainer::impl_getStaticImplementationName() ) );
xNewKeyCertificateContainer = xNewKeyCertificateContainer->createKey( rtl::OUString::createFromAscii( "/UNO/SERVICES" ) );
-
+
const uno::Sequence< rtl::OUString >& rSNLCertificateContainer = CertificateContainer::impl_getStaticSupportedServiceNames();
const rtl::OUString* pArrayCertificateContainer = rSNLCertificateContainer.getConstArray();
for ( nPos = rSNLCertificateContainer.getLength(); nPos--; )
- xNewKeyCertificateContainer->createKey( pArrayCertificateContainer[nPos] );
-
+ xNewKeyCertificateContainer->createKey( pArrayCertificateContainer[nPos] );
+
//-----------------------------
-
+
return sal_True;
}
catch (registry::InvalidRegistryException &)
@@ -93,10 +93,10 @@ void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pService
{
void* pRet = 0;
uno::Reference< XInterface > xFactory;
-
+
//Decryptor
rtl::OUString implName = rtl::OUString::createFromAscii( pImplName );
-
+
if ( pServiceManager && implName.equals( DocumentDigitalSignatures::GetImplementationName() ) )
{
// DocumentDigitalSignatures
@@ -110,11 +110,11 @@ void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pService
// CertificateContainer
xFactory = cppu::createOneInstanceFactory(
reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),
- rtl::OUString::createFromAscii( pImplName ),
- CertificateContainer::impl_createInstance,
+ rtl::OUString::createFromAscii( pImplName ),
+ CertificateContainer::impl_createInstance,
CertificateContainer::impl_getStaticSupportedServiceNames() );
}
-
+
if (xFactory.is())
{
xFactory->acquire();
diff --git a/xmlsecurity/source/component/warnbox.src b/xmlsecurity/source/component/warnbox.src
index dd55cad7558b..814952d82010 100644
--- a/xmlsecurity/source/component/warnbox.src
+++ b/xmlsecurity/source/component/warnbox.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite