diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-30 00:32:52 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-30 00:56:42 +0100 |
commit | 049ce78144650d92eb6bd73292868f73d37c9010 (patch) | |
tree | f2296358bc0f211620c3b0867568b2c51af5f45f /uui | |
parent | remove mammut -> mamut autocorrection from Hungarian (diff) | |
download | core-049ce78144650d92eb6bd73292868f73d37c9010.tar.gz core-049ce78144650d92eb6bd73292868f73d37c9010.zip |
remove local css definitions
follow-up of 66a175834c39ccde9475eac3adb72a843110d01f
Change-Id: I1c495041ccc4db4dd9554d49b6324e989fa46c60
Diffstat (limited to 'uui')
-rw-r--r-- | uui/source/secmacrowarnings.cxx | 6 | ||||
-rw-r--r-- | uui/source/sslwarndlg.cxx | 2 | ||||
-rw-r--r-- | uui/source/sslwarndlg.hxx | 14 | ||||
-rw-r--r-- | uui/source/unknownauthdlg.cxx | 2 | ||||
-rw-r--r-- | uui/source/unknownauthdlg.hxx | 14 |
5 files changed, 15 insertions, 23 deletions
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; }; |