[Libreoffice-commits] core.git: ucb/source xmlsecurity/inc xmlsecurity/source
Noel Grandin
noel at peralex.com
Wed Apr 8 23:45:11 PDT 2015
ucb/source/core/ucb.hxx | 2
ucb/source/ucp/cmis/cmis_content.hxx | 2
ucb/source/ucp/file/bc.cxx | 10 -
ucb/source/ucp/file/filid.cxx | 6
ucb/source/ucp/file/filid.hxx | 4
ucb/source/ucp/file/filnot.cxx | 4
ucb/source/ucp/file/filrset.cxx | 3
ucb/source/ucp/file/prov.cxx | 8
ucb/source/ucp/file/shell.hxx | 18 +-
ucb/source/ucp/hierarchy/hierarchydata.hxx | 2
ucb/source/ucp/hierarchy/hierarchydatasource.hxx | 81 +++-------
ucb/source/ucp/tdoc/tdoc_docmgr.hxx | 15 -
ucb/source/ucp/tdoc/tdoc_provider.cxx | 2
xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx | 4
xmlsecurity/source/component/certificatecontainer.hxx | 2
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 12 -
xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 6
xmlsecurity/source/framework/saxeventkeeperimpl.hxx | 10 -
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 2
xmlsecurity/source/helper/xsecctl.hxx | 4
xmlsecurity/source/helper/xsecparser.hxx | 2
xmlsecurity/source/xmlsec/nss/nssinitializer.hxx | 2
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx | 2
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 2
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 12 -
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 10 -
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 10 -
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx | 18 +-
28 files changed, 112 insertions(+), 143 deletions(-)
New commits:
commit 4cca0169aad7297763beaaabf9e356a40725312d
Author: Noel Grandin <noel at peralex.com>
Date: Tue Apr 7 14:16:06 2015 +0200
loplugin:staticmethods
Change-Id: I2177e424d54dc2b5e26b7bbfe073b524e9cc5bab
Reviewed-on: https://gerrit.libreoffice.org/15187
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index fb3d1d0..fe3dec5 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -192,7 +192,7 @@ private:
queryContentProvider( const OUString& Identifier,
bool bResolved );
- com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfo >
+ static com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfo >
getCommandInfo();
void
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index d143984..160ae1e 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -111,7 +111,7 @@ private:
void destroy( ) throw( com::sun::star::uno::Exception );
- void copyData( com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xIn,
+ static void copyData( com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xIn,
com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOut );
com::sun::star::uno::Sequence< com::sun::star::uno::Any >
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index b3102ea..9d48cfd 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -719,11 +719,11 @@ BaseContent::getParent(
OUString ParentUrl;
- bool err = m_pMyShell->getUrlFromUnq( ParentUnq, ParentUrl );
+ bool err = fileaccess::shell::getUrlFromUnq( ParentUnq, ParentUrl );
if( err )
return Reference< XInterface >( 0 );
- FileContentIdentifier* p = new FileContentIdentifier( m_pMyShell,ParentUnq );
+ FileContentIdentifier* p = new FileContentIdentifier( ParentUnq );
Reference< XContentIdentifier > Identifier( p );
try
@@ -1077,7 +1077,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
}
OUString srcUnc;
- if( m_pMyShell->getUnqFromUrl( aTransferInfo.SourceURL,srcUnc ) )
+ if( fileaccess::shell::getUnqFromUrl( aTransferInfo.SourceURL,srcUnc ) )
{
m_pMyShell->installError( nMyCommandIdentifier,
TASKHANDLING_TRANSFER_INVALIDURL );
@@ -1244,7 +1244,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
if ( ! success )
return;
- FileContentIdentifier* p = new FileContentIdentifier( m_pMyShell,m_aUncPath );
+ FileContentIdentifier* p = new FileContentIdentifier( m_aUncPath );
m_xContentIdentifier = Reference< XContentIdentifier >( p );
m_pMyShell->registerNotifier( m_aUncPath,this );
@@ -1291,7 +1291,7 @@ BaseContent::cEXC( const OUString& aNewName )
Reference< XContentIdentifier > xOldRef = m_xContentIdentifier;
m_aUncPath = aNewName;
- FileContentIdentifier* pp = new FileContentIdentifier( m_pMyShell,aNewName );
+ FileContentIdentifier* pp = new FileContentIdentifier( aNewName );
m_xContentIdentifier = Reference< XContentIdentifier >( pp );
ContentEventNotifier* p = 0;
diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index 1d9d146..f2d45bb 100644
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
@@ -28,20 +28,18 @@ using namespace com::sun::star::ucb;
FileContentIdentifier::FileContentIdentifier(
- shell* pMyShell,
const OUString& aUnqPath,
bool IsNormalized )
- : m_pMyShell( pMyShell )
{
if( IsNormalized )
{
- m_pMyShell->getUrlFromUnq( aUnqPath,m_aContentId );
+ fileaccess::shell::getUrlFromUnq( aUnqPath,m_aContentId );
m_aNormalizedId = aUnqPath;
shell::getScheme( m_aProviderScheme );
}
else
{
- m_pMyShell->getUnqFromUrl( aUnqPath,m_aNormalizedId );
+ fileaccess::shell::getUnqFromUrl( aUnqPath,m_aNormalizedId );
m_aContentId = aUnqPath;
shell::getScheme( m_aProviderScheme );
}
diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx
index 8c2ba15..54c2540 100644
--- a/ucb/source/ucp/file/filid.hxx
+++ b/ucb/source/ucp/file/filid.hxx
@@ -36,8 +36,7 @@ namespace fileaccess {
// This implementation has to be reworked
public:
- FileContentIdentifier( shell* pMyShell,
- const OUString& aUnqPath,
+ FileContentIdentifier( const OUString& aUnqPath,
bool IsNormalized = true );
virtual ~FileContentIdentifier();
@@ -81,7 +80,6 @@ namespace fileaccess {
throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
private:
- shell* m_pMyShell;
OUString m_aContentId; // The URL string
OUString m_aNormalizedId; // The somehow normalized string
OUString m_aProviderScheme;
diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx
index 393d85c..a66b17a 100644
--- a/ucb/source/ucp/file/filnot.cxx
+++ b/ucb/source/ucp/file/filnot.cxx
@@ -61,7 +61,7 @@ ContentEventNotifier::ContentEventNotifier( shell* pMyShell,
void ContentEventNotifier::notifyChildInserted( const OUString& aChildName )
{
- FileContentIdentifier* p = new FileContentIdentifier( m_pMyShell,aChildName );
+ FileContentIdentifier* p = new FileContentIdentifier( aChildName );
uno::Reference< XContentIdentifier > xChildId( p );
uno::Reference< XContent > xChildContent = m_pMyShell->m_pProvider->queryContent( xChildId );
@@ -100,7 +100,7 @@ void ContentEventNotifier::notifyDeleted( void )
void ContentEventNotifier::notifyRemoved( const OUString& aChildName )
{
- FileContentIdentifier* p = new FileContentIdentifier( m_pMyShell,aChildName );
+ FileContentIdentifier* p = new FileContentIdentifier( aChildName );
uno::Reference< XContentIdentifier > xChildId( p );
BaseContent* pp = new BaseContent( m_pMyShell,xChildId,aChildName );
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index 5413b08..e4d8159 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -561,8 +561,7 @@ XResultSet_impl::queryContentIdentifier(
if( ! m_aIdents[m_nRow].is() )
{
FileContentIdentifier* p
- = new FileContentIdentifier( m_pMyShell,
- m_aUnqPath[ m_nRow ] );
+ = new FileContentIdentifier( m_aUnqPath[ m_nRow ] );
m_aIdents[m_nRow] = uno::Reference< ucb::XContentIdentifier >(p);
}
return m_aIdents[m_nRow];
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 5dc799c..1a7e6a1 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -201,7 +201,7 @@ FileProvider::queryContent(
{
init();
OUString aUnc;
- bool err = m_pMyShell->getUnqFromUrl( xIdentifier->getContentIdentifier(),
+ bool err = fileaccess::shell::getUnqFromUrl( xIdentifier->getContentIdentifier(),
aUnc );
if( err )
@@ -228,8 +228,8 @@ FileProvider::compareContentIds(
{
OUString aPath1, aPath2;
- m_pMyShell->getUnqFromUrl( aUrl1, aPath1 );
- m_pMyShell->getUnqFromUrl( aUrl2, aPath2 );
+ fileaccess::shell::getUnqFromUrl( aUrl1, aPath1 );
+ fileaccess::shell::getUnqFromUrl( aUrl2, aPath2 );
osl::FileBase::RC error;
osl::DirectoryItem aItem1, aItem2;
@@ -277,7 +277,7 @@ FileProvider::createContentIdentifier(
throw( RuntimeException, std::exception )
{
init();
- FileContentIdentifier* p = new FileContentIdentifier( m_pMyShell,ContentId,false );
+ FileContentIdentifier* p = new FileContentIdentifier( ContentId,false );
return Reference< XContentIdentifier >( p );
}
diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx
index a8bae85..0985ed6 100644
--- a/ucb/source/ucp/file/shell.hxx
+++ b/ucb/source/ucp/file/shell.hxx
@@ -391,9 +391,9 @@ namespace fileaccess {
/* */
/******************************************************************************/
- bool SAL_CALL getUnqFromUrl( const OUString& Url, OUString& Unq );
+ static bool SAL_CALL getUnqFromUrl( const OUString& Url, OUString& Unq );
- bool SAL_CALL getUrlFromUnq( const OUString& Unq, OUString& Url );
+ static bool SAL_CALL getUrlFromUnq( const OUString& Unq, OUString& Url );
bool m_bWithConfig;
@@ -429,28 +429,28 @@ namespace fileaccess {
/* notify eventListeners */
/********************************************************************************/
- void SAL_CALL notifyPropertyChanges(
+ static void SAL_CALL notifyPropertyChanges(
std::list< PropertyChangeNotifier* >* listeners,
const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyChangeEvent >& seqChanged );
- void SAL_CALL notifyContentExchanged(
+ static void SAL_CALL notifyContentExchanged(
std::vector< std::list< ContentEventNotifier* >* >* listeners_vec );
- void SAL_CALL notifyInsert(
+ static void SAL_CALL notifyInsert(
std::list< ContentEventNotifier* >* listeners,const OUString& aChildName );
- void SAL_CALL notifyContentDeleted(
+ static void SAL_CALL notifyContentDeleted(
std::list< ContentEventNotifier* >* listeners );
- void SAL_CALL notifyContentRemoved(
+ static void SAL_CALL notifyContentRemoved(
std::list< ContentEventNotifier* >* listeners,
const OUString& aChildName );
- void SAL_CALL notifyPropertyAdded(
+ static void SAL_CALL notifyPropertyAdded(
std::list< PropertySetInfoChangeNotifier* >* listeners,
const OUString& aPropertyName );
- void SAL_CALL notifyPropertyRemoved(
+ static void SAL_CALL notifyPropertyRemoved(
std::list< PropertySetInfoChangeNotifier* >* listeners,
const OUString& aPropertyName );
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx
index ff95aaa..f6e00e4 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx
@@ -94,7 +94,7 @@ class HierarchyEntry
bool m_bTriedToGetRootReadAccess; // #82494#
private:
- OUString createPathFromHierarchyURL( const HierarchyUri & rURI );
+ static OUString createPathFromHierarchyURL( const HierarchyUri & rURI );
::com::sun::star::uno::Reference<
::com::sun::star::container::XHierarchicalNameAccess >
getRootReadAccess();
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index 35901df..4a695a7 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
@@ -36,22 +36,18 @@ namespace hierarchy_ucp {
class HierarchyDataSource : public cppu::OWeakObject,
- public com::sun::star::lang::XServiceInfo,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::lang::XComponent,
- public com::sun::star::lang::XMultiServiceFactory
+ public css::lang::XServiceInfo,
+ public css::lang::XTypeProvider,
+ public css::lang::XComponent,
+ public css::lang::XMultiServiceFactory
{
osl::Mutex m_aMutex;
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > m_xContext;
- com::sun::star::uno::Reference<
- com::sun::star::lang::XMultiServiceFactory > m_xConfigProvider;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::lang::XMultiServiceFactory > m_xConfigProvider;
cppu::OInterfaceContainerHelper * m_pDisposeEventListeners;
public:
- HierarchyDataSource( const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > &
- rxContext );
+ HierarchyDataSource( const css::uno::Reference< css::uno::XComponentContext > & rxContext );
virtual ~HierarchyDataSource();
// XInterface
@@ -73,8 +69,7 @@ public:
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
- static css::uno::Reference< css::lang::XSingleServiceFactory >
- createServiceFactory( const css::uno::Reference<
+ static css::uno::Reference< css::lang::XSingleServiceFactory > createServiceFactory( const css::uno::Reference<
css::lang::XMultiServiceFactory >& rxServiceMgr );
// XTypeProvider
@@ -84,53 +79,37 @@ public:
throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XComponent
- virtual void SAL_CALL
- dispose()
- throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL
- addEventListener( const com::sun::star::uno::Reference<
- com::sun::star::lang::XEventListener > & xListener )
- throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL
- removeEventListener( const com::sun::star::uno::Reference<
- com::sun::star::lang::XEventListener > & aListener )
- throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL dispose()
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener )
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & aListener )
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XMultiServiceFactory
- virtual com::sun::star::uno::Reference<
- com::sun::star::uno::XInterface > SAL_CALL
- createInstance( const OUString & aServiceSpecifier )
- throw ( com::sun::star::uno::Exception,
- com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual com::sun::star::uno::Reference<
- com::sun::star::uno::XInterface > SAL_CALL
- createInstanceWithArguments( const OUString & ServiceSpecifier,
- const com::sun::star::uno::Sequence<
- com::sun::star::uno::Any > & Arguments )
- throw ( com::sun::star::uno::Exception,
- com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
- getAvailableServiceNames()
- throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString & aServiceSpecifier )
+ throw ( css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString & ServiceSpecifier,
+ const css::uno::Sequence<
+ css::uno::Any > & Arguments )
+ throw ( css::uno::Exception,
+ css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
+ throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// Non-Interface methods
private:
- com::sun::star::uno::Reference<
- com::sun::star::uno::XInterface > SAL_CALL
- createInstanceWithArguments( const OUString & ServiceSpecifier,
- const com::sun::star::uno::Sequence<
- com::sun::star::uno::Any > & Arguments,
+ css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString & ServiceSpecifier,
+ const css::uno::Sequence<
+ css::uno::Any > & Arguments,
bool bCheckArgs )
- throw ( com::sun::star::uno::Exception,
- com::sun::star::uno::RuntimeException );
+ throw ( css::uno::Exception, css::uno::RuntimeException );
- com::sun::star::uno::Reference<
- com::sun::star::lang::XMultiServiceFactory >
- getConfigProvider();
+ css::uno::Reference< css::lang::XMultiServiceFactory > getConfigProvider();
- bool
- createConfigPath( const OUString & rInPath, OUString & rOutPath );
+ static bool createConfigPath( const OUString & rInPath, OUString & rOutPath );
};
} // namespace hierarchy_ucp
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
index f71f0c7..9d445ec 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
@@ -138,8 +138,7 @@ namespace tdoc_ucp {
com::sun::star::uno::Reference< com::sun::star::embed::XStorage >
queryStorage( const OUString & rDocId );
- OUString
- queryDocumentId(
+ static OUString queryDocumentId(
const com::sun::star::uno::Reference<
com::sun::star::frame::XModel > & xModel );
@@ -155,18 +154,15 @@ namespace tdoc_ucp {
private:
void buildDocumentsList();
- bool
- isOfficeDocument(
+ bool isOfficeDocument(
const com::sun::star::uno::Reference<
com::sun::star::uno::XInterface > & xDoc );
- bool
- isDocumentPreview(
+ static bool isDocumentPreview(
const com::sun::star::uno::Reference<
com::sun::star::frame::XModel > & xModel );
- bool
- isWithoutOrInTopLevelFrame(
+ static bool isWithoutOrInTopLevelFrame(
const com::sun::star::uno::Reference<
com::sun::star::frame::XModel > & xModel );
@@ -175,8 +171,7 @@ namespace tdoc_ucp {
const com::sun::star::uno::Reference<
com::sun::star::frame::XModel > & xModel );
- bool
- isHelpDocument(
+ static bool isHelpDocument(
const com::sun::star::uno::Reference<
com::sun::star::frame::XModel > & xModel );
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index cce79c3..f0ed128 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -175,7 +175,7 @@ ContentProvider::createDocumentContent(
// model -> id -> content identifier -> queryContent
if ( m_xDocsMgr.is() )
{
- OUString aDocId = m_xDocsMgr->queryDocumentId( Model );
+ OUString aDocId = tdoc_ucp::OfficeDocumentsManager::queryDocumentId( Model );
if ( !aDocId.isEmpty() )
{
OUStringBuffer aBuffer;
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
index d47526c..17cb311 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
@@ -174,8 +174,8 @@ public:
// MM: Yes, but if you want to insert a new signature into an existing signature file, those function
// will be very useful, see Mission 3 in the new "multisigdemo" program :-)
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XWriter> CreateDocumentHandlerWithHeader( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xOutputStream );
- void CloseDocumentHandler( const ::com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler>& xDocumentHandler );
- void ExportSignature( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler, const SignatureInformation& signatureInfo );
+ static void CloseDocumentHandler( const ::com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler>& xDocumentHandler );
+ static void ExportSignature( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler, const SignatureInformation& signatureInfo );
};
#endif // INCLUDED_XMLSECURITY_INC_XMLSECURITY_XMLSIGNATUREHELPER_HXX
diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx
index 0bf4058..9d5b216 100644
--- a/xmlsecurity/source/component/certificatecontainer.hxx
+++ b/xmlsecurity/source/component/certificatecontainer.hxx
@@ -39,7 +39,7 @@ class CertificateContainer : public ::cppu::WeakImplHelper2< css::lang::XService
Map certMap;
Map certTrustMap;
- bool SAL_CALL searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap );
+ static bool SAL_CALL searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap );
bool SAL_CALL isTemporaryCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException);
bool SAL_CALL isCertificateTrust( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException);
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 5d412c7..6f5db4d 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -372,10 +372,10 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, OKButtonHdl)
uno::Reference< xml::sax::XDocumentHandler> xDocumentHandler(xSaxWriter, UNO_QUERY_THROW);
size_t nInfos = maCurrentSignatureInformations.size();
for( size_t n = 0 ; n < nInfos ; ++n )
- maSignatureHelper.ExportSignature(
+ XMLSignatureHelper::ExportSignature(
xDocumentHandler, maCurrentSignatureInformations[ n ] );
- maSignatureHelper.CloseDocumentHandler( xDocumentHandler);
+ XMLSignatureHelper::CloseDocumentHandler( xDocumentHandler);
// If stream was not provided, we are responsible for committing it....
if ( !mxSignatureStream.is() )
@@ -467,13 +467,13 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl)
uno::Reference< xml::sax::XDocumentHandler> xDocumentHandler(xSaxWriter, UNO_QUERY_THROW);
size_t nInfos = maCurrentSignatureInformations.size();
for ( size_t n = 0; n < nInfos; n++ )
- maSignatureHelper.ExportSignature( xDocumentHandler, maCurrentSignatureInformations[n]);
+ XMLSignatureHelper::ExportSignature( xDocumentHandler, maCurrentSignatureInformations[n]);
// Create a new one...
maSignatureHelper.CreateAndWriteSignature( xDocumentHandler );
// That's it...
- maSignatureHelper.CloseDocumentHandler( xDocumentHandler);
+ XMLSignatureHelper::CloseDocumentHandler( xDocumentHandler);
maSignatureHelper.EndMission();
@@ -530,9 +530,9 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, RemoveButtonHdl)
uno::Reference< xml::sax::XDocumentHandler> xDocumentHandler(xSaxWriter, UNO_QUERY_THROW);
size_t nInfos = maCurrentSignatureInformations.size();
for( size_t n = 0 ; n < nInfos ; ++n )
- maSignatureHelper.ExportSignature( xDocumentHandler, maCurrentSignatureInformations[ n ] );
+ XMLSignatureHelper::ExportSignature( xDocumentHandler, maCurrentSignatureInformations[ n ] );
- maSignatureHelper.CloseDocumentHandler( xDocumentHandler);
+ XMLSignatureHelper::CloseDocumentHandler( xDocumentHandler);
mbSignaturesChanged = true;
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index 3d2e397..652b0f1 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -401,7 +401,7 @@ OUString SAXEventKeeperImpl::printBufferNode(
}
cssu::Sequence< cssu::Reference< cssxw::XXMLElementWrapper > >
- SAXEventKeeperImpl::collectChildWorkingElement(BufferNode* pBufferNode) const
+ SAXEventKeeperImpl::collectChildWorkingElement(BufferNode* pBufferNode)
/****** SAXEventKeeperImpl/collectChildWorkingElement ************************
*
* NAME
@@ -599,7 +599,7 @@ void SAXEventKeeperImpl::smashBufferNode(
}
BufferNode* SAXEventKeeperImpl::findNextBlockingBufferNode(
- BufferNode* pStartBufferNode) const
+ BufferNode* pStartBufferNode)
/****** SAXEventKeeperImpl/findNextBlockingBufferNode ************************
*
* NAME
@@ -643,7 +643,7 @@ BufferNode* SAXEventKeeperImpl::findNextBlockingBufferNode(
return pNext;
}
-void SAXEventKeeperImpl::diffuse(BufferNode* pBufferNode) const
+void SAXEventKeeperImpl::diffuse(BufferNode* pBufferNode)
/****** SAXEventKeeperImpl/diffuse *******************************************
*
* NAME
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
index 27088b9..a1d15e8 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
@@ -196,17 +196,17 @@ private:
OUString printBufferNode(
BufferNode* pBufferNode, sal_Int32 nIndent) const;
- com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
+ static com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
com::sun::star::xml::wrapper::XXMLElementWrapper > >
- collectChildWorkingElement(BufferNode* pBufferNode) const;
+ collectChildWorkingElement(BufferNode* pBufferNode);
void smashBufferNode(
BufferNode* pBufferNode, bool bClearRoot) const;
- BufferNode* findNextBlockingBufferNode(
- BufferNode* pStartBufferNode) const;
+ static BufferNode* findNextBlockingBufferNode(
+ BufferNode* pStartBufferNode);
- void diffuse(BufferNode* pBufferNode) const;
+ static void diffuse(BufferNode* pBufferNode);
void releaseElementMarkBuffer();
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 9f04c58..b8756c2 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -183,7 +183,7 @@ void XMLSignatureHelper::ExportSignature(
const uno::Reference< xml::sax::XDocumentHandler >& xDocumentHandler,
const SignatureInformation& signatureInfo )
{
- mpXSecController->exportSignature(xDocumentHandler, signatureInfo);
+ XSecController::exportSignature(xDocumentHandler, signatureInfo);
}
bool XMLSignatureHelper::CreateAndWriteSignature( const uno::Reference< xml::sax::XDocumentHandler >& xDocumentHandler )
diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx
index 6c6e4b1..348d2d5 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -358,7 +358,7 @@ private:
/*
* For signature generation
*/
- OUString createId();
+ static OUString createId();
com::sun::star::uno::Reference<
com::sun::star::xml::crypto::sax::XReferenceResolvedListener > prepareSignatureToWrite(
InternalSignatureInformation& signatureInfo );
@@ -413,7 +413,7 @@ public:
SignatureInformation getSignatureInformation( sal_Int32 nSecurityId ) const;
SignatureInformations getSignatureInformations() const;
- void exportSignature(
+ static void exportSignature(
const com::sun::star::uno::Reference<
com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler,
const SignatureInformation& signatureInfo );
diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx
index ae8671e..85a9260 100644
--- a/xmlsecurity/source/helper/xsecparser.hxx
+++ b/xmlsecurity/source/helper/xsecparser.hxx
@@ -97,7 +97,7 @@ private:
bool m_bReferenceUnresolved;
private:
- OUString getIdAttr(const com::sun::star::uno::Reference<
+ static OUString getIdAttr(const com::sun::star::uno::Reference<
com::sun::star::xml::sax::XAttributeList >& xAttribs );
public:
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
index 6a2f628..0e579fe 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
@@ -44,7 +44,7 @@ public:
explicit ONSSInitializer(const css::uno::Reference<css::uno::XComponentContext> &rxContext);
virtual ~ONSSInitializer();
- bool initNSS( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext );
+ static bool initNSS( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext );
/* XDigestContextSupplier */
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XDigestContext > SAL_CALL getDigestContext( ::sal_Int32 nDigestID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
index fa34cd5..463b524 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
@@ -39,7 +39,7 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper1<
::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnValue ;
::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > m_Entries;
- OString removeOIDFromString( const OString &oid);
+ static OString removeOIDFromString( const OString &oid);
public :
SanExtensionImpl() ;
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index dd0bc10..dd294fb 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -131,7 +131,7 @@ private :
//Native methods
xmlSecKeysMngrPtr createKeysManager() throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
- void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
+ static void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
private:
void updateSlots();
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index 8e7e6bc..b1d04ea 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -153,7 +153,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
pEncCtx = xmlSecEncCtxCreate( pMngr ) ;
if( pEncCtx == NULL )
{
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//throw XMLEncryptionException() ;
clearErrorRecorder();
return aTemplate;
@@ -165,7 +165,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
if( xmlSecEncCtxXmlEncrypt( pEncCtx , pEncryptedData , pContent ) < 0 )
{
xmlSecEncCtxDestroy( pEncCtx ) ;
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//throw XMLEncryptionException() ;
clearErrorRecorder();
@@ -173,7 +173,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
}
xmlSecEncCtxDestroy( pEncCtx ) ;
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//get the new EncryptedData element
if (isParentRef)
@@ -274,7 +274,7 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt(
pEncCtx = xmlSecEncCtxCreate( pMngr ) ;
if( pEncCtx == NULL )
{
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//throw XMLEncryptionException() ;
clearErrorRecorder();
return aTemplate;
@@ -287,7 +287,7 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt(
//Destroy the encryption context
xmlSecEncCtxDestroy( pEncCtx ) ;
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//get the decrypted element
XMLElementWrapper_XmlSecImpl * ret = new XMLElementWrapper_XmlSecImpl(isParentRef?
@@ -301,7 +301,7 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt(
{
//The decryption fails, continue with the next security environment
xmlSecEncCtxDestroy( pEncCtx ) ;
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
}
}
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index a4e57b3..94a9d5f 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -127,7 +127,7 @@ SAL_CALL XMLSignature_NssImpl :: generate(
pDsigCtx = xmlSecDSigCtxCreate( pMngr ) ;
if( pDsigCtx == NULL )
{
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//throw XMLSignatureException() ;
clearErrorRecorder();
return aTemplate;
@@ -148,7 +148,7 @@ SAL_CALL XMLSignature_NssImpl :: generate(
xmlSecDSigCtxDestroy( pDsigCtx ) ;
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//Unregistered the stream/URI binding
if( xUriBinding.is() )
@@ -235,7 +235,7 @@ SAL_CALL XMLSignature_NssImpl :: validate(
pDsigCtx = xmlSecDSigCtxCreate( pMngr ) ;
if( pDsigCtx == NULL )
{
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
//throw XMLSignatureException() ;
clearErrorRecorder();
return aTemplate;
@@ -250,7 +250,7 @@ SAL_CALL XMLSignature_NssImpl :: validate(
{
aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
xmlSecDSigCtxDestroy( pDsigCtx ) ;
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
break;
}
else
@@ -258,7 +258,7 @@ SAL_CALL XMLSignature_NssImpl :: validate(
aTemplate->setStatus(com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN);
}
xmlSecDSigCtxDestroy( pDsigCtx ) ;
- pSecEnv->destroyKeysManager( pMngr );
+ SecurityEnvironment_NssImpl::destroyKeysManager( pMngr );
}
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index 062fee4..ae0b107 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -183,7 +183,7 @@ void XMLDocumentWrapper_XmlSecImpl::getNextSAXEvent()
void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
const cssu::Reference< cssxs::XDocumentHandler >& xHandler,
const cssu::Reference< cssxs::XDocumentHandler >& xHandler2,
- const xmlNodePtr pNode) const
+ const xmlNodePtr pNode)
throw (cssxs::SAXException)
/****** XMLDocumentWrapper_XmlSecImpl/sendStartElement ************************
*
@@ -283,7 +283,7 @@ void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
void XMLDocumentWrapper_XmlSecImpl::sendEndElement(
const cssu::Reference< cssxs::XDocumentHandler >& xHandler,
const cssu::Reference< cssxs::XDocumentHandler >& xHandler2,
- const xmlNodePtr pNode) const
+ const xmlNodePtr pNode)
throw (cssxs::SAXException)
/****** XMLDocumentWrapper_XmlSecImpl/sendEndElement **************************
*
@@ -327,7 +327,7 @@ void XMLDocumentWrapper_XmlSecImpl::sendEndElement(
void XMLDocumentWrapper_XmlSecImpl::sendNode(
const cssu::Reference< cssxs::XDocumentHandler >& xHandler,
const cssu::Reference< cssxs::XDocumentHandler >& xHandler2,
- const xmlNodePtr pNode) const
+ const xmlNodePtr pNode)
throw (cssxs::SAXException)
/****** XMLDocumentWrapper_XmlSecImpl/sendNode ********************************
*
@@ -388,7 +388,7 @@ void XMLDocumentWrapper_XmlSecImpl::sendNode(
}
}
-OString XMLDocumentWrapper_XmlSecImpl::getNodeQName(const xmlNodePtr pNode) const
+OString XMLDocumentWrapper_XmlSecImpl::getNodeQName(const xmlNodePtr pNode)
/****** XMLDocumentWrapper_XmlSecImpl/getNodeQName ****************************
*
* NAME
@@ -426,7 +426,7 @@ OString XMLDocumentWrapper_XmlSecImpl::getNodeQName(const xmlNodePtr pNode) cons
return sNodeName;
}
-xmlNodePtr XMLDocumentWrapper_XmlSecImpl::checkElement( const cssu::Reference< cssxw::XXMLElementWrapper >& xXMLElement) const
+xmlNodePtr XMLDocumentWrapper_XmlSecImpl::checkElement( const cssu::Reference< cssxw::XXMLElementWrapper >& xXMLElement)
/****** XMLDocumentWrapper_XmlSecImpl/checkElement ****************************
*
* NAME
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
index a5c4446..c083146 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
@@ -94,25 +94,25 @@ private:
private:
void getNextSAXEvent();
- void sendStartElement(
+ static void sendStartElement(
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler2,
- const xmlNodePtr pNode) const
+ const xmlNodePtr pNode)
throw (com::sun::star::xml::sax::SAXException);
- void sendEndElement(
+ static void sendEndElement(
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler2,
- const xmlNodePtr pNode) const
+ const xmlNodePtr pNode)
throw (com::sun::star::xml::sax::SAXException);
- void sendNode(
+ static void sendNode(
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xHandler2,
- const xmlNodePtr pNode) const
+ const xmlNodePtr pNode)
throw (com::sun::star::xml::sax::SAXException);
- OString getNodeQName(const xmlNodePtr pNode) const;
+ static OString getNodeQName(const xmlNodePtr pNode);
sal_Int32 recursiveDelete( const xmlNodePtr pNode);
@@ -120,9 +120,9 @@ private:
void removeNode( const xmlNodePtr pNode) const;
- xmlNodePtr checkElement(
+ static xmlNodePtr checkElement(
const com::sun::star::uno::Reference<
- com::sun::star::xml::wrapper::XXMLElementWrapper >& xXMLElement) const;
+ com::sun::star::xml::wrapper::XXMLElementWrapper >& xXMLElement);
void buildIDAttr( xmlNodePtr pNode ) const;
void rebuildIDLink( xmlNodePtr pNode ) const;
More information about the Libreoffice-commits
mailing list