remove local css definitions

follow-up of 66a175834c39ccde9475eac3adb72a843110d01f

Change-Id: I1c495041ccc4db4dd9554d49b6324e989fa46c60

4 files changed, 18 insertions, 30 deletions

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();
 };