summaryrefslogtreecommitdiff
path: root/xmlsecurity/tools/standalone
diff options
context:
space:
mode:
Diffstat (limited to 'xmlsecurity/tools/standalone')
-rw-r--r--xmlsecurity/tools/standalone/csfit/certmngr.cxx4
-rw-r--r--xmlsecurity/tools/standalone/csfit/decrypter.cxx12
-rw-r--r--xmlsecurity/tools/standalone/csfit/encrypter.cxx14
-rw-r--r--xmlsecurity/tools/standalone/csfit/helper.cxx18
-rw-r--r--xmlsecurity/tools/standalone/csfit/signer.cxx12
-rw-r--r--xmlsecurity/tools/standalone/csfit/verifier.cxx12
-rw-r--r--xmlsecurity/tools/standalone/mscsfit/certmngr.cxx4
-rw-r--r--xmlsecurity/tools/standalone/mscsfit/decrypter.cxx12
-rw-r--r--xmlsecurity/tools/standalone/mscsfit/encrypter.cxx14
-rw-r--r--xmlsecurity/tools/standalone/mscsfit/helper.cxx18
-rw-r--r--xmlsecurity/tools/standalone/mscsfit/signer.cxx12
-rw-r--r--xmlsecurity/tools/standalone/mscsfit/verifier.cxx12
12 files changed, 72 insertions, 72 deletions
diff --git a/xmlsecurity/tools/standalone/csfit/certmngr.cxx b/xmlsecurity/tools/standalone/csfit/certmngr.cxx
index 82d8d5b9e4e2..fee45be658e3 100644
--- a/xmlsecurity/tools/standalone/csfit/certmngr.cxx
+++ b/xmlsecurity/tools/standalone/csfit/certmngr.cxx
@@ -104,7 +104,7 @@ int SAL_CALL main( int argc, char **argv )
Reference< XMultiComponentFactory > xManager = NULL ;
Reference< XComponentContext > xContext = NULL ;
- xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[2] ) ) ;
+ xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[2] ) ) ;
OSL_ENSURE( xManager.is() ,
"ServicesManager - "
"Cannot get service manager" ) ;
@@ -112,7 +112,7 @@ int SAL_CALL main( int argc, char **argv )
//Create security environment
//Build Security Environment
Reference< XInterface > xsecenv =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
OSL_ENSURE( xsecenv.is() ,
"Signer - "
"Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/decrypter.cxx b/xmlsecurity/tools/standalone/csfit/decrypter.cxx
index a39352c629ce..a8019720ab55 100644
--- a/xmlsecurity/tools/standalone/csfit/decrypter.cxx
+++ b/xmlsecurity/tools/standalone/csfit/decrypter.cxx
@@ -134,11 +134,11 @@ int SAL_CALL main( int argc, char **argv )
Reference< XMultiComponentFactory > xManager = NULL ;
Reference< XComponentContext > xContext = NULL ;
- xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[4] ) ) ;
+ xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[4] ) ) ;
//Create encryption template
Reference< XInterface > tplElement =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
OSL_ENSURE( tplElement.is() ,
"Decryptor - "
"Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -162,7 +162,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Encryption template
Reference< XInterface > enctpl =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryptionTemplate")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.crypto.XMLEncryptionTemplate"), xContext ) ;
OSL_ENSURE( enctpl.is() ,
"Decryptor - "
"Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ;
@@ -178,7 +178,7 @@ int SAL_CALL main( int argc, char **argv )
//Create security environment
//Build Security Environment
Reference< XInterface > xsecenv =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
OSL_ENSURE( xsecenv.is() ,
"Decryptor - "
"Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -205,7 +205,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Security Context
Reference< XInterface > xmlsecctx =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ;
OSL_ENSURE( xmlsecctx.is() ,
"Decryptor - "
"Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -220,7 +220,7 @@ int SAL_CALL main( int argc, char **argv )
//Get encrypter
Reference< XInterface > xmlencrypter =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl"), xContext ) ;
OSL_ENSURE( xmlencrypter.is() ,
"Decryptor - "
"Cannot get service instance of \"xsec.XMLEncryption\"" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/encrypter.cxx b/xmlsecurity/tools/standalone/csfit/encrypter.cxx
index bcf9c275eaaf..31c5b90a3e76 100644
--- a/xmlsecurity/tools/standalone/csfit/encrypter.cxx
+++ b/xmlsecurity/tools/standalone/csfit/encrypter.cxx
@@ -142,11 +142,11 @@ int SAL_CALL main( int argc, char **argv )
Reference< XMultiComponentFactory > xManager = NULL ;
Reference< XComponentContext > xContext = NULL ;
- xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[6] ) ) ;
+ xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[6] ) ) ;
//Create encryption template
Reference< XInterface > tplElement =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
OSL_ENSURE( tplElement.is() ,
"Encryptor - "
"Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -170,7 +170,7 @@ int SAL_CALL main( int argc, char **argv )
//Create encryption target element
Reference< XInterface > tarElement =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
OSL_ENSURE( tarElement.is() ,
"Encryptor - "
"Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -195,7 +195,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Encryption template
Reference< XInterface > enctpl =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryptionTemplate")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.crypto.XMLEncryptionTemplate"), xContext ) ;
OSL_ENSURE( enctpl.is() ,
"Encryptor - "
"Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ;
@@ -212,7 +212,7 @@ int SAL_CALL main( int argc, char **argv )
//Create security environment
//Build Security Environment
Reference< XInterface > xsecenv =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
OSL_ENSURE( xsecenv.is() ,
"Encryptor - "
"Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -240,7 +240,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Security Context
Reference< XInterface > xmlsecctx =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ;
OSL_ENSURE( xmlsecctx.is() ,
"Encryptor - "
"Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -254,7 +254,7 @@ int SAL_CALL main( int argc, char **argv )
//Get encrypter
Reference< XInterface > xmlencrypter =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl"), xContext ) ;
OSL_ENSURE( xmlencrypter.is() ,
"Encryptor - "
"Cannot get service instance of \"xsec.XMLEncryption\"" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/helper.cxx b/xmlsecurity/tools/standalone/csfit/helper.cxx
index ed06f3973d20..777ffa33216b 100644
--- a/xmlsecurity/tools/standalone/csfit/helper.cxx
+++ b/xmlsecurity/tools/standalone/csfit/helper.cxx
@@ -106,7 +106,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
"serviceManager - "
"Cannot create simple registry" ) ;
- //xSimpleRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("xmlsecurity.rdb")), sal_False, sal_False);
+ //xSimpleRegistry->open(OUString("xmlsecurity.rdb"), sal_False, sal_False);
xSimpleRegistry->open(sRdbUrl, sal_True, sal_False);
OSL_ENSURE( xSimpleRegistry->isValid() ,
"serviceManager - "
@@ -135,10 +135,10 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
"Cannot get multi-service factory" ) ;
Sequence< Any > args( 2 ) ;
- args[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL )) ;
- args[ 1 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE )) ;
+ args[ 0 ] <<= OUString( UCB_CONFIGURATION_KEY1_LOCAL ) ;
+ args[ 1 ] <<= OUString( UCB_CONFIGURATION_KEY2_OFFICE ) ;
if( ! ::ucb::ContentBroker::initialize( xSvmg , args ) ) {
- throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot inlitialize ContentBroker")) , Reference< XInterface >() , Any() ) ;
+ throw RuntimeException( OUString("Cannot inlitialize ContentBroker") , Reference< XInterface >() , Any() ) ;
}
}
********************************************************************/
@@ -157,7 +157,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
"Cannot create intial service manager" ) ;
Reference< XInterface > urlResolver =
- xLocalServiceManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")) , xLocalComponentContext ) ;
+ xLocalServiceManager->createInstanceWithContext( OUString("com.sun.star.bridge.UnoUrlResolver") , xLocalComponentContext ) ;
OSL_ENSURE( urlResolver.is() ,
"serviceManager - "
"Cannot get service instance of \"bridge.UnoUrlResolver\"" ) ;
@@ -181,7 +181,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
"Cannot get interface of \"XNamingService\" from URL resolver" ) ;
Reference< XInterface > serviceManager =
- xNamingService->getRegisteredObject( OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager")) ) ;
+ xNamingService->getRegisteredObject( OUString("StarOffice.ServiceManager") ) ;
OSL_ENSURE( serviceManager.is() ,
"serviceManager - "
"Cannot get service instance of \"StarOffice.ServiceManager\"" ) ;
@@ -196,7 +196,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
"serviceManager - "
"Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ;
- xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
+ xPropSet->getPropertyValue( OUString("DefaultContext") ) >>= xUsedComponentContext ;
OSL_ENSURE( xUsedComponentContext.is() ,
"serviceManager - "
"Cannot create remote component context" ) ;
@@ -211,7 +211,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
"serviceManager - "
"Cannot get interface of \"XPropertySet\" from URL resolver" ) ;
- xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
+ xPropSet->getPropertyValue( OUString("DefaultContext") ) >>= xUsedComponentContext ;
OSL_ENSURE( xUsedComponentContext.is() ,
"serviceManager - "
"Cannot create remote component context" ) ;
@@ -235,7 +235,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
"serviceManager - "
"Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ;
- xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
+ xPropSet->getPropertyValue( OUString("DefaultContext") ) >>= xUsedComponentContext ;
OSL_ENSURE( xUsedComponentContext.is() ,
"serviceManager - "
"Cannot create remote component context" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/signer.cxx b/xmlsecurity/tools/standalone/csfit/signer.cxx
index 96cf72d2ae71..6b667f815820 100644
--- a/xmlsecurity/tools/standalone/csfit/signer.cxx
+++ b/xmlsecurity/tools/standalone/csfit/signer.cxx
@@ -219,14 +219,14 @@ int SAL_CALL main( int argc, char **argv )
Reference< XMultiComponentFactory > xManager = NULL ;
Reference< XComponentContext > xContext = NULL ;
- xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[4] ) ) ;
+ xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[4] ) ) ;
OSL_ENSURE( xManager.is() ,
"ServicesManager - "
"Cannot get service manager" ) ;
//Create signature template
Reference< XInterface > element =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
OSL_ENSURE( element.is() ,
"Signer - "
"Cannot get service instance of \"wrapper.XMLElementWrapper\"" ) ;
@@ -251,7 +251,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Signature template
Reference< XInterface > signtpl =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")) , xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.crypto.XMLSignatureTemplate") , xContext ) ;
OSL_ENSURE( signtpl.is() ,
"Signer - "
"Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ;
@@ -271,7 +271,7 @@ int SAL_CALL main( int argc, char **argv )
//Create security environment
//Build Security Environment
Reference< XInterface > xsecenv =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
OSL_ENSURE( xsecenv.is() ,
"Signer - "
"Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -297,7 +297,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Security Context
Reference< XInterface > xmlsecctx =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ;
OSL_ENSURE( xsecenv.is() ,
"Signer - "
"Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -311,7 +311,7 @@ int SAL_CALL main( int argc, char **argv )
//Generate XML signature
Reference< XInterface > xmlsigner =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl"), xContext ) ;
OSL_ENSURE( xmlsigner.is() ,
"Signer - "
"Cannot get service instance of \"xsec.XMLSignature\"" ) ;
diff --git a/xmlsecurity/tools/standalone/csfit/verifier.cxx b/xmlsecurity/tools/standalone/csfit/verifier.cxx
index a624f793eefd..b2acd1b373ee 100644
--- a/xmlsecurity/tools/standalone/csfit/verifier.cxx
+++ b/xmlsecurity/tools/standalone/csfit/verifier.cxx
@@ -206,11 +206,11 @@ int SAL_CALL main( int argc, char **argv )
Reference< XMultiComponentFactory > xManager = NULL ;
Reference< XComponentContext > xContext = NULL ;
- xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[3] ) ) ;
+ xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[3] ) ) ;
//Create signature template
Reference< XInterface > element =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
OSL_ENSURE( element.is() ,
"Verifier - "
"Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -235,7 +235,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Signature template
Reference< XInterface > signtpl =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.crypto.XMLSignatureTemplate"), xContext ) ;
OSL_ENSURE( signtpl.is() ,
"Verifier - "
"Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ;
@@ -255,7 +255,7 @@ int SAL_CALL main( int argc, char **argv )
//Create security environment
//Build Security Environment
Reference< XInterface > xsecenv =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
OSL_ENSURE( xsecenv.is() ,
"Verifier - "
"Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -281,7 +281,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Security Context
Reference< XInterface > xmlsecctx =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ;
OSL_ENSURE( xsecenv.is() ,
"Verifier - "
"Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -295,7 +295,7 @@ int SAL_CALL main( int argc, char **argv )
//Generate XML signature
Reference< XInterface > xmlsigner =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl"), xContext ) ;
OSL_ENSURE( xmlsigner.is() ,
"Verifier - "
"Cannot get service instance of \"xsec.XMLSignature\"" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx b/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
index 04ddd9860f7f..bac39988cf4d 100644
--- a/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx
@@ -61,7 +61,7 @@ int SAL_CALL main( int argc, char **argv )
Reference< XMultiComponentFactory > xManager = NULL ;
Reference< XComponentContext > xContext = NULL ;
- xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[1] ) ) ;
+ xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[1] ) ) ;
OSL_ENSURE( xManager.is() ,
"ServicesManager - "
"Cannot get service manager" ) ;
@@ -69,7 +69,7 @@ int SAL_CALL main( int argc, char **argv )
//Create security environment
//Build Security Environment
Reference< XInterface > xsecenv =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ;
OSL_ENSURE( xsecenv.is() ,
"Signer - "
"Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx b/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx
index 259d9cef89fa..0006ebc5946c 100644
--- a/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx
@@ -108,11 +108,11 @@ int SAL_CALL main( int argc, char **argv )
Reference< XMultiComponentFactory > xManager = NULL ;
Reference< XComponentContext > xContext = NULL ;
- xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[4] ) ) ;
+ xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[4] ) ) ;
//Create encryption template
Reference< XInterface > tplElement =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLElementWrapper")) , xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.xsec.XMLElementWrapper") , xContext ) ;
OSL_ENSURE( tplElement.is() ,
"Decryptor - "
"Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -136,7 +136,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Encryption template
Reference< XInterface > enctpl =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLEncryptionTemplate")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.xsec.XMLEncryptionTemplate"), xContext ) ;
OSL_ENSURE( enctpl.is() ,
"Decryptor - "
"Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ;
@@ -152,7 +152,7 @@ int SAL_CALL main( int argc, char **argv )
//Create security environment
//Build Security Environment
Reference< XInterface > xsecenv =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.SecurityEnvironment")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.xsec.SecurityEnvironment"), xContext ) ;
OSL_ENSURE( xsecenv.is() ,
"Decryptor - "
"Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -179,7 +179,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Security Context
Reference< XInterface > xmlsecctx =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLSecurityContext")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.xsec.XMLSecurityContext"), xContext ) ;
OSL_ENSURE( xmlsecctx.is() ,
"Decryptor - "
"Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -194,7 +194,7 @@ int SAL_CALL main( int argc, char **argv )
//Get encrypter
Reference< XInterface > xmlencrypter =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLEncryption")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.xsec.XMLEncryption"), xContext ) ;
OSL_ENSURE( xmlencrypter.is() ,
"Decryptor - "
"Cannot get service instance of \"xsec.XMLEncryption\"" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx b/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx
index 1645163a1894..0f5ace73527d 100644
--- a/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx
@@ -123,11 +123,11 @@ int SAL_CALL main( int argc, char **argv )
Reference< XMultiComponentFactory > xManager = NULL ;
Reference< XComponentContext > xContext = NULL ;
- xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[5] ) ) ;
+ xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[5] ) ) ;
//Create encryption template
Reference< XInterface > tplElement =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
OSL_ENSURE( tplElement.is() ,
"Encryptor - "
"Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -151,7 +151,7 @@ int SAL_CALL main( int argc, char **argv )
//Create encryption target element
Reference< XInterface > tarElement =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
OSL_ENSURE( tarElement.is() ,
"Encryptor - "
"Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -176,7 +176,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Encryption template
Reference< XInterface > enctpl =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryptionTemplate")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.crypto.XMLEncryptionTemplate"), xContext ) ;
OSL_ENSURE( enctpl.is() ,
"Encryptor - "
"Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ;
@@ -193,7 +193,7 @@ int SAL_CALL main( int argc, char **argv )
//Create security environment
//Build Security Environment
Reference< XInterface > xsecenv =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ;
OSL_ENSURE( xsecenv.is() ,
"Encryptor - "
"Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -227,7 +227,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Security Context
Reference< XInterface > xmlsecctx =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl"), xContext ) ;
OSL_ENSURE( xmlsecctx.is() ,
"Encryptor - "
"Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -241,7 +241,7 @@ int SAL_CALL main( int argc, char **argv )
//Get encrypter
Reference< XInterface > xmlencrypter =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl"), xContext ) ;
OSL_ENSURE( xmlencrypter.is() ,
"Encryptor - "
"Cannot get service instance of \"xsec.XMLEncryption\"" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/helper.cxx b/xmlsecurity/tools/standalone/mscsfit/helper.cxx
index 924270b910b2..ee6844fbe99b 100644
--- a/xmlsecurity/tools/standalone/mscsfit/helper.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/helper.cxx
@@ -76,7 +76,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
"serviceManager - "
"Cannot create simple registry" ) ;
- //xSimpleRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("xmlsecurity.rdb")), sal_False, sal_False);
+ //xSimpleRegistry->open(OUString("xmlsecurity.rdb"), sal_False, sal_False);
xSimpleRegistry->open(sRdbUrl, sal_True, sal_False);
OSL_ENSURE( xSimpleRegistry->isValid() ,
"serviceManager - "
@@ -105,10 +105,10 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
"Cannot get multi-service factory" ) ;
Sequence< Any > args( 2 ) ;
- args[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL )) ;
- args[ 1 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE )) ;
+ args[ 0 ] <<= OUString( UCB_CONFIGURATION_KEY1_LOCAL ) ;
+ args[ 1 ] <<= OUString( UCB_CONFIGURATION_KEY2_OFFICE ) ;
if( ! ::ucb::ContentBroker::initialize( xSvmg , args ) ) {
- throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot inlitialize ContentBroker")) , Reference< XInterface >() , Any() ) ;
+ throw RuntimeException( OUString("Cannot inlitialize ContentBroker") , Reference< XInterface >() , Any() ) ;
}
}
********************************************************************/
@@ -128,7 +128,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
"Cannot create intial service manager" ) ;
Reference< XInterface > urlResolver =
- xLocalServiceManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")) , xLocalComponentContext ) ;
+ xLocalServiceManager->createInstanceWithContext( OUString("com.sun.star.bridge.UnoUrlResolver") , xLocalComponentContext ) ;
OSL_ENSURE( urlResolver.is() ,
"serviceManager - "
"Cannot get service instance of \"bridge.UnoUrlResolver\"" ) ;
@@ -152,7 +152,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
"Cannot get interface of \"XNamingService\" from URL resolver" ) ;
Reference< XInterface > serviceManager =
- xNamingService->getRegisteredObject( OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager")) ) ;
+ xNamingService->getRegisteredObject( OUString("StarOffice.ServiceManager") ) ;
OSL_ENSURE( serviceManager.is() ,
"serviceManager - "
"Cannot get service instance of \"StarOffice.ServiceManager\"" ) ;
@@ -167,7 +167,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
"serviceManager - "
"Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ;
- xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
+ xPropSet->getPropertyValue( OUString("DefaultContext") ) >>= xUsedComponentContext ;
OSL_ENSURE( xUsedComponentContext.is() ,
"serviceManager - "
"Cannot create remote component context" ) ;
@@ -182,7 +182,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
"serviceManager - "
"Cannot get interface of \"XPropertySet\" from URL resolver" ) ;
- xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
+ xPropSet->getPropertyValue( OUString("DefaultContext") ) >>= xUsedComponentContext ;
OSL_ENSURE( xUsedComponentContext.is() ,
"serviceManager - "
"Cannot create remote component context" ) ;
@@ -206,7 +206,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext
"serviceManager - "
"Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ;
- xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ;
+ xPropSet->getPropertyValue( OUString("DefaultContext") ) >>= xUsedComponentContext ;
OSL_ENSURE( xUsedComponentContext.is() ,
"serviceManager - "
"Cannot create remote component context" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/signer.cxx b/xmlsecurity/tools/standalone/mscsfit/signer.cxx
index 9e96e4fc40ec..fc71756558cb 100644
--- a/xmlsecurity/tools/standalone/mscsfit/signer.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/signer.cxx
@@ -176,14 +176,14 @@ int SAL_CALL main( int argc, char **argv )
Reference< XMultiComponentFactory > xManager = NULL ;
Reference< XComponentContext > xContext = NULL ;
- xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[3] ) ) ;
+ xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[3] ) ) ;
OSL_ENSURE( xManager.is() ,
"ServicesManager - "
"Cannot get service manager" ) ;
//Create signature template
Reference< XInterface > element =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
OSL_ENSURE( element.is() ,
"Signer - "
"Cannot get service instance of \"wrapper.XMLElementWrapper\"" ) ;
@@ -208,7 +208,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Signature template
Reference< XInterface > signtpl =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")) , xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.crypto.XMLSignatureTemplate") , xContext ) ;
OSL_ENSURE( signtpl.is() ,
"Signer - "
"Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ;
@@ -228,7 +228,7 @@ int SAL_CALL main( int argc, char **argv )
//Create security environment
//Build Security Environment
Reference< XInterface > xsecenv =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ;
OSL_ENSURE( xsecenv.is() ,
"Signer - "
"Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -259,7 +259,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Security Context
Reference< XInterface > xmlsecctx =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl"), xContext ) ;
OSL_ENSURE( xsecenv.is() ,
"Signer - "
"Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -273,7 +273,7 @@ int SAL_CALL main( int argc, char **argv )
//Generate XML signature
Reference< XInterface > xmlsigner =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl"), xContext ) ;
OSL_ENSURE( xmlsigner.is() ,
"Signer - "
"Cannot get service instance of \"xsec.XMLSignature\"" ) ;
diff --git a/xmlsecurity/tools/standalone/mscsfit/verifier.cxx b/xmlsecurity/tools/standalone/mscsfit/verifier.cxx
index 2278d10db4ef..9b44fa69627d 100644
--- a/xmlsecurity/tools/standalone/mscsfit/verifier.cxx
+++ b/xmlsecurity/tools/standalone/mscsfit/verifier.cxx
@@ -178,11 +178,11 @@ int SAL_CALL main( int argc, char **argv )
Reference< XMultiComponentFactory > xManager = NULL ;
Reference< XComponentContext > xContext = NULL ;
- xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[2] ) ) ;
+ xManager = serviceManager( xContext , OUString("local"), OUString::createFromAscii( argv[2] ) ) ;
//Create signature template
Reference< XInterface > element =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl") , xContext ) ;
OSL_ENSURE( element.is() ,
"Verifier - "
"Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
@@ -207,7 +207,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Signature template
Reference< XInterface > signtpl =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.crypto.XMLSignatureTemplate"), xContext ) ;
OSL_ENSURE( signtpl.is() ,
"Verifier - "
"Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ;
@@ -227,7 +227,7 @@ int SAL_CALL main( int argc, char **argv )
//Create security environment
//Build Security Environment
Reference< XInterface > xsecenv =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ;
OSL_ENSURE( xsecenv.is() ,
"Verifier - "
"Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
@@ -258,7 +258,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Security Context
Reference< XInterface > xmlsecctx =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl"), xContext ) ;
OSL_ENSURE( xsecenv.is() ,
"Verifier - "
"Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
@@ -272,7 +272,7 @@ int SAL_CALL main( int argc, char **argv )
//Generate XML signature
Reference< XInterface > xmlsigner =
- xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl")), xContext ) ;
+ xManager->createInstanceWithContext( OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl"), xContext ) ;
OSL_ENSURE( xmlsigner.is() ,
"Verifier - "
"Cannot get service instance of \"xsec.XMLSignature\"" ) ;
generated by cgit (git 2.34.1) at 2025-05-02 10:52:26 +0000