summaryrefslogtreecommitdiff
path: root/xmlsecurity/source/dialogs
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-26 09:49:00 +0200
committerNoel Grandin <noel@peralex.com>2016-03-14 13:28:04 +0200
commit43d57d105d2acf97e79e90f8d640923b91ac64a8 (patch)
tree356fe2074ab6d5fbb9678848dc8a9e3d377c7297 /xmlsecurity/source/dialogs
parentc3605e91a8ecc12b4cd5b5239616541f6d50068a (diff)
com::sun::star->css in xmlsecurity/
Change-Id: I4b89f97671ab526e5731d2f1f99802e23f3fd4b5
Diffstat (limited to 'xmlsecurity/source/dialogs')
-rw-r--r--xmlsecurity/source/dialogs/certificatechooser.cxx2
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx22
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.cxx2
-rw-r--r--xmlsecurity/source/dialogs/resourcemanager.cxx8
-rw-r--r--xmlsecurity/source/dialogs/resourcemanager.hxx8
5 files changed, 21 insertions, 21 deletions
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 99fb5a1f406d..214cdacce59d 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -132,7 +132,7 @@ void CertificateChooser::ImplInitialize()
}
uno::Reference< css::security::XSerialNumberAdapter> xSerialNumberAdapter =
- ::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
+ css::security::SerialNumberAdapter::create(mxCtx);
sal_Int32 nCertificates = maCerts.getLength();
for( sal_Int32 nCert = nCertificates; nCert; )
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 97cd7cd56b99..f4a24b2216ac 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -68,7 +68,7 @@ namespace
virtual void ImplCommit() override;
public:
- virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
SaveODFItem();
//See group ODF in Common.xcs
bool isLessODF1_2()
@@ -78,7 +78,7 @@ namespace
};
void SaveODFItem::ImplCommit() {}
-void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
+void SaveODFItem::Notify( const css::uno::Sequence< OUString >& ) {}
SaveODFItem::SaveODFItem(): utl::ConfigItem(OUString(
"Office.Common/Save")), m_nODF(0)
@@ -214,7 +214,7 @@ bool DigitalSignaturesDialog::Init()
return bInit;
}
-void DigitalSignaturesDialog::SetStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStore )
+void DigitalSignaturesDialog::SetStorage( const css::uno::Reference < css::embed::XStorage >& rxStore )
{
maSignatureManager.mxStore = rxStore;
maSignatureManager.maSignatureHelper.SetStorage( maSignatureManager.mxStore, m_sODFVersion);
@@ -350,7 +350,7 @@ IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, AddButtonHdl, Button*, void)
return;
try
{
- uno::Reference<com::sun::star::xml::crypto::XSecurityEnvironment> xSecEnv = maSignatureManager.maSignatureHelper.GetSecurityEnvironment();
+ uno::Reference<css::xml::crypto::XSecurityEnvironment> xSecEnv = maSignatureManager.maSignatureHelper.GetSecurityEnvironment();
ScopedVclPtrInstance< CertificateChooser > aChooser( this, mxCtx, xSecEnv );
if ( aChooser->Execute() == RET_OK )
@@ -362,7 +362,7 @@ IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, AddButtonHdl, Button*, void)
sal_Int32 nStatus = maSignatureManager.maSignatureHelper.GetSignatureInformation( nSecurityId ).nStatus;
- if ( nStatus == ::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED )
+ if ( nStatus == css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED )
{
mbSignaturesChanged = true;
@@ -419,11 +419,11 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
{
m_pSignaturesLB->Clear();
- uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecEnv = maSignatureManager.maSignatureHelper.GetSecurityEnvironment();
- uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter =
- ::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
+ uno::Reference< css::xml::crypto::XSecurityEnvironment > xSecEnv = maSignatureManager.maSignatureHelper.GetSecurityEnvironment();
+ uno::Reference<css::security::XSerialNumberAdapter> xSerialNumberAdapter =
+ css::security::SerialNumberAdapter::create(mxCtx);
- uno::Reference< ::com::sun::star::security::XCertificate > xCert;
+ uno::Reference< css::security::XCertificate > xCert;
size_t nInfos = maSignatureManager.maCurrentSignatureInformations.size();
size_t nValidSigs = 0, nValidCerts = 0;
@@ -489,7 +489,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
aDateTimeStr = XmlSec::GetDateTimeString( rInfo.stDateTime );
aDescription = rInfo.ouDescription;
}
- bSigValid = ( rInfo.nStatus == ::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED );
+ bSigValid = ( rInfo.nStatus == css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED );
if ( bSigValid )
{
@@ -581,7 +581,7 @@ void DigitalSignaturesDialog::ImplShowSignaturesDetails()
css::uno::Reference<css::xml::crypto::XSecurityEnvironment > xSecEnv =
maSignatureManager.maSignatureHelper.GetSecurityEnvironment();
css::uno::Reference<com::sun::star::security::XSerialNumberAdapter> xSerialNumberAdapter =
- ::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
+ css::security::SerialNumberAdapter::create(mxCtx);
// Use Certificate from doc, not from key store
uno::Reference< css::security::XCertificate > xCert;
if (!rInfo.ouX509Certificate.isEmpty())
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 10b911559f34..0eaefdf75c22 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -222,7 +222,7 @@ IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, ViewCertPBHdl, Button*, voi
sal_uInt16 nSelected = sal_uInt16( sal_uIntPtr( m_pTrustCertLB->FirstSelected()->GetUserData() ) );
uno::Reference< css::security::XSerialNumberAdapter > xSerialNumberAdapter =
- ::com::sun::star::security::SerialNumberAdapter::create(mpDlg->mxCtx);
+ css::security::SerialNumberAdapter::create(mpDlg->mxCtx);
uno::Reference< css::security::XCertificate > xCert = mpDlg->mxSecurityEnvironment->getCertificate( maTrustedAuthors[nSelected][0], xSerialNumberAdapter->toSequence( maTrustedAuthors[nSelected][1] ) );
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index bf3979b81981..28d0ba2b7b58 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -50,12 +50,12 @@ namespace XmlSec
return pSysLocale->GetLocaleData();
}
- DateTime GetDateTime( const ::com::sun::star::util::DateTime& _rDT )
+ DateTime GetDateTime( const css::util::DateTime& _rDT )
{
return DateTime(_rDT);
}
- OUString GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT )
+ OUString GetDateTimeString( const css::util::DateTime& _rDT )
{
// String with date and time information (#i20172#)
DateTime aDT( GetDateTime( _rDT ) );
@@ -64,7 +64,7 @@ namespace XmlSec
return rLoDa.getDate( aDT ) + " " + rLoDa.getTime( aDT );
}
- OUString GetDateString( const ::com::sun::star::util::DateTime& _rDT )
+ OUString GetDateString( const css::util::DateTime& _rDT )
{
return GetLocaleData().getDate( GetDateTime( _rDT ) );
}
@@ -311,7 +311,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
return retVal;
}
- OUString GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep, sal_uInt16 _nLineBreak )
+ OUString GetHexString( const css::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep, sal_uInt16 _nLineBreak )
{
const sal_Int8* pSerNumSeq = _rSeq.getConstArray();
int nCnt = _rSeq.getLength();
diff --git a/xmlsecurity/source/dialogs/resourcemanager.hxx b/xmlsecurity/source/dialogs/resourcemanager.hxx
index 992e33909e74..cd31f358d885 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.hxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.hxx
@@ -37,9 +37,9 @@ namespace XmlSec
ResMgr* GetResMgr();
const LocaleDataWrapper& GetLocaleData();
- DateTime GetDateTime( const ::com::sun::star::util::DateTime& _rDT );
- OUString GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT );
- OUString GetDateString( const ::com::sun::star::util::DateTime& _rDT );
+ DateTime GetDateTime( const css::util::DateTime& _rDT );
+ OUString GetDateTimeString( const css::util::DateTime& _rDT );
+ OUString GetDateString( const css::util::DateTime& _rDT );
std::vector< std::pair< OUString, OUString> >
parseDN(const OUString& rRawString);
@@ -47,7 +47,7 @@ namespace XmlSec
const OUString & rRawString);
OUString GetContentPart( const OUString& _rRawString );
- OUString GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep = ":", sal_uInt16 _nLineBreak = 0xFFFF );
+ OUString GetHexString( const css::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep = ":", sal_uInt16 _nLineBreak = 0xFFFF );
}
#define XMLSEC_RES(id) ResId(id,*XmlSec::GetResMgr())