diff options
19 files changed, 58 insertions, 98 deletions
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index ee6387ea3e25..742382d4587c 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -65,7 +65,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::script; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::document; -namespace css = ::com::sun::star; static OUString SERVICE_UICATEGORYDESCRIPTION ("com.sun.star.ui.UICategoryDescription"); diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx index 2800b63202a8..466061ea60c2 100644 --- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx +++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx @@ -28,12 +28,6 @@ #include <shobjidl.h> -#ifdef css - #error "Clash on using CSS as namespace define." -#else - #define css ::com::sun::star -#endif - namespace fpicker{ namespace win32{ namespace vista{ @@ -56,8 +50,6 @@ class IVistaFilePickerInternalNotify }}} -#undef css - #endif // FPICKER_WIN32_VISTA_FILEPICKER_INTERNALNOTIFY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/filepicker/vistatypes.h b/fpicker/source/win32/filepicker/vistatypes.h index 3f95918c336a..f7ebd22d9f16 100644 --- a/fpicker/source/win32/filepicker/vistatypes.h +++ b/fpicker/source/win32/filepicker/vistatypes.h @@ -23,12 +23,6 @@ #include "comptr.hxx" #include <shobjidl.h> -#ifdef css - #error "Clash on using CSS as namespace define." -#else - #define css ::com::sun::star -#endif - namespace fpicker{ namespace win32{ namespace vista{ @@ -47,8 +41,6 @@ typedef ComPtr< IFileDialogCustomize, IID_IFileDialogCustomize } // namespace win32 } // namespace fpicker -#undef css - #endif // FPICKER_WIN32_VISTA_TYPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index fac2eca11fb5..54365f8e9081 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -43,11 +43,8 @@ using namespace utl; using namespace com::sun::star; -//using namespace com::sun::star::uno; using rtl::OUString; -//namespace css = ::com::sun::star; - namespace { diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 070cbc8e2578..8ad4e22f632c 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -323,9 +323,9 @@ void MacroWarning::FitControls() SetSizePixel( aNewSize ); } -void MacroWarning::SetStorage( const cssu::Reference < css::embed::XStorage >& rxStore, +void MacroWarning::SetStorage( const css::uno::Reference < css::embed::XStorage >& rxStore, const ::rtl::OUString& aODFVersion, - const cssu::Sequence< security::DocumentSignatureInformation >& rInfos ) + const css::uno::Sequence< security::DocumentSignatureInformation >& rInfos ) { mxStore = rxStore; maODFVersion = aODFVersion; @@ -348,7 +348,7 @@ void MacroWarning::SetStorage( const cssu::Reference < css::embed::XStorage >& r } } -void MacroWarning::SetCertificate( const cssu::Reference< css::security::XCertificate >& _rxCert ) +void MacroWarning::SetCertificate( const css::uno::Reference< css::security::XCertificate >& _rxCert ) { mxCert = _rxCert; if( mxCert.is() ) diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx index 0a56d8516b96..e4d108f41561 100644 --- a/uui/source/sslwarndlg.cxx +++ b/uui/source/sslwarndlg.cxx @@ -52,7 +52,7 @@ IMPL_LINK_NOARG(SSLWarnDialog, ViewCertHdl_Impl) SSLWarnDialog::SSLWarnDialog ( Window* pParent, - const cssu::Reference< dcss::security::XCertificate >& rXCert, + const css::uno::Reference< css::security::XCertificate >& rXCert, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext, ResMgr* pResMgr ) : diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx index 9cfa924ae4b4..43363ca1f863 100644 --- a/uui/source/sslwarndlg.hxx +++ b/uui/source/sslwarndlg.hxx @@ -28,10 +28,6 @@ #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -namespace cssu = com::sun::star::uno; -namespace dcss = ::com::sun::star; - - using namespace com::sun::star; //===================================================================== @@ -48,8 +44,8 @@ private: FixedImage m_aWarnImage; - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& m_xContext; - const cssu::Reference< dcss::security::XCertificate >& m_rXCert; + const css::uno::Reference< css::uno::XComponentContext >& m_xContext; + const css::uno::Reference< css::security::XCertificate >& m_rXCert; Window* m_pParent; DECL_LINK(OKHdl_Impl, void *); @@ -57,11 +53,11 @@ private: public: SSLWarnDialog( Window* pParent, - const cssu::Reference< dcss::security::XCertificate >& rXCert, - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::security::XCertificate >& rXCert, + const css::uno::Reference< css::uno::XComponentContext >& xContext, ResMgr * pResMgr ); - cssu::Reference< dcss::security::XCertificate > getCert() { return m_rXCert; }; + css::uno::Reference< css::security::XCertificate > getCert() { return m_rXCert; }; Window* getParent() { return m_pParent; }; diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index a28a4bf7bcca..98e712a07a28 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -60,7 +60,7 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl) UnknownAuthDialog::UnknownAuthDialog ( Window* pParent, - const cssu::Reference< dcss::security::XCertificate >& rXCert, + const css::uno::Reference< css::security::XCertificate >& rXCert, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext, ResMgr* pResMgr ) : diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx index ea982fc52b99..46a08e78ac48 100644 --- a/uui/source/unknownauthdlg.hxx +++ b/uui/source/unknownauthdlg.hxx @@ -28,10 +28,6 @@ #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -namespace cssu = com::sun::star::uno; -namespace dcss = ::com::sun::star; - - using namespace com::sun::star; //===================================================================== @@ -50,8 +46,8 @@ private: FixedText m_aLabel1; FixedImage m_aWarnImage; - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& m_xContext; - const cssu::Reference< dcss::security::XCertificate >& m_rXCert; + const css::uno::Reference< css::uno::XComponentContext >& m_xContext; + const css::uno::Reference< css::security::XCertificate >& m_rXCert; Window* m_pParent; DECL_LINK(OKHdl_Impl, void *); @@ -59,11 +55,11 @@ private: public: UnknownAuthDialog( Window* pParent, - const cssu::Reference< dcss::security::XCertificate >& rXCert, - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::security::XCertificate >& rXCert, + const css::uno::Reference< css::uno::XComponentContext >& xContext, ResMgr * pResMgr ); - cssu::Reference< dcss::security::XCertificate > getCert() { return m_rXCert; }; + css::uno::Reference< css::security::XCertificate > getCert() { return m_rXCert; }; Window* getParent() { return m_pParent; }; diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index 3ce61f2e38da..51544c59a26b 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -37,17 +37,14 @@ namespace xml { namespace crypto { #include <com/sun/star/uno/Sequence.hxx> #include <xmlsecurity/sigstruct.hxx> -namespace cssu = com::sun::star::uno; -namespace dcss = ::com::sun::star; - class HeaderBar; class CertificateChooser : public ModalDialog { private: - cssu::Reference< cssu::XComponentContext > mxCtx; - cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; - cssu::Sequence< cssu::Reference< dcss::security::XCertificate > > maCerts; + css::uno::Reference< css::uno::XComponentContext > mxCtx; + css::uno::Reference< css::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; + css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > maCerts; SignatureInformations maCertsToIgnore; SvxSimpleTable* m_pCertLB; @@ -65,12 +62,12 @@ private: void ImplInitialize(); public: - CertificateChooser( Window* pParent, cssu::Reference< cssu::XComponentContext>& rxCtx, cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const SignatureInformations& rCertsToIgnore ); + CertificateChooser( Window* pParent, css::uno::Reference< css::uno::XComponentContext>& rxCtx, css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const SignatureInformations& rCertsToIgnore ); ~CertificateChooser(); short Execute(); - cssu::Reference< dcss::security::XCertificate > GetSelectedCertificate(); + css::uno::Reference< css::security::XCertificate > GetSelectedCertificate(); }; diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx index e7d50d1d6944..78c6eb2e5f1a 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx @@ -39,9 +39,6 @@ namespace xml { namespace crypto { class XSecurityEnvironment; }} }}} -namespace cssu = com::sun::star::uno; -namespace dcss = ::com::sun::star; - class CertificateViewer : public TabDialog { private: @@ -55,10 +52,10 @@ private: bool mbCheckForPrivateKey; - cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; - cssu::Reference< dcss::security::XCertificate > mxCert; + css::uno::Reference< css::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; + css::uno::Reference< css::security::XCertificate > mxCert; public: - CertificateViewer( Window* pParent, const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const cssu::Reference< dcss::security::XCertificate >& rXCert, bool bCheckForPrivateKey ); + CertificateViewer( Window* pParent, const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const css::uno::Reference< css::security::XCertificate >& rXCert, bool bCheckForPrivateKey ); virtual ~CertificateViewer(); }; @@ -142,7 +139,7 @@ private: DECL_LINK( CertSelectHdl, void* ); void Clear( void ); SvTreeListEntry* InsertCert( SvTreeListEntry* _pParent, const OUString& _rName, - cssu::Reference< dcss::security::XCertificate > rxCert, + css::uno::Reference< css::security::XCertificate > rxCert, bool bValid); public: diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 9f79955bfc23..616e3fa39cef 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -37,9 +37,6 @@ namespace xml { namespace crypto { class XSecurityEnvironment; }} }}} -namespace cssu = com::sun::star::uno; -namespace dcss = ::com::sun::star; - class MacroSecurityTP; class XmlReadOnlyImage : public FixedImage @@ -62,8 +59,8 @@ private: OKButton* m_pOkBtn; PushButton* m_pResetBtn; - cssu::Reference< cssu::XComponentContext > mxCtx; - cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; + css::uno::Reference< css::uno::XComponentContext > mxCtx; + css::uno::Reference< css::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; SvtSecurityOptions maSecOptions; sal_uInt16 m_nSecLevelId; @@ -75,8 +72,8 @@ private: DECL_LINK( OkBtnHdl, void* ); public: MacroSecurity(Window* pParent, - const cssu::Reference< cssu::XComponentContext>& rxCtx, - const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment); + const css::uno::Reference< css::uno::XComponentContext>& rxCtx, + const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment); virtual ~MacroSecurity(); inline void EnableReset(bool _bEnable = true) @@ -133,7 +130,7 @@ private: PushButton* m_pAddLocPB; PushButton* m_pRemoveLocPB; - cssu::Sequence< SvtSecurityOptions::Certificate > maTrustedAuthors; + css::uno::Sequence< SvtSecurityOptions::Certificate > maTrustedAuthors; bool mbAuthorsReadonly; bool mbURLsReadonly; diff --git a/xmlsecurity/inc/xmlsecurity/warnings.hxx b/xmlsecurity/inc/xmlsecurity/warnings.hxx index a3690b25d35a..ec1b0f0ef989 100644 --- a/xmlsecurity/inc/xmlsecurity/warnings.hxx +++ b/xmlsecurity/inc/xmlsecurity/warnings.hxx @@ -37,19 +37,16 @@ namespace xml { namespace crypto { #include <com/sun/star/uno/Sequence.hxx> #include <xmlsecurity/sigstruct.hxx> -namespace cssu = com::sun::star::uno; -namespace dcss = ::com::sun::star; - class HeaderBar; class MacroWarning : public ModalDialog { private: // XSecurityEnvironment is needed for building the certification path - cssu::Reference< dcss::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; + css::uno::Reference< css::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; -// cssu::Sequence< cssu::Reference< dcss::security::XCertificate > > maCerts; - cssu::Reference< dcss::security::XCertificate > mxCert; +// css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > maCerts; + css::uno::Reference< css::security::XCertificate > mxCert; // FixedImage maQuestionMarkFI; FixedInfo maDocNameFI; @@ -71,7 +68,7 @@ private: // DECL_LINK( DisableBtnHdl, void* ); public: - MacroWarning( Window* pParent, cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, cssu::Reference< dcss::security::XCertificate >& _rxCert ); + MacroWarning( Window* pParent, css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, css::uno::Reference< css::security::XCertificate >& _rxCert ); MacroWarning( Window* pParent ); ~MacroWarning(); }; diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index afb6c36818a1..542518917fbc 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -363,7 +363,7 @@ void DocumentDigitalSignatures::manageTrustedSources( ) throw (RuntimeException // Macro Security also has some options where no security environment is needed, so raise dialog anyway. // Later I should change the code so the Dialog creates the SecEnv on demand... - Reference< dcss::xml::crypto::XSecurityEnvironment > xSecEnv; + Reference< css::xml::crypto::XSecurityEnvironment > xSecEnv; XMLSignatureHelper aSignatureHelper( mxCtx ); if ( aSignatureHelper.Init() ) @@ -418,7 +418,7 @@ void DocumentDigitalSignatures::showCertificate( Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseCertificate() throw (RuntimeException) { - Reference< dcss::xml::crypto::XSecurityEnvironment > xSecEnv; + Reference< css::xml::crypto::XSecurityEnvironment > xSecEnv; XMLSignatureHelper aSignatureHelper( mxCtx ); if ( aSignatureHelper.Init() ) @@ -495,7 +495,7 @@ rtl::OUString DocumentDigitalSignatures::GetImplementationName() throw (RuntimeE return rtl::OUString( "com.sun.star.security.DocumentDigitalSignatures" ); } -Sequence< rtl::OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw (cssu::RuntimeException) +Sequence< rtl::OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw (css::uno::RuntimeException) { Sequence < rtl::OUString > aRet(1); rtl::OUString* pArray = aRet.getArray(); diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index be940fb6ae40..f57ab567afce 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -48,7 +48,7 @@ sal_uInt16 CertificateChooser::GetSelectedEntryPos( void ) const return (sal_uInt16) nSel; } -CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::XComponentContext>& _rxCtx, uno::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, const SignatureInformations& _rCertsToIgnore ) +CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::XComponentContext>& _rxCtx, uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, const SignatureInformations& _rCertsToIgnore ) : ModalDialog(_pParent, "SelectCertificateDialog", "xmlsec/ui/selectcertificatedialog.ui") , maCertsToIgnore( _rCertsToIgnore ) { @@ -128,7 +128,7 @@ void CertificateChooser::ImplInitialize() { } - uno::Reference< dcss::security::XSerialNumberAdapter> xSerialNumberAdapter = + uno::Reference< css::security::XSerialNumberAdapter> xSerialNumberAdapter = ::com::sun::star::security::SerialNumberAdapter::create(mxCtx); sal_Int32 nCertificates = maCerts.getLength(); @@ -190,9 +190,9 @@ void CertificateChooser::ImplInitialize() } -uno::Reference< dcss::security::XCertificate > CertificateChooser::GetSelectedCertificate() +uno::Reference< css::security::XCertificate > CertificateChooser::GetSelectedCertificate() { - uno::Reference< dcss::security::XCertificate > xCert; + uno::Reference< css::security::XCertificate > xCert; sal_uInt16 nSelected = GetSelectedEntryPos(); if ( nSelected < maCerts.getLength() ) xCert = maCerts[ nSelected ]; @@ -221,7 +221,7 @@ IMPL_LINK_NOARG(CertificateChooser, ViewButtonHdl) void CertificateChooser::ImplShowCertificateDetails() { - uno::Reference< dcss::security::XCertificate > xCert = GetSelectedCertificate(); + uno::Reference< css::security::XCertificate > xCert = GetSelectedCertificate(); if( xCert.is() ) { CertificateViewer aViewer( this, mxSecurityEnvironment, xCert, sal_True ); diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index dd4d2198ff62..3703542c7cf3 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -49,8 +49,8 @@ namespace CertificateViewer::CertificateViewer( Window* _pParent, - const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, - const cssu::Reference< dcss::security::XCertificate >& _rXCert, bool bCheckForPrivateKey ) + const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, + const css::uno::Reference< css::security::XCertificate >& _rXCert, bool bCheckForPrivateKey ) :TabDialog ( _pParent, XMLSEC_RES( RID_XMLSECDLG_CERTVIEWER ) ) ,maTabCtrl ( this, XMLSEC_RES( 1 ) ) ,maOkBtn ( this, XMLSEC_RES( BTN_OK ) ) @@ -139,7 +139,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, Certif maValidDateFI.SetFont( aFnt ); // insert data - cssu::Reference< dcss::security::XCertificate > xCert = mpDlg->mxCert; + css::uno::Reference< css::security::XCertificate > xCert = mpDlg->mxCert; maIssuedToFI.SetText( XmlSec::GetContentPart( xCert->getSubjectName() ) ); maIssuedByFI.SetText( XmlSec::GetContentPart( xCert->getIssuerName() ) ); @@ -355,11 +355,11 @@ IMPL_LINK_NOARG(CertificateViewerDetailsTP, ElementSelectHdl) struct CertPath_UserData { - cssu::Reference< dcss::security::XCertificate > mxCert; + css::uno::Reference< css::security::XCertificate > mxCert; OUString maStatus; bool mbValid; - CertPath_UserData( cssu::Reference< dcss::security::XCertificate > xCert, bool bValid): + CertPath_UserData( css::uno::Reference< css::security::XCertificate > xCert, bool bValid): mxCert(xCert), mbValid(bValid) { @@ -494,7 +494,7 @@ void CertificateViewerCertPathTP::Clear( void ) } SvTreeListEntry* CertificateViewerCertPathTP::InsertCert( - SvTreeListEntry* _pParent, const OUString& _rName, cssu::Reference< dcss::security::XCertificate > rxCert, + SvTreeListEntry* _pParent, const OUString& _rName, css::uno::Reference< css::security::XCertificate > rxCert, bool bValid) { Image aImage = bValid ? maCertImage : maCertNotValidatedImage; diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 3adc177db5c3..58c5e8b7e2b4 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -279,7 +279,7 @@ void DigitalSignaturesDialog::SetStorage( const com::sun::star::uno::Reference < m_manifest = xReader->readManifestSequence(xStream); } -void DigitalSignaturesDialog::SetSignatureStream( const cssu::Reference < css::io::XStream >& rxStream ) +void DigitalSignaturesDialog::SetSignatureStream( const css::uno::Reference < css::io::XStream >& rxStream ) { mxSignatureStream = rxStream; } @@ -744,7 +744,7 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails() css::uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter = ::com::sun::star::security::SerialNumberAdapter::create(mxCtx); // Use Certificate from doc, not from key store - uno::Reference< dcss::security::XCertificate > xCert; + uno::Reference< css::security::XCertificate > xCert; if (!rInfo.ouX509Certificate.isEmpty()) xCert = xSecEnv->createCertificateFromAscii(rInfo.ouX509Certificate); //fallback if no certificate is embedded, get if from store diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 0063b0fdc739..ab8cd6d5ec02 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -64,8 +64,8 @@ IMPL_LINK_NOARG(MacroSecurity, OkBtnHdl) } MacroSecurity::MacroSecurity( Window* _pParent, - const cssu::Reference< cssu::XComponentContext> &_rxCtx, - const cssu::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment) + const css::uno::Reference< css::uno::XComponentContext> &_rxCtx, + const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment) : TabDialog(_pParent, "MacroSecurityDialog", "xmlsec/ui/macrosecuritydialog.ui") , mxCtx(_rxCtx) , mxSecurityEnvironment(_rxSecurityEnvironment) @@ -194,10 +194,10 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, ViewCertPBHdl) { sal_uInt16 nSelected = sal_uInt16( sal_uIntPtr( m_pTrustCertLB->FirstSelected()->GetUserData() ) ); - uno::Reference< dcss::security::XSerialNumberAdapter > xSerialNumberAdapter = + uno::Reference< css::security::XSerialNumberAdapter > xSerialNumberAdapter = ::com::sun::star::security::SerialNumberAdapter::create(mpDlg->mxCtx); - uno::Reference< dcss::security::XCertificate > xCert = mpDlg->mxSecurityEnvironment->getCertificate( maTrustedAuthors[nSelected][0], xSerialNumberAdapter->toSequence( maTrustedAuthors[nSelected][1] ) ); + uno::Reference< css::security::XCertificate > xCert = mpDlg->mxSecurityEnvironment->getCertificate( maTrustedAuthors[nSelected][0], xSerialNumberAdapter->toSequence( maTrustedAuthors[nSelected][1] ) ); // If we don't get it, create it from signature data: if ( !xCert.is() ) @@ -311,7 +311,7 @@ void MacroSecurityTrustedSourcesTP::FillCertLB( void ) { for( sal_uInt32 nEntry = 0 ; nEntry < nEntries ; ++nEntry ) { - cssu::Sequence< ::rtl::OUString >& rEntry = maTrustedAuthors[ nEntry ]; + css::uno::Sequence< ::rtl::OUString >& rEntry = maTrustedAuthors[ nEntry ]; uno::Reference< css::security::XCertificate > xCert; // create from RawData @@ -384,7 +384,7 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(Window* _pParent, M FillCertLB(); - cssu::Sequence< rtl::OUString > aSecureURLs = mpDlg->maSecOptions.GetSecureURLs(); + css::uno::Sequence< rtl::OUString > aSecureURLs = mpDlg->maSecOptions.GetSecureURLs(); mbURLsReadonly = mpDlg->maSecOptions.IsReadOnly( SvtSecurityOptions::E_SECUREURLS ); m_pTrustFileROFI->Show( mbURLsReadonly ); m_pTrustFileLocLB->Enable( !mbURLsReadonly ); @@ -415,7 +415,7 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void ) sal_uInt16 nEntryCnt = m_pTrustFileLocLB->GetEntryCount(); if( nEntryCnt ) { - cssu::Sequence< rtl::OUString > aSecureURLs( nEntryCnt ); + css::uno::Sequence< rtl::OUString > aSecureURLs( nEntryCnt ); for( sal_uInt16 i = 0 ; i < nEntryCnt ; ++i ) { ::rtl::OUString aURL( m_pTrustFileLocLB->GetEntry( i ) ); @@ -428,7 +428,7 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void ) // Trusted Path could not be removed (#i33584#) // don't forget to remove the old saved SecureURLs else - mpDlg->maSecOptions.SetSecureURLs( cssu::Sequence< rtl::OUString >() ); + mpDlg->maSecOptions.SetSecureURLs( css::uno::Sequence< rtl::OUString >() ); mpDlg->maSecOptions.SetTrustedAuthors( maTrustedAuthors ); } diff --git a/xmlsecurity/source/dialogs/warnings.cxx b/xmlsecurity/source/dialogs/warnings.cxx index 0320910844c3..ac441dc56d25 100644 --- a/xmlsecurity/source/dialogs/warnings.cxx +++ b/xmlsecurity/source/dialogs/warnings.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::security; using namespace ::com::sun::star; -MacroWarning::MacroWarning( Window* _pParent, uno::Reference< dcss::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, cssu::Reference< dcss::security::XCertificate >& _rxCert ) +MacroWarning::MacroWarning( Window* _pParent, uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, css::uno::Reference< css::security::XCertificate >& _rxCert ) :ModalDialog ( _pParent, XMLSEC_RES( RID_XMLSECTP_MACROWARN ) ) ,maDocNameFI ( this, ResId( FI_DOCNAME ) ) ,maDescr1aFI ( this, ResId( FI_DESCR1A ) ) |