From 9ebca0d77f3051e3525f502f0cdcfdc0819e4651 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 10 Jul 2011 00:26:10 +0100 Subject: callcatcher: remove unused xmlchar_to_ous --- xmlsecurity/source/xmlsec/saxhelper.cxx | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'xmlsecurity/source') diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx index 4c172296f869..9463251d3c0b 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.cxx +++ b/xmlsecurity/source/xmlsec/saxhelper.cxx @@ -64,21 +64,6 @@ xmlChar* ous_to_nxmlstr( const rtl::OUString& oustr, int& length ) return xmlStrndup( ( xmlChar* )ostr.getStr(), length ) ; } -/** - * The input parameter isn't necessaryly NULL terminated. - */ -rtl::OUString xmlchar_to_ous( const xmlChar* pChar, int length ) -{ - if( pChar != NULL ) - { - return rtl::OUString( ( sal_Char* )pChar , length , RTL_TEXTENCODING_UTF8 ) ; - } - else - { - return rtl::OUString() ; - } -} - /** * The return value and the referenced value must be NULL terminated. * The application has the responsibilty to deallocte the return value. -- cgit From d98ac11f3962f39efb1418588c609d03fb7cc37c Mon Sep 17 00:00:00 2001 From: Matus Kukan Date: Sun, 3 Jul 2011 13:59:22 +0200 Subject: Remove component_getImplementationEnvironment --- xmlsecurity/source/component/registerservices.cxx | 5 ----- xmlsecurity/source/framework/xsec_framework.cxx | 7 ------- xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 6 ------ 3 files changed, 18 deletions(-) (limited to 'xmlsecurity/source') diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx index 0681a853744f..69d06d11261e 100644 --- a/xmlsecurity/source/component/registerservices.cxx +++ b/xmlsecurity/source/component/registerservices.cxx @@ -42,11 +42,6 @@ using namespace ::com::sun::star; extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx index bec99e49686e..a57ce0d0df86 100644 --- a/xmlsecurity/source/framework/xsec_framework.cxx +++ b/xmlsecurity/source/framework/xsec_framework.cxx @@ -52,13 +52,6 @@ using namespace ::com::sun::star::registry; extern "C" { -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment **) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - //================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx index a2f19665a5fc..502eac846888 100644 --- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx +++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx @@ -100,12 +100,6 @@ extern void* nss_component_getFactory( const sal_Char*, void*, void* ); extern void* mscrypt_component_getFactory( const sal_Char*, void*, void* ); #endif -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment **) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey ) { void* pRet = 0; -- cgit From 024c78c94f43d6896e138b951cf55f31ec7dfd56 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 14 Jul 2011 14:23:22 +0100 Subject: Resolves: fdo#36534 rework SvxSimpleTable to not manage its own parent --- xmlsecurity/source/dialogs/certificatechooser.cxx | 3 ++- xmlsecurity/source/dialogs/certificateviewer.cxx | 3 ++- xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 5 +++-- xmlsecurity/source/dialogs/macrosecurity.cxx | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) (limited to 'xmlsecurity/source') diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 873c537399ab..a251654bc264 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -68,7 +68,8 @@ CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::X :ModalDialog ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTCHOOSER ) ) ,maCertsToIgnore( _rCertsToIgnore ) ,maHintFT ( this, XMLSEC_RES( FT_HINT_SELECT ) ) - ,maCertLB ( this, XMLSEC_RES( LB_SIGNATURES ) ) + ,m_aCertLBContainer(this, XMLSEC_RES(LB_SIGNATURES)) + ,maCertLB(m_aCertLBContainer) ,maViewBtn ( this, XMLSEC_RES( BTN_VIEWCERT ) ) ,maBottomSepFL ( this, XMLSEC_RES( FL_BOTTOM_SEP ) ) ,maOKBtn ( this, XMLSEC_RES( BTN_OK ) ) diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 1a75d47931cd..1c69f9c2161b 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -255,7 +255,8 @@ void CertificateViewerDetailsTP::InsertElement( const String& _rField, const Str CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, CertificateViewer* _pDlg ) :CertificateViewerTP ( _pParent, XMLSEC_RES( RID_XMLSECTP_DETAILS ), _pDlg ) - ,maElementsLB ( this, XMLSEC_RES( LB_ELEMENTS ) ) + ,m_aElementsLBContainer(this, XMLSEC_RES(LB_ELEMENTS)) + ,maElementsLB(m_aElementsLBContainer) ,maElementML ( this, XMLSEC_RES( ML_ELEMENT ) ) ,maStdFont ( maElementML.GetControlFont() ) ,maFixedWidthFont ( OutputDevice::GetDefaultFont( DEFAULTFONT_UI_FIXED, LANGUAGE_DONTKNOW, DEFAULTFONT_FLAGS_ONLYONE, this ) ) diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index a40e1626404e..471e7fbb6f9e 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -191,7 +191,8 @@ DigitalSignaturesDialog::DigitalSignaturesDialog( ,maHintDocFT ( this, XMLSEC_RES( FT_HINT_DOC ) ) ,maHintBasicFT ( this, XMLSEC_RES( FT_HINT_BASIC ) ) ,maHintPackageFT ( this, XMLSEC_RES( FT_HINT_PACK ) ) - ,maSignaturesLB ( this, XMLSEC_RES( LB_SIGNATURES ) ) + ,maSignaturesLBContainer(this, XMLSEC_RES(LB_SIGNATURES)) + ,maSignaturesLB(maSignaturesLBContainer) ,maSigsValidImg ( this, XMLSEC_RES( IMG_STATE_VALID ) ) ,maSigsValidFI ( this, XMLSEC_RES( FI_STATE_VALID ) ) ,maSigsInvalidImg ( this, XMLSEC_RES( IMG_STATE_BROKEN ) ) @@ -209,7 +210,7 @@ DigitalSignaturesDialog::DigitalSignaturesDialog( ,m_bHasDocumentSignature(bHasDocumentSignature) ,m_bWarningShowSignMacro(false) { - // --> PB #i48253 the tablistbox needs its own unique id + // #i48253# the tablistbox needs its own unique id maSignaturesLB.Window::SetUniqueId( HID_XMLSEC_TREE_SIGNATURESDLG ); Size aControlSize( maSignaturesLB.GetSizePixel() ); aControlSize = maSignaturesLB.PixelToLogic( aControlSize, MapMode( MAP_APPFONT ) ); diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 90c7179e9c64..c50eb835a4fc 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -337,7 +337,8 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP( Window* _pParent, :MacroSecurityTP ( _pParent, XMLSEC_RES( RID_XMLSECTP_TRUSTSOURCES ), _pDlg ) ,maTrustCertFL ( this, XMLSEC_RES( FL_TRUSTCERT ) ) ,maTrustCertROFI ( this, XMLSEC_RES( FI_TRUSTCERT_RO ) ) - ,maTrustCertLB ( this, XMLSEC_RES( LB_TRUSTCERT ) ) + ,m_aTrustCertLBContainer(this, XMLSEC_RES(LB_TRUSTCERT)) + ,maTrustCertLB(m_aTrustCertLBContainer) ,maAddCertPB ( this, XMLSEC_RES( PB_ADD_TRUSTCERT ) ) ,maViewCertPB ( this, XMLSEC_RES( PB_VIEW_TRUSTCERT ) ) ,maRemoveCertPB ( this, XMLSEC_RES( PB_REMOVE_TRUSTCERT ) ) -- cgit From 66fd1442696059cc6de07ec96af77082654a0990 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 13 Aug 2011 15:12:01 +0200 Subject: Some cppcheck cleaning --- xmlsecurity/source/helper/documentsignaturehelper.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xmlsecurity/source') diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 2c33af2dc372..fc06f9e7555c 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -155,7 +155,7 @@ bool DocumentSignatureHelper::isOOo3_2_Signature(const SignatureInformation & si bool bOOo3_2 = false; typedef ::std::vector< SignatureReferenceInformation >::const_iterator CIT; for (CIT i = sigInfo.vSignatureReferenceInfors.begin(); - i < sigInfo.vSignatureReferenceInfors.end(); i++) + i < sigInfo.vSignatureReferenceInfors.end(); ++i) { if (i->ouURI.equals(sManifestURI)) { -- cgit From 15f482b1e9aff47a366a1cb1666fb4aabea49912 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 18 Aug 2011 01:03:12 +0200 Subject: Add prefixes for some component_getFactory functions --- xmlsecurity/source/component/registerservices.cxx | 2 +- xmlsecurity/source/framework/xsec_framework.cxx | 2 +- xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'xmlsecurity/source') diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx index 69d06d11261e..b3bc997a5761 100644 --- a/xmlsecurity/source/component/registerservices.cxx +++ b/xmlsecurity/source/component/registerservices.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star; extern "C" { -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL xmlsecurity_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void* pRet = 0; uno::Reference< XInterface > xFactory; diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx index a57ce0d0df86..4c2be36c56f8 100644 --- a/xmlsecurity/source/framework/xsec_framework.cxx +++ b/xmlsecurity/source/framework/xsec_framework.cxx @@ -53,7 +53,7 @@ using namespace ::com::sun::star::registry; extern "C" { //================================================================================================== -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsec_fw_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx index 502eac846888..d7d919920067 100644 --- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx +++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx @@ -100,7 +100,7 @@ extern void* nss_component_getFactory( const sal_Char*, void*, void* ); extern void* mscrypt_component_getFactory( const sal_Char*, void*, void* ); #endif -SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_xmlsec_component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey ) { void* pRet = 0; Reference< XInterface > xFactory ; -- cgit