[Libreoffice-commits] .: 3 commits - cui/source extensions/source forms/source toolkit/source ucbhelper/source UnoControls/source xmlsecurity/source xmlsecurity/tools xmlsecurity/workben
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Tue May 29 17:30:32 PDT 2012
UnoControls/source/controls/framecontrol.cxx | 2
UnoControls/source/controls/progressmonitor.cxx | 2
UnoControls/source/controls/statusindicator.cxx | 2
cui/source/options/optlingu.cxx | 4
extensions/source/dbpilots/commonpagesdbp.cxx | 12 -
extensions/source/dbpilots/controlwizard.cxx | 30 +-
extensions/source/dbpilots/gridwizard.cxx | 24 +-
extensions/source/dbpilots/listcombowizard.cxx | 10
extensions/source/dbpilots/optiongrouplayouter.cxx | 24 +-
extensions/source/dbpilots/wizardservices.cxx | 12 -
extensions/source/plugin/base/context.cxx | 16 -
extensions/source/plugin/base/manager.cxx | 6
extensions/source/plugin/base/plmodel.cxx | 4
extensions/source/plugin/base/xplugin.cxx | 16 -
extensions/source/plugin/win/winmgr.cxx | 4
extensions/source/propctrlr/MasterDetailLinkDialog.cxx | 4
extensions/source/propctrlr/controlfontdialog.cxx | 4
extensions/source/propctrlr/defaultforminspection.cxx | 4
extensions/source/propctrlr/defaulthelpprovider.cxx | 4
extensions/source/propctrlr/eventhandler.cxx | 16 -
extensions/source/propctrlr/formcomponenthandler.cxx | 24 +-
extensions/source/propctrlr/formcontroller.cxx | 10
extensions/source/propctrlr/pcrunodialogs.cxx | 4
extensions/source/propctrlr/propcontroller.cxx | 12 -
extensions/source/scanner/scanunx.cxx | 14 -
extensions/source/update/check/updatecheckconfig.cxx | 4
extensions/source/update/ui/updatecheckui.cxx | 6
forms/source/component/RadioButton.cxx | 2
toolkit/source/controls/dialogcontrol.cxx | 26 +-
ucbhelper/source/client/content.cxx | 84 ++++----
ucbhelper/source/client/contentbroker.cxx | 12 -
ucbhelper/source/client/proxydecider.cxx | 14 -
ucbhelper/source/provider/propertyvalueset.cxx | 4
ucbhelper/source/provider/providerhelper.cxx | 4
ucbhelper/source/provider/resultsethelper.cxx | 12 -
ucbhelper/source/provider/resultsetmetadata.cxx | 4
xmlsecurity/source/component/certificatecontainer.cxx | 4
xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx | 4
xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx | 4
xmlsecurity/source/helper/documentsignaturehelper.cxx | 32 +--
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 18 -
xmlsecurity/source/helper/xsecctl.cxx | 101 ++++------
xmlsecurity/source/helper/xsecsign.cxx | 6
xmlsecurity/source/helper/xsecverify.cxx | 2
xmlsecurity/source/xmlsec/certvalidity.cxx | 36 +--
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 6
xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx | 4
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 4
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 4
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 6
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 4
xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 4
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 4
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 6
xmlsecurity/tools/standalone/csfit/certmngr.cxx | 4
xmlsecurity/tools/standalone/csfit/decrypter.cxx | 12 -
xmlsecurity/tools/standalone/csfit/encrypter.cxx | 14 -
xmlsecurity/tools/standalone/csfit/helper.cxx | 18 -
xmlsecurity/tools/standalone/csfit/signer.cxx | 12 -
xmlsecurity/tools/standalone/csfit/verifier.cxx | 12 -
xmlsecurity/tools/standalone/mscsfit/certmngr.cxx | 4
xmlsecurity/tools/standalone/mscsfit/decrypter.cxx | 12 -
xmlsecurity/tools/standalone/mscsfit/encrypter.cxx | 14 -
xmlsecurity/tools/standalone/mscsfit/helper.cxx | 18 -
xmlsecurity/tools/standalone/mscsfit/signer.cxx | 12 -
xmlsecurity/tools/standalone/mscsfit/verifier.cxx | 12 -
xmlsecurity/workben/signaturetest.cxx | 4
67 files changed, 415 insertions(+), 418 deletions(-)
New commits:
commit 212d2341609e2aa2fc362dc2c6980020b7360ae7
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue May 29 19:25:51 2012 -0500
targeted string re-work
Change-Id: I47c5edfd9448b1cb122550566cc9083c070f40d0
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index c4e5d8d..f3e8dfd 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -224,9 +224,9 @@ static void ensureContentProviderForURL( const ContentBroker & rBroker,
if ( !xMgr.is() )
{
throw RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ rtl::OUString(
"UCB does not implement mandatory interface "
- "XContentProviderManager!" )),
+ "XContentProviderManager!" ),
Reference< XInterface >() );
}
else
@@ -236,8 +236,8 @@ static void ensureContentProviderForURL( const ContentBroker & rBroker,
if ( !xProv.is() )
{
throw ContentCreationException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "No Content Provider available for URL: ")) + rURL,
+ rtl::OUString(
+ "No Content Provider available for URL: ") + rURL,
Reference< XInterface >(),
ContentCreationError_NO_CONTENT_PROVIDER );
}
@@ -254,7 +254,7 @@ static ContentBroker* getContentBroker( bool bThrow )
{
if ( bThrow )
throw RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No Content Broker!")),
+ rtl::OUString("No Content Broker!"),
Reference< XInterface >() );
}
else
@@ -266,9 +266,9 @@ static ContentBroker* getContentBroker( bool bThrow )
{
if ( bThrow )
throw RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ rtl::OUString(
"UCB does not implement mandatory interface "
- "XContentProviderManager!" )),
+ "XContentProviderManager!" ),
Reference< XInterface >() );
}
else
@@ -304,8 +304,8 @@ static Reference< XContentIdentifier > getContentIdentifier(
ensureContentProviderForURL( rBroker, rURL );
throw ContentCreationException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unable to create Content Identifier!" )),
+ rtl::OUString(
+ "Unable to create Content Identifier!" ),
Reference< XInterface >(),
ContentCreationError_IDENTIFIER_CREATION_FAILED );
}
@@ -314,9 +314,9 @@ static Reference< XContentIdentifier > getContentIdentifier(
{
if ( bThrow )
throw RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ rtl::OUString(
"UCB does not implement mandatory interface "
- "XContentIdentifierFactory!" )),
+ "XContentIdentifierFactory!" ),
Reference< XInterface >() );
}
@@ -354,8 +354,8 @@ static Reference< XContent > getContent(
ensureContentProviderForURL( rBroker, xId->getContentIdentifier() );
throw ContentCreationException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unable to create Content! " )) + msg,
+ rtl::OUString(
+ "Unable to create Content! " ) + msg,
Reference< XInterface >(),
ContentCreationError_CONTENT_CREATION_FAILED );
}
@@ -364,9 +364,9 @@ static Reference< XContent > getContent(
{
if ( bThrow )
throw RuntimeException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ rtl::OUString(
"UCB does not implement mandatory interface "
- "XContentProvider!" )),
+ "XContentProvider!" ),
Reference< XInterface >() );
}
@@ -484,7 +484,7 @@ Reference< XCommandInfo > Content::getCommands()
throw( CommandAbortedException, RuntimeException, Exception )
{
Command aCommand;
- aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getCommandInfo"));
+ aCommand.Name = rtl::OUString("getCommandInfo");
aCommand.Handle = -1; // n/a
aCommand.Argument = Any();
@@ -500,7 +500,7 @@ Reference< XPropertySetInfo > Content::getProperties()
throw( CommandAbortedException, RuntimeException, Exception )
{
Command aCommand;
- aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertySetInfo"));
+ aCommand.Name = rtl::OUString("getPropertySetInfo");
aCommand.Handle = -1; // n/a
aCommand.Argument = Any();
@@ -580,7 +580,7 @@ Reference< XRow > Content::getPropertyValuesInterface(
}
Command aCommand;
- aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues"));
+ aCommand.Name = rtl::OUString("getPropertyValues");
aCommand.Handle = -1; // n/a
aCommand.Argument <<= aProps;
@@ -601,9 +601,9 @@ Sequence< Any > Content::setPropertyValues(
{
ucbhelper::cancelCommandExecution(
makeAny( IllegalArgumentException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ rtl::OUString(
"Length of property names sequence and value "
- "sequence are unequal!" )),
+ "sequence are unequal!" ),
get(),
-1 ) ),
m_xImpl->getEnvironment() );
@@ -628,7 +628,7 @@ Sequence< Any > Content::setPropertyValues(
}
Command aCommand;
- aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues"));
+ aCommand.Name = rtl::OUString("setPropertyValues");
aCommand.Handle = -1; // n/a
aCommand.Argument <<= aProps;
@@ -678,7 +678,7 @@ Any Content::createCursorAny( const Sequence< rtl::OUString >& rPropertyNames,
aArg.Properties = aProps;
Command aCommand;
- aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
+ aCommand.Name = rtl::OUString("open");
aCommand.Handle = -1; // n/a
aCommand.Argument <<= aArg;
@@ -752,7 +752,7 @@ Reference< XResultSet > Content::createSortedCursor(
if( aServiceManager.is() )
{
Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))),
+ rtl::OUString("com.sun.star.ucb.SortedDynamicResultSetFactory")),
UNO_QUERY );
aDynResult = aSortFactory->createSortedDynamicResultSet( aDynSet,
@@ -799,7 +799,7 @@ Reference< XInputStream > Content::openStream()
aArg.Properties = Sequence< Property >( 0 ); // unused
Command aCommand;
- aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
+ aCommand.Name = rtl::OUString("open");
aCommand.Handle = -1; // n/a
aCommand.Argument <<= aArg;
@@ -824,7 +824,7 @@ Reference< XInputStream > Content::openStreamNoLock()
aArg.Properties = Sequence< Property >( 0 ); // unused
Command aCommand;
- aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
+ aCommand.Name = rtl::OUString("open");
aCommand.Handle = -1; // n/a
aCommand.Argument <<= aArg;
@@ -849,7 +849,7 @@ Reference< XStream > Content::openWriteableStream()
aArg.Properties = Sequence< Property >( 0 ); // unused
Command aCommand;
- aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
+ aCommand.Name = rtl::OUString("open");
aCommand.Handle = -1; // n/a
aCommand.Argument <<= aArg;
@@ -874,7 +874,7 @@ Reference< XStream > Content::openWriteableStreamNoLock()
aArg.Properties = Sequence< Property >( 0 ); // unused
Command aCommand;
- aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
+ aCommand.Name = rtl::OUString("open");
aCommand.Handle = -1; // n/a
aCommand.Argument <<= aArg;
@@ -897,7 +897,7 @@ sal_Bool Content::openStream( const Reference< XActiveDataSink >& rSink )
aArg.Properties = Sequence< Property >( 0 ); // unused
Command aCommand;
- aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
+ aCommand.Name = rtl::OUString("open");
aCommand.Handle = -1; // n/a
aCommand.Argument <<= aArg;
@@ -920,7 +920,7 @@ sal_Bool Content::openStream( const Reference< XOutputStream >& rStream )
aArg.Properties = Sequence< Property >( 0 ); // unused
Command aCommand;
- aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
+ aCommand.Name = rtl::OUString("open");
aCommand.Handle = -1; // n/a
aCommand.Argument <<= aArg;
@@ -939,7 +939,7 @@ void Content::writeStream( const Reference< XInputStream >& rStream,
aArg.ReplaceExisting = bReplaceExisting;
Command aCommand;
- aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert"));
+ aCommand.Name = rtl::OUString("insert");
aCommand.Handle = -1; // n/a
aCommand.Argument <<= aArg;
@@ -955,7 +955,7 @@ Sequence< ContentInfo > Content::queryCreatableContentsInfo()
// First, try it using "CreatableContentsInfo" property -> the "new" way.
Sequence< ContentInfo > aInfo;
if ( getPropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo")) )
+ rtl::OUString("CreatableContentsInfo") )
>>= aInfo )
return aInfo;
@@ -1001,7 +1001,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
aInfo.Attributes = 0;
Command aCommand;
- aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createNewContent"));
+ aCommand.Name = rtl::OUString("createNewContent");
aCommand.Handle = -1; // n/a
aCommand.Argument <<= aInfo;
@@ -1035,7 +1035,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
Content aNewContent( xNew, m_xImpl->getEnvironment() );
aNewContent.setPropertyValues( rPropertyNames, rPropertyValues );
- aNewContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")),
+ aNewContent.executeCommand( rtl::OUString("insert"),
makeAny(
InsertCommandArgument(
rData.is() ? rData : new EmptyInputStream,
@@ -1088,8 +1088,8 @@ sal_Bool Content::transferContent( const Content& rSourceContent,
default:
ucbhelper::cancelCommandExecution(
makeAny( IllegalArgumentException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unknown transfer operation!" )),
+ rtl::OUString(
+ "Unknown transfer operation!" ),
get(),
-1 ) ),
m_xImpl->getEnvironment() );
@@ -1103,7 +1103,7 @@ sal_Bool Content::transferContent( const Content& rSourceContent,
rTitle,
nNameClashAction );
Command aCommand;
- aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("globalTransfer"));
+ aCommand.Name = rtl::OUString("globalTransfer");
aCommand.Handle = -1; // n/a
aCommand.Argument <<= aTransferArg;
@@ -1116,14 +1116,14 @@ sal_Bool Content::isFolder()
throw( CommandAbortedException, RuntimeException, Exception )
{
sal_Bool bFolder = sal_False;
- if ( getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")) )
+ if ( getPropertyValue( rtl::OUString("IsFolder") )
>>= bFolder )
return bFolder;
ucbhelper::cancelCommandExecution(
makeAny( UnknownPropertyException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unable to retreive value of property 'IsFolder'!" )),
+ rtl::OUString(
+ "Unable to retreive value of property 'IsFolder'!" ),
get() ) ),
m_xImpl->getEnvironment() );
@@ -1137,14 +1137,14 @@ sal_Bool Content::isDocument()
throw( CommandAbortedException, RuntimeException, Exception )
{
sal_Bool bDoc = sal_False;
- if ( getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")) )
+ if ( getPropertyValue( rtl::OUString("IsDocument") )
>>= bDoc )
return bDoc;
ucbhelper::cancelCommandExecution(
makeAny( UnknownPropertyException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Unable to retreive value of property 'IsDocument'!" )),
+ rtl::OUString(
+ "Unable to retreive value of property 'IsDocument'!" ),
get() ) ),
m_xImpl->getEnvironment() );
diff --git a/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx
index 3d217f8..b059dc9 100644
--- a/ucbhelper/source/client/contentbroker.cxx
+++ b/ucbhelper/source/client/contentbroker.cxx
@@ -225,8 +225,8 @@ InitUCBHelper()
// Create UCB.
Sequence< Any > aArgs( 2 );
- aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
- aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
+ aArgs[ 0 ] <<= rtl::OUString( UCB_CONFIGURATION_KEY1_LOCAL );
+ aArgs[ 1 ] <<= rtl::OUString( UCB_CONFIGURATION_KEY2_OFFICE );
::ucbhelper::ContentBroker::initialize( xFactory, aArgs );
}
@@ -286,8 +286,8 @@ bool ContentBroker_Impl::initialize()
try
{
xIfc = m_xSMgr->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ucb.UniversalContentBroker" )) );
+ OUString(
+ "com.sun.star.ucb.UniversalContentBroker" ) );
}
catch ( Exception const & )
{
@@ -320,8 +320,8 @@ bool ContentBroker_Impl::initialize()
try
{
xIfc = m_xSMgr->createInstanceWithArguments(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ucb.UniversalContentBroker" )),
+ OUString(
+ "com.sun.star.ucb.UniversalContentBroker" ),
m_aArguments );
}
catch ( Exception const & )
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index 3dddf1c..453eb83 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -320,17 +320,17 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl(
uno::Reference< lang::XMultiServiceFactory > xConfigProv(
rxSMgr->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationProvider" )) ),
+ rtl::OUString(
+ "com.sun.star.configuration.ConfigurationProvider" ) ),
uno::UNO_QUERY );
uno::Sequence< uno::Any > aArguments( 1 );
- aArguments[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CONFIG_ROOT_KEY ));
+ aArguments[ 0 ] <<= rtl::OUString( CONFIG_ROOT_KEY );
uno::Reference< uno::XInterface > xInterface(
xConfigProv->createInstanceWithArguments(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationAccess" )),
+ rtl::OUString(
+ "com.sun.star.configuration.ConfigurationAccess" ),
aArguments ) );
OSL_ENSURE( xInterface.is(),
@@ -722,14 +722,14 @@ void InternetProxyDecider_Impl::setNoProxyList(
if ( nColonPos == -1 )
{
// No port given, server pattern equals current token
- aPort = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
+ aPort = rtl::OUString("*");
if ( aToken.indexOf( '*' ) == -1 )
{
// pattern describes exactly one server
aServer = aToken;
}
- aToken += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":*"));
+ aToken += rtl::OUString(":*");
}
else
{
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 0ade2fe..a6cf5bd 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -639,8 +639,8 @@ const Reference< XTypeConverter >& PropertyValueSet::getTypeConverter()
m_bTriedToGetTypeConverter = sal_True;
m_xTypeConverter = Reference< XTypeConverter >(
m_xSMgr->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.script.Converter" )) ),
+ OUString(
+ "com.sun.star.script.Converter" ) ),
UNO_QUERY );
OSL_ENSURE( m_xTypeConverter.is(),
diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index fd6cd8f..e6bd42e 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.cxx
@@ -324,8 +324,8 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry()
uno::Reference< com::sun::star::ucb::XPropertySetRegistryFactory >
xRegFac(
m_xSMgr->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ucb.Store" )) ),
+ rtl::OUString(
+ "com.sun.star.ucb.Store" ) ),
uno::UNO_QUERY );
OSL_ENSURE( xRegFac.is(),
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index 8fd870d..f9bdaf9 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -105,10 +105,10 @@ XTYPEPROVIDER_IMPL_3( ResultSetImplHelper,
//=========================================================================
XSERVICEINFO_NOFACTORY_IMPL_1( ResultSetImplHelper,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "ResultSetImplHelper" )),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- DYNAMICRESULTSET_SERVICE_NAME )) );
+ rtl::OUString(
+ "ResultSetImplHelper" ),
+ rtl::OUString(
+ DYNAMICRESULTSET_SERVICE_NAME ) );
//=========================================================================
//
@@ -261,8 +261,8 @@ void SAL_CALL ResultSetImplHelper::connectToCache(
= uno::Reference<
com::sun::star::ucb::XCachedDynamicResultSetStubFactory >(
m_xSMgr->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ucb.CachedDynamicResultSetStubFactory" )) ),
+ rtl::OUString(
+ "com.sun.star.ucb.CachedDynamicResultSetStubFactory" ) ),
uno::UNO_QUERY );
}
catch ( uno::Exception const & )
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index 2417e37..012bbc3 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -411,8 +411,8 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
{
Reference< XPropertySetInfo > xInfo(
m_xSMgr->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ucb.PropertiesManager" )) ),
+ OUString(
+ "com.sun.star.ucb.PropertiesManager" ) ),
UNO_QUERY );
if ( xInfo.is() )
{
commit a9406f54e286c96890f4d621ba6ae5c8a81cdb8c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue May 29 19:19:20 2012 -0500
targeted string re-work
Change-Id: Ib4a0e8fcd128c949034d2d183ff045bb433fce8b
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index c05ba8e..58fde77 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -85,7 +85,7 @@ bool XMLSignatureHelper::Init()
void XMLSignatureHelper::ImplCreateSEInitializer()
{
- rtl::OUString sSEInitializer(RTL_CONSTASCII_USTRINGPARAM( SEINITIALIZER_COMPONENT ));
+ rtl::OUString sSEInitializer( SEINITIALIZER_COMPONENT );
uno::Reference< lang::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
mxSEInitializer = uno::Reference< com::sun::star::xml::crypto::XSEInitializer > (
xMCF->createInstanceWithContext( sSEInitializer, mxCtx ), uno::UNO_QUERY );
@@ -166,8 +166,8 @@ uno::Reference<xml::sax::XDocumentHandler> XMLSignatureHelper::CreateDocumentHan
*/
uno::Reference< lang::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
uno::Reference< io::XActiveDataSource > xSaxWriter(
- xMCF->createInstanceWithContext(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.xml.sax.Writer")), mxCtx ), uno::UNO_QUERY );
+ xMCF->createInstanceWithContext(rtl::OUString(
+ "com.sun.star.xml.sax.Writer"), mxCtx ), uno::UNO_QUERY );
DBG_ASSERT( xSaxWriter.is(), "can't instantiate XML writer" );
@@ -185,17 +185,17 @@ uno::Reference<xml::sax::XDocumentHandler> XMLSignatureHelper::CreateDocumentHan
/*
* write the xml context for signatures
*/
- rtl::OUString tag_AllSignatures(RTL_CONSTASCII_USTRINGPARAM(TAG_DOCUMENTSIGNATURES));
+ rtl::OUString tag_AllSignatures(TAG_DOCUMENTSIGNATURES);
SvXMLAttributeList *pAttributeList = new SvXMLAttributeList();
rtl::OUString sNamespace;
if (mbODFPre1_2)
- sNamespace = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NS_DOCUMENTSIGNATURES));
+ sNamespace = rtl::OUString(NS_DOCUMENTSIGNATURES);
else
- sNamespace = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NS_DOCUMENTSIGNATURES_ODF_1_2));
+ sNamespace = rtl::OUString(NS_DOCUMENTSIGNATURES_ODF_1_2);
pAttributeList->AddAttribute(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_XMLNS)),
+ rtl::OUString(ATTR_XMLNS),
sNamespace);
xDocHandler->startDocument();
@@ -208,7 +208,7 @@ uno::Reference<xml::sax::XDocumentHandler> XMLSignatureHelper::CreateDocumentHan
void XMLSignatureHelper::CloseDocumentHandler( const uno::Reference<xml::sax::XDocumentHandler>& xDocumentHandler )
{
- rtl::OUString tag_AllSignatures(RTL_CONSTASCII_USTRINGPARAM(TAG_DOCUMENTSIGNATURES));
+ rtl::OUString tag_AllSignatures(TAG_DOCUMENTSIGNATURES);
xDocumentHandler->endElement( tag_AllSignatures );
xDocumentHandler->endDocument();
}
@@ -265,7 +265,7 @@ bool XMLSignatureHelper::ReadAndVerifySignature( const com::sun::star::uno::Refe
uno::Reference< lang::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
uno::Reference< xml::sax::XParser > xParser(
xMCF->createInstanceWithContext(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser") ), mxCtx ),
+ rtl::OUString("com.sun.star.xml.sax.Parser" ), mxCtx ),
uno::UNO_QUERY );
DBG_ASSERT( xParser.is(), "Can't create parser" );
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index b84fc2a..5bcfcf7 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -192,14 +192,14 @@ sal_Bool XSecController::convertDateTime( com::sun::star::util::DateTime& rDateT
sHundredth = rString.copy(nPos2 + 1);
sal_Int32 len = sHundredth.getLength();
if (len == 1)
- sHundredth += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"));
+ sHundredth += rtl::OUString("0");
if (len > 2)
sHundredth = sHundredth.copy(0, 2);
}
else
{
aTimeStr = rString.copy(nPos + 1);
- sHundredth = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"));
+ sHundredth = rtl::OUString("0");
}
}
else
@@ -340,9 +340,9 @@ void XSecController::createXSecComponent( )
* Email: michael.mi at sun.com
******************************************************************************/
{
- rtl::OUString sSAXEventKeeper(RTL_CONSTASCII_USTRINGPARAM( SAXEVENTKEEPER_COMPONENT ));
- rtl::OUString sXMLSignature(RTL_CONSTASCII_USTRINGPARAM( XMLSIGNATURE_COMPONENT ));
- rtl::OUString sXMLDocument(RTL_CONSTASCII_USTRINGPARAM( XMLDOCUMENTWRAPPER_COMPONENT ));
+ rtl::OUString sSAXEventKeeper( SAXEVENTKEEPER_COMPONENT );
+ rtl::OUString sXMLSignature( XMLSIGNATURE_COMPONENT );
+ rtl::OUString sXMLDocument( XMLDOCUMENTWRAPPER_COMPONENT );
/*
* marks all security components are not available.
@@ -911,27 +911,26 @@ void XSecController::exportSignature(
/*
* defines all element tags in Signature element.
*/
- rtl::OUString tag_Signature(RTL_CONSTASCII_USTRINGPARAM(TAG_SIGNATURE));
- rtl::OUString tag_SignedInfo(RTL_CONSTASCII_USTRINGPARAM(TAG_SIGNEDINFO));
- rtl::OUString tag_CanonicalizationMethod(RTL_CONSTASCII_USTRINGPARAM(TAG_CANONICALIZATIONMETHOD));
- rtl::OUString tag_SignatureMethod(RTL_CONSTASCII_USTRINGPARAM(TAG_SIGNATUREMETHOD));
- rtl::OUString tag_Reference(RTL_CONSTASCII_USTRINGPARAM(TAG_REFERENCE));
- rtl::OUString tag_Transforms(RTL_CONSTASCII_USTRINGPARAM(TAG_TRANSFORMS));
- rtl::OUString tag_Transform(RTL_CONSTASCII_USTRINGPARAM(TAG_TRANSFORM));
- rtl::OUString tag_DigestMethod(RTL_CONSTASCII_USTRINGPARAM(TAG_DIGESTMETHOD));
- rtl::OUString tag_DigestValue(RTL_CONSTASCII_USTRINGPARAM(TAG_DIGESTVALUE));
- rtl::OUString tag_SignatureValue(RTL_CONSTASCII_USTRINGPARAM(TAG_SIGNATUREVALUE));
- rtl::OUString tag_KeyInfo(RTL_CONSTASCII_USTRINGPARAM(TAG_KEYINFO));
- rtl::OUString tag_X509Data(RTL_CONSTASCII_USTRINGPARAM(TAG_X509DATA));
- rtl::OUString tag_X509IssuerSerial(RTL_CONSTASCII_USTRINGPARAM(TAG_X509ISSUERSERIAL));
- rtl::OUString tag_X509IssuerName(RTL_CONSTASCII_USTRINGPARAM(TAG_X509ISSUERNAME));
- rtl::OUString tag_X509SerialNumber(RTL_CONSTASCII_USTRINGPARAM(TAG_X509SERIALNUMBER));
- rtl::OUString tag_X509Certificate(RTL_CONSTASCII_USTRINGPARAM(TAG_X509CERTIFICATE));
-
- rtl::OUString tag_Object(RTL_CONSTASCII_USTRINGPARAM(TAG_OBJECT));
- rtl::OUString tag_SignatureProperties(RTL_CONSTASCII_USTRINGPARAM(TAG_SIGNATUREPROPERTIES));
- rtl::OUString tag_SignatureProperty(RTL_CONSTASCII_USTRINGPARAM(TAG_SIGNATUREPROPERTY));
- rtl::OUString tag_Date(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE));
+ rtl::OUString tag_Signature(TAG_SIGNATURE);
+ rtl::OUString tag_SignedInfo(TAG_SIGNEDINFO);
+ rtl::OUString tag_CanonicalizationMethod(TAG_CANONICALIZATIONMETHOD);
+ rtl::OUString tag_SignatureMethod(TAG_SIGNATUREMETHOD);
+ rtl::OUString tag_Reference(TAG_REFERENCE);
+ rtl::OUString tag_Transforms(TAG_TRANSFORMS);
+ rtl::OUString tag_Transform(TAG_TRANSFORM);
+ rtl::OUString tag_DigestMethod(TAG_DIGESTMETHOD);
+ rtl::OUString tag_DigestValue(TAG_DIGESTVALUE);
+ rtl::OUString tag_SignatureValue(TAG_SIGNATUREVALUE);
+ rtl::OUString tag_KeyInfo(TAG_KEYINFO);
+ rtl::OUString tag_X509Data(TAG_X509DATA);
+ rtl::OUString tag_X509IssuerSerial(TAG_X509ISSUERSERIAL);
+ rtl::OUString tag_X509IssuerName(TAG_X509ISSUERNAME);
+ rtl::OUString tag_X509SerialNumber(TAG_X509SERIALNUMBER);
+ rtl::OUString tag_X509Certificate(TAG_X509CERTIFICATE);
+ rtl::OUString tag_Object(TAG_OBJECT);
+ rtl::OUString tag_SignatureProperties(TAG_SIGNATUREPROPERTIES);
+ rtl::OUString tag_SignatureProperty(TAG_SIGNATUREPROPERTY);
+ rtl::OUString tag_Date(TAG_DATE);
const SignatureReferenceInformations& vReferenceInfors = signatureInfo.vSignatureReferenceInfors;
SvXMLAttributeList *pAttributeList;
@@ -941,13 +940,13 @@ void XSecController::exportSignature(
*/
pAttributeList = new SvXMLAttributeList();
pAttributeList->AddAttribute(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_XMLNS)),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NS_XMLDSIG)));
+ rtl::OUString(ATTR_XMLNS),
+ rtl::OUString(NS_XMLDSIG));
if (!signatureInfo.ouSignatureId.isEmpty())
{
pAttributeList->AddAttribute(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_ID)),
+ rtl::OUString(ATTR_ID),
rtl::OUString(signatureInfo.ouSignatureId));
}
@@ -961,16 +960,16 @@ void XSecController::exportSignature(
/* Write CanonicalizationMethod element */
pAttributeList = new SvXMLAttributeList();
pAttributeList->AddAttribute(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_ALGORITHM)),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ALGO_C14N)));
+ rtl::OUString(ATTR_ALGORITHM),
+ rtl::OUString(ALGO_C14N));
xDocumentHandler->startElement( tag_CanonicalizationMethod, cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
xDocumentHandler->endElement( tag_CanonicalizationMethod );
/* Write SignatureMethod element */
pAttributeList = new SvXMLAttributeList();
pAttributeList->AddAttribute(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_ALGORITHM)),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ALGO_RSASHA1)));
+ rtl::OUString(ATTR_ALGORITHM),
+ rtl::OUString(ALGO_RSASHA1));
xDocumentHandler->startElement( tag_SignatureMethod, cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
xDocumentHandler->endElement( tag_SignatureMethod );
@@ -989,7 +988,7 @@ void XSecController::exportSignature(
*/
{
pAttributeList->AddAttribute(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_URI)),
+ rtl::OUString(ATTR_URI),
refInfor.ouURI);
}
else
@@ -998,8 +997,8 @@ void XSecController::exportSignature(
*/
{
pAttributeList->AddAttribute(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_URI)),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CHAR_FRAGMENT))+refInfor.ouURI);
+ rtl::OUString(ATTR_URI),
+ rtl::OUString(CHAR_FRAGMENT)+refInfor.ouURI);
}
xDocumentHandler->startElement( tag_Reference, cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
@@ -1016,8 +1015,8 @@ void XSecController::exportSignature(
{
pAttributeList = new SvXMLAttributeList();
pAttributeList->AddAttribute(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_ALGORITHM)),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ALGO_C14N)));
+ rtl::OUString(ATTR_ALGORITHM),
+ rtl::OUString(ALGO_C14N));
xDocumentHandler->startElement(
tag_Transform,
cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
@@ -1029,8 +1028,8 @@ void XSecController::exportSignature(
/* Write DigestMethod element */
pAttributeList = new SvXMLAttributeList();
pAttributeList->AddAttribute(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_ALGORITHM)),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ALGO_XMLDSIGSHA1)));
+ rtl::OUString(ATTR_ALGORITHM),
+ rtl::OUString(ALGO_XMLDSIGSHA1));
xDocumentHandler->startElement(
tag_DigestMethod,
cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
@@ -1113,11 +1112,11 @@ void XSecController::exportSignature(
/* Write SignatureProperty element */
pAttributeList = new SvXMLAttributeList();
pAttributeList->AddAttribute(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_ID)),
+ rtl::OUString(ATTR_ID),
signatureInfo.ouPropertyId);
pAttributeList->AddAttribute(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_TARGET)),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CHAR_FRAGMENT))+signatureInfo.ouSignatureId);
+ rtl::OUString(ATTR_TARGET),
+ rtl::OUString(CHAR_FRAGMENT)+signatureInfo.ouSignatureId);
xDocumentHandler->startElement(
tag_SignatureProperty,
cssu::Reference< cssxs::XAttributeList > (pAttributeList));
@@ -1126,14 +1125,14 @@ void XSecController::exportSignature(
pAttributeList = new SvXMLAttributeList();
pAttributeList->AddAttribute(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ATTR_XMLNS))
- +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":"))
- +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC)),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NS_DC)));
+ rtl::OUString(ATTR_XMLNS)
+ +rtl::OUString(":")
+ +rtl::OUString(NSTAG_DC),
+ rtl::OUString(NS_DC));
xDocumentHandler->startElement(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC))
- +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":"))
+ rtl::OUString(NSTAG_DC)
+ +rtl::OUString(":")
+tag_Date,
cssu::Reference< cssxs::XAttributeList > (pAttributeList));
@@ -1153,8 +1152,8 @@ void XSecController::exportSignature(
xDocumentHandler->characters( buffer.makeStringAndClear() );
xDocumentHandler->endElement(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC))
- +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":"))
+ rtl::OUString(NSTAG_DC)
+ +rtl::OUString(":")
+tag_Date);
}
xDocumentHandler->endElement( tag_SignatureProperty );
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index de609f1..da26394 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -85,7 +85,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
xReferenceResolvedListener = cssu::Reference< cssxc::sax::XReferenceResolvedListener >(
xMCF->createInstanceWithContext(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SIGNATURECREATOR_COMPONENT)), mxCtx),
+ rtl::OUString(SIGNATURECREATOR_COMPONENT), mxCtx),
cssu::UNO_QUERY);
cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
@@ -184,10 +184,10 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
for(i=0; i<size; ++i)
{
SignatureReferenceInformation& refInfor = vReferenceInfors[i];
- refInfor.ouDigestValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CHAR_BLANK));
+ refInfor.ouDigestValue = rtl::OUString(CHAR_BLANK);
}
- internalSignatureInfor.signatureInfor.ouSignatureValue = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CHAR_BLANK));
+ internalSignatureInfor.signatureInfor.ouSignatureValue = rtl::OUString(CHAR_BLANK);
return xReferenceResolvedListener;
}
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index 0f22599..c5006d3 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -69,7 +69,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
xReferenceResolvedListener = cssu::Reference< cssxc::sax::XReferenceResolvedListener >(
xMCF->createInstanceWithContext(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SIGNATUREVERIFIER_COMPONENT )), mxCtx),
+ rtl::OUString( SIGNATUREVERIFIER_COMPONENT ), mxCtx),
cssu::UNO_QUERY);
cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
diff --git a/xmlsecurity/source/xmlsec/certvalidity.cxx b/xmlsecurity/source/xmlsec/certvalidity.cxx
index 319606a..e25cb73 100644
--- a/xmlsecurity/source/xmlsec/certvalidity.cxx
+++ b/xmlsecurity/source/xmlsec/certvalidity.cxx
@@ -55,41 +55,41 @@ rtl::OUString certificateValidityToOUString( ::sal_Int32 certValidity ) {
OUString aValidity ;
if( (certValidity & CertificateValidity::VALID) == CertificateValidity::VALID ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(VALID_STR )) ;
+ aValidity = OUString(VALID_STR ) ;
} else if( ( certValidity & CertificateValidity::INVALID ) == CertificateValidity::INVALID ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(INVALID_STR )) ;
+ aValidity = OUString(INVALID_STR ) ;
} else if( ( certValidity & CertificateValidity::UNTRUSTED ) == CertificateValidity::UNTRUSTED ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(UNTRUSTED_STR )) ;
+ aValidity = OUString(UNTRUSTED_STR ) ;
} else if( ( certValidity & CertificateValidity::TIME_INVALID ) == CertificateValidity::TIME_INVALID ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(TIME_INVALID_STR )) ;
+ aValidity = OUString(TIME_INVALID_STR ) ;
} else if( ( certValidity & CertificateValidity::NOT_TIME_NESTED ) == CertificateValidity::NOT_TIME_NESTED ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(NOT_NESTED_TIME_STR )) ;
+ aValidity = OUString(NOT_NESTED_TIME_STR ) ;
} else if( ( certValidity & CertificateValidity::REVOKED ) == CertificateValidity::REVOKED ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(REVOKED_STR )) ;
+ aValidity = OUString(REVOKED_STR ) ;
} else if( ( certValidity & CertificateValidity::UNKNOWN_REVOKATION ) == CertificateValidity::UNKNOWN_REVOKATION ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(UNKNOWN_REVOKATION_STR )) ;
+ aValidity = OUString(UNKNOWN_REVOKATION_STR ) ;
} else if( ( certValidity & CertificateValidity::SIGNATURE_INVALID ) == CertificateValidity::SIGNATURE_INVALID ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(SIGNATURE_INVALID_STR )) ;
+ aValidity = OUString(SIGNATURE_INVALID_STR ) ;
} else if( ( certValidity & CertificateValidity::EXTENSION_INVALID ) == CertificateValidity::EXTENSION_INVALID ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(EXTENSION_INVALID_STR )) ;
+ aValidity = OUString(EXTENSION_INVALID_STR ) ;
} else if( ( certValidity & CertificateValidity::EXTENSION_UNKNOWN ) == CertificateValidity::EXTENSION_UNKNOWN ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(EXTENSION_UNKNOWN_STR )) ;
+ aValidity = OUString(EXTENSION_UNKNOWN_STR ) ;
} else if( ( certValidity & CertificateValidity::ISSUER_UNKNOWN ) == CertificateValidity::ISSUER_UNKNOWN ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(ISSUER_UNKNOWN_STR )) ;
+ aValidity = OUString(ISSUER_UNKNOWN_STR ) ;
} else if( ( certValidity & CertificateValidity::ISSUER_UNTRUSTED ) == CertificateValidity::ISSUER_UNTRUSTED ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(ISSUER_UNTRUSTED_STR )) ;
+ aValidity = OUString(ISSUER_UNTRUSTED_STR ) ;
} else if( ( certValidity & CertificateValidity::ISSUER_INVALID ) == CertificateValidity::ISSUER_INVALID ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(ISSUER_INVALID_STR )) ;
+ aValidity = OUString(ISSUER_INVALID_STR ) ;
} else if( ( certValidity & CertificateValidity::ROOT_UNKNOWN ) == CertificateValidity::ROOT_UNKNOWN ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(ROOT_UNKNOWN_STR )) ;
+ aValidity = OUString(ROOT_UNKNOWN_STR ) ;
} else if( ( certValidity & CertificateValidity::ROOT_UNTRUSTED ) == CertificateValidity::ROOT_UNTRUSTED ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(ROOT_UNTRUSTED_STR )) ;
+ aValidity = OUString(ROOT_UNTRUSTED_STR ) ;
} else if( ( certValidity & CertificateValidity::ROOT_INVALID ) == CertificateValidity::ROOT_INVALID ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(ROOT_INVALID_STR )) ;
+ aValidity = OUString(ROOT_INVALID_STR ) ;
} else if( ( certValidity & CertificateValidity::CHAIN_INCOMPLETE ) == CertificateValidity::CHAIN_INCOMPLETE ) {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(CHAIN_INCOMPLETE_STR )) ;
+ aValidity = OUString(CHAIN_INCOMPLETE_STR ) ;
} else {
- aValidity = OUString(RTL_CONSTASCII_USTRINGPARAM(INVALID_STR )) ;
+ aValidity = OUString(INVALID_STR ) ;
}
return aValidity ;
diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx
index 3071cfb..6dc169c 100644
--- a/xmlsecurity/workben/signaturetest.cxx
+++ b/xmlsecurity/workben/signaturetest.cxx
@@ -105,8 +105,8 @@ void Main();
// Init USB
uno::Sequence< uno::Any > aArgs( 2 );
- aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
- aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
+ aArgs[ 0 ] <<= rtl::OUString( UCB_CONFIGURATION_KEY1_LOCAL );
+ aArgs[ 1 ] <<= rtl::OUString( UCB_CONFIGURATION_KEY2_OFFICE );
sal_Bool bSuccess = ::ucb::ContentBroker::initialize( xMSF, aArgs );
if ( !bSuccess )
{
commit 601500f8a85d170f3278f905c6b6795b2dd0fa8b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue May 29 19:08:42 2012 -0500
targeted string re-work
Change-Id: I6ce76c22118586b213161a0e307a53b22b318004
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 02f33d8..49f3ed8 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -320,7 +320,7 @@ const Sequence< OUString > FrameControl::impl_getStaticSupportedServiceNames()
const OUString FrameControl::impl_getStaticImplementationName()
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATIONNAME_FRAMECONTROL ));
+ return OUString(IMPLEMENTATIONNAME_FRAMECONTROL);
}
//____________________________________________________________________________________________________________
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index 105010c..1b6eaad 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -684,7 +684,7 @@ const Sequence< OUString > ProgressMonitor::impl_getStaticSupportedServiceNames(
const OUString ProgressMonitor::impl_getStaticImplementationName()
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATIONNAME_PROGRESSMONITOR ));
+ return OUString(IMPLEMENTATIONNAME_PROGRESSMONITOR);
}
//____________________________________________________________________________________________________________
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index 64a1cfc..c3988d8 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -442,7 +442,7 @@ const Sequence< OUString > StatusIndicator::impl_getStaticSupportedServiceNames(
const OUString StatusIndicator::impl_getStaticImplementationName()
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATIONNAME_STATUSINDICATOR ));
+ return OUString(IMPLEMENTATIONNAME_STATUSINDICATOR);
}
//____________________________________________________________________________________________________________
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 198eff8..12cc04d 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -154,7 +154,7 @@ static void lcl_OpenURL( ::rtl::OUString sURL )
::comphelper::getProcessServiceFactory();
uno::Reference< css::system::XSystemShellExecute > xSystemShell(
xSMGR->createInstance( ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ),
+ "com.sun.star.system.SystemShellExecute") ),
uno::UNO_QUERY_THROW );
if ( xSystemShell.is() )
xSystemShell->execute( sURL, ::rtl::OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY );
@@ -180,7 +180,7 @@ sal_Bool KillFile_Impl( const String& rURL )
try
{
Content aCnt( rURL, uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
- aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) );
+ aCnt.executeCommand( OUString("delete"), makeAny( sal_Bool( sal_True ) ) );
}
catch( ::com::sun::star::ucb::CommandAbortedException& )
{
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 7263bb6..c5b0b2c 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -120,7 +120,7 @@ namespace dbp
try
{
::rtl::OUString sDataSourceName;
- rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sDataSourceName;
+ rContext.xForm->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSourceName;
Reference< XConnection > xConnection;
bool bEmbedded = ::dbtools::isEmbeddedInDatabase( rContext.xForm, xConnection );
@@ -138,9 +138,9 @@ namespace dbp
implFillTables(xConnection);
::rtl::OUString sCommand;
- OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command")) ) >>= sCommand );
+ OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString("Command") ) >>= sCommand );
sal_Int32 nCommandType = CommandType::TABLE;
- OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType")) ) >>= nCommandType );
+ OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString("CommandType") ) >>= nCommandType );
// search the entry of the given type with the given name
XubString sLookup( sCommand );
@@ -175,13 +175,13 @@ namespace dbp
xOldConn = getFormConnection();
::rtl::OUString sDataSource = m_aDatasource.GetSelectEntry();
- rContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName")), makeAny( sDataSource ) );
+ rContext.xForm->setPropertyValue( ::rtl::OUString("DataSourceName"), makeAny( sDataSource ) );
}
::rtl::OUString sCommand = m_aTable.GetSelectEntry();
sal_Int32 nCommandType = reinterpret_cast< sal_IntPtr >( m_aTable.GetEntryData( m_aTable.GetSelectEntryPos() ) );
- rContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command")), makeAny( sCommand ) );
- rContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType")), makeAny( nCommandType ) );
+ rContext.xForm->setPropertyValue( ::rtl::OUString("Command"), makeAny( sCommand ) );
+ rContext.xForm->setPropertyValue( ::rtl::OUString("CommandType"), makeAny( nCommandType ) );
if ( !rContext.bEmbedded )
setFormConnection( xOldConn, sal_False );
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 234c0fd..abe80c4 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -238,9 +238,9 @@ namespace dbp
sal_Int32 nCommandType = CommandType::COMMAND;
try
{
- rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sDataSource;
- rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command"))) >>= sCommand;
- rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType"))) >>= nCommandType;
+ rContext.xForm->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSource;
+ rContext.xForm->getPropertyValue(::rtl::OUString("Command")) >>= sCommand;
+ rContext.xForm->getPropertyValue(::rtl::OUString("CommandType")) >>= nCommandType;
}
catch(const Exception&)
{
@@ -304,7 +304,7 @@ namespace dbp
sal_Int16 nClassId = FormComponentType::CONTROL;
try
{
- getContext().xObjectModel->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClassId"))) >>= nClassId;
+ getContext().xObjectModel->getPropertyValue(::rtl::OUString("ClassId")) >>= nClassId;
}
catch(const Exception&)
{
@@ -446,7 +446,7 @@ namespace dbp
Reference< XInterface > xContext;
if (xORB.is())
- xContext = xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatabaseContext")));
+ xContext = xORB->createInstance(::rtl::OUString("com.sun.star.sdb.DatabaseContext"));
DBG_ASSERT(xContext.is(), "OControlWizard::implGetDSContext: invalid database context!");
m_aContext.xDatasourceContext = Reference< XNameAccess >(xContext, UNO_QUERY);
@@ -470,7 +470,7 @@ namespace dbp
try
{
if ( !::dbtools::isEmbeddedInDatabase(m_aContext.xForm,xConn) )
- m_aContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) >>= xConn;
+ m_aContext.xForm->getPropertyValue(::rtl::OUString("ActiveConnection")) >>= xConn;
}
catch(const Exception&)
{
@@ -500,7 +500,7 @@ namespace dbp
}
else
{
- m_aContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")), makeAny( _rxConn ) );
+ m_aContext.xForm->setPropertyValue( ::rtl::OUString("ActiveConnection"), makeAny( _rxConn ) );
}
}
catch(const Exception&)
@@ -517,7 +517,7 @@ namespace dbp
//---------------------------------------------------------------------
Reference< XInteractionHandler > OControlWizard::getInteractionHandler(Window* _pWindow) const
{
- const ::rtl::OUString sInteractionHandlerServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler"));
+ const ::rtl::OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler");
Reference< XInteractionHandler > xHandler;
try
{
@@ -570,8 +570,8 @@ namespace dbp
if (m_aContext.xForm.is())
{
// collect some properties of the form
- ::rtl::OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command"))));
- sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType"))));
+ ::rtl::OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(::rtl::OUString("Command")));
+ sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(::rtl::OUString("CommandType")));
// calculate the connection the rowset is working with
Reference< XConnection > xConnection;
@@ -616,7 +616,7 @@ namespace dbp
// not interested in any results, only in the fields
Reference< XPropertySet > xStatementProps(xStatement, UNO_QUERY);
- xStatementProps->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRows")), makeAny(sal_Int32(0)));
+ xStatementProps->setPropertyValue(::rtl::OUString("MaxRows"), makeAny(sal_Int32(0)));
// TODO: think about handling local SQLExceptions here ...
Reference< XColumnsSupplier > xSupplyCols(xStatement->executeQuery(), UNO_QUERY);
@@ -630,7 +630,7 @@ namespace dbp
if (xColumns.is())
{
m_aContext.aFieldNames = xColumns->getElementNames();
- static const ::rtl::OUString s_sFieldTypeProperty(RTL_CONSTASCII_USTRINGPARAM("Type"));
+ static const ::rtl::OUString s_sFieldTypeProperty("Type");
const ::rtl::OUString* pBegin = m_aContext.aFieldNames.getConstArray();
const ::rtl::OUString* pEnd = pBegin + m_aContext.aFieldNames.getLength();
for(;pBegin != pEnd;++pBegin)
@@ -695,13 +695,13 @@ namespace dbp
// the only thing we have at the moment is the label
try
{
- ::rtl::OUString sLabelPropertyName(RTL_CONSTASCII_USTRINGPARAM("Label"));
+ ::rtl::OUString sLabelPropertyName("Label");
Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo();
if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName))
{
::rtl::OUString sControlLabel(_pSettings->sControlLabel);
m_aContext.xObjectModel->setPropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")),
+ ::rtl::OUString("Label"),
makeAny(sControlLabel)
);
}
@@ -722,7 +722,7 @@ namespace dbp
// initialize some settings from the control model give
try
{
- ::rtl::OUString sLabelPropertyName(RTL_CONSTASCII_USTRINGPARAM("Label"));
+ ::rtl::OUString sLabelPropertyName("Label");
Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo();
if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName))
{
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 3f99729..25b6cda 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -109,10 +109,10 @@ namespace dbp
if (!xColumnFactory.is() || !xColumnContainer.is())
return;
- static const ::rtl::OUString s_sDataFieldProperty (RTL_CONSTASCII_USTRINGPARAM("DataField"));
- static const ::rtl::OUString s_sLabelProperty (RTL_CONSTASCII_USTRINGPARAM("Label"));
- static const ::rtl::OUString s_sWidthProperty (RTL_CONSTASCII_USTRINGPARAM("Width"));
- static const ::rtl::OUString s_sMouseWheelBehavior (RTL_CONSTASCII_USTRINGPARAM("MouseWheelBehavior"));
+ static const ::rtl::OUString s_sDataFieldProperty ("DataField");
+ static const ::rtl::OUString s_sLabelProperty ("Label");
+ static const ::rtl::OUString s_sWidthProperty ("Width");
+ static const ::rtl::OUString s_sMouseWheelBehavior ("MouseWheelBehavior");
static const ::rtl::OUString s_sEmptyString;
// collect "descriptors" for the to-be-created (grid)columns
@@ -141,14 +141,14 @@ namespace dbp
{
case DataType::BIT:
case DataType::BOOLEAN:
- aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CheckBox")));
+ aColumnServiceNames.push_back(::rtl::OUString("CheckBox"));
aColumnLabelPostfixes.push_back(s_sEmptyString);
break;
case DataType::TINYINT:
case DataType::SMALLINT:
case DataType::INTEGER:
- aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumericField")));
+ aColumnServiceNames.push_back(::rtl::OUString("NumericField"));
aColumnLabelPostfixes.push_back(s_sEmptyString);
break;
@@ -157,31 +157,31 @@ namespace dbp
case DataType::DOUBLE:
case DataType::NUMERIC:
case DataType::DECIMAL:
- aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormattedField")));
+ aColumnServiceNames.push_back(::rtl::OUString("FormattedField"));
aColumnLabelPostfixes.push_back(s_sEmptyString);
break;
case DataType::DATE:
- aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateField")));
+ aColumnServiceNames.push_back(::rtl::OUString("DateField"));
aColumnLabelPostfixes.push_back(s_sEmptyString);
break;
case DataType::TIME:
- aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeField")));
+ aColumnServiceNames.push_back(::rtl::OUString("TimeField"));
aColumnLabelPostfixes.push_back(s_sEmptyString);
break;
case DataType::TIMESTAMP:
- aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateField")));
+ aColumnServiceNames.push_back(::rtl::OUString("DateField"));
aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_DATEPOSTFIX)));
aFormFieldNames.push_back(*pSelectedFields);
- aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeField")));
+ aColumnServiceNames.push_back(::rtl::OUString("TimeField"));
aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_TIMEPOSTFIX)));
break;
default:
- aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextField")));
+ aColumnServiceNames.push_back(::rtl::OUString("TextField"));
aColumnLabelPostfixes.push_back(s_sEmptyString);
}
}
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 1face92..0a95ee2 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -185,12 +185,12 @@ namespace dbp
}
// ListSourceType: SQL
- getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListSourceType")), makeAny((sal_Int32)ListSourceType_SQL));
+ getContext().xObjectModel->setPropertyValue(::rtl::OUString("ListSourceType"), makeAny((sal_Int32)ListSourceType_SQL));
if (isListBox())
{
// BoundColumn: 1
- getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BoundColumn")), makeAny((sal_Int16)1));
+ getContext().xObjectModel->setPropertyValue(::rtl::OUString("BoundColumn"), makeAny((sal_Int16)1));
// build the statement to set as list source
String sStatement;
@@ -202,7 +202,7 @@ namespace dbp
sStatement += getSettings().sListContentTable;
Sequence< ::rtl::OUString > aListSource(1);
aListSource[0] = sStatement;
- getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListSource")), makeAny(aListSource));
+ getContext().xObjectModel->setPropertyValue(::rtl::OUString("ListSource"), makeAny(aListSource));
}
else
{
@@ -212,11 +212,11 @@ namespace dbp
sStatement += getSettings().sListContentField;
sStatement.AppendAscii(" FROM ");
sStatement += getSettings().sListContentTable;
- getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListSource")), makeAny(::rtl::OUString(sStatement)));
+ getContext().xObjectModel->setPropertyValue(::rtl::OUString("ListSource"), makeAny(::rtl::OUString(sStatement)));
}
// the bound field
- getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataField")), makeAny(::rtl::OUString(getSettings().sLinkedFormField)));
+ getContext().xObjectModel->setPropertyValue(::rtl::OUString("DataField"), makeAny(::rtl::OUString(getSettings().sLinkedFormField)));
}
catch(const Exception&)
{
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index c0415ef..d98bf5b 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -105,7 +105,7 @@ namespace dbp
// shape collection (for grouping the shapes)
Reference< XShapes > xButtonCollection(m_xORB->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ShapeCollection"))),
+ ::rtl::OUString("com.sun.star.drawing.ShapeCollection")),
UNO_QUERY);
// first member : the shape of the control
xButtonCollection->add(_rContext.xObjectShape.get());
@@ -120,7 +120,7 @@ namespace dbp
::com::sun::star::awt::Point aButtonPosition;
aButtonPosition.X = aShapePosition.X + OFFSET;
- ::rtl::OUString sElementsName(RTL_CONSTASCII_USTRINGPARAM("RadioGroup"));
+ ::rtl::OUString sElementsName("RadioGroup");
disambiguateName(Reference< XNameAccess >(_rContext.xForm, UNO_QUERY), sElementsName);
StringArray::const_iterator aLabelIter = _rSettings.aLabels.begin();
@@ -130,28 +130,28 @@ namespace dbp
aButtonPosition.Y = aShapePosition.Y + (i+1) * nTempHeight + nTopSpace;
Reference< XPropertySet > xRadioModel(
- xDocFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.RadioButton"))),
+ xDocFactory->createInstance(::rtl::OUString("com.sun.star.form.component.RadioButton")),
UNO_QUERY);
// the label
- xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), makeAny(rtl::OUString(*aLabelIter)));
+ xRadioModel->setPropertyValue(::rtl::OUString("Label"), makeAny(rtl::OUString(*aLabelIter)));
// the value
- xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RefValue")), makeAny(rtl::OUString(*aValueIter)));
+ xRadioModel->setPropertyValue(::rtl::OUString("RefValue"), makeAny(rtl::OUString(*aValueIter)));
// default selection
if (_rSettings.sDefaultField == *aLabelIter)
- xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultState")), makeAny(sal_Int16(1)));
+ xRadioModel->setPropertyValue(::rtl::OUString("DefaultState"), makeAny(sal_Int16(1)));
// the connection to the database field
if (0 != _rSettings.sDBField.Len())
- xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataField")), makeAny(::rtl::OUString(_rSettings.sDBField)));
+ xRadioModel->setPropertyValue(::rtl::OUString("DataField"), makeAny(::rtl::OUString(_rSettings.sDBField)));
// the name for the model
- xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), makeAny(sElementsName));
+ xRadioModel->setPropertyValue(::rtl::OUString("Name"), makeAny(sElementsName));
// create a shape for the radio button
Reference< XControlShape > xRadioShape(
- xDocFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape"))),
+ xDocFactory->createInstance(::rtl::OUString("com.sun.star.drawing.ControlShape")),
UNO_QUERY);
Reference< XPropertySet > xShapeProperties(xRadioShape, UNO_QUERY);
@@ -166,7 +166,7 @@ namespace dbp
// the name of the shape
if (xShapeProperties.is())
- xShapeProperties->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), makeAny(sElementsName));
+ xShapeProperties->setPropertyValue(::rtl::OUString("Name"), makeAny(sElementsName));
// add to the page
xPageShapes->add(xRadioShape.get());
@@ -175,7 +175,7 @@ namespace dbp
// set the GroupBox as "LabelControl" for the RadioButton
// (_after_ having inserted the model into the page!)
- xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LabelControl")), makeAny(_rContext.xObjectModel));
+ xRadioModel->setPropertyValue(::rtl::OUString("LabelControl"), makeAny(_rContext.xObjectModel));
}
// group the shapes
@@ -199,7 +199,7 @@ namespace dbp
//---------------------------------------------------------------------
void OOptionGroupLayouter::implAnchorShape(const Reference< XPropertySet >& _rxShapeProps)
{
- static const ::rtl::OUString s_sAnchorPropertyName(RTL_CONSTASCII_USTRINGPARAM("AnchorType"));
+ static const ::rtl::OUString s_sAnchorPropertyName("AnchorType");
Reference< XPropertySetInfo > xPropertyInfo;
if (_rxShapeProps.is())
xPropertyInfo = _rxShapeProps->getPropertySetInfo();
diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx
index 8dc0c61..9bf2b4e 100644
--- a/extensions/source/dbpilots/wizardservices.cxx
+++ b/extensions/source/dbpilots/wizardservices.cxx
@@ -68,14 +68,14 @@ namespace dbp
//---------------------------------------------------------------------
::rtl::OUString OGroupBoxSI::getImplementationName() const
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbp.OGroupBoxWizard"));
+ return ::rtl::OUString("org.openoffice.comp.dbp.OGroupBoxWizard");
}
//---------------------------------------------------------------------
Sequence< ::rtl::OUString > OGroupBoxSI::getServiceNames() const
{
Sequence< ::rtl::OUString > aReturn(1);
- aReturn[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GroupBoxAutoPilot"));
+ aReturn[0] = ::rtl::OUString("com.sun.star.sdb.GroupBoxAutoPilot");
return aReturn;
}
@@ -85,14 +85,14 @@ namespace dbp
//---------------------------------------------------------------------
::rtl::OUString OListComboSI::getImplementationName() const
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbp.OListComboWizard"));
+ return ::rtl::OUString("org.openoffice.comp.dbp.OListComboWizard");
}
//---------------------------------------------------------------------
Sequence< ::rtl::OUString > OListComboSI::getServiceNames() const
{
Sequence< ::rtl::OUString > aReturn(1);
- aReturn[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ListComboBoxAutoPilot"));
+ aReturn[0] = ::rtl::OUString("com.sun.star.sdb.ListComboBoxAutoPilot");
return aReturn;
}
@@ -102,14 +102,14 @@ namespace dbp
//---------------------------------------------------------------------
::rtl::OUString OGridSI::getImplementationName() const
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbp.OGridWizard"));
+ return ::rtl::OUString("org.openoffice.comp.dbp.OGridWizard");
}
//---------------------------------------------------------------------
Sequence< ::rtl::OUString > OGridSI::getServiceNames() const
{
Sequence< ::rtl::OUString > aReturn(1);
- aReturn[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GridControlAutoPilot"));
+ aReturn[0] = ::rtl::OUString("com.sun.star.sdb.GridControlAutoPilot");
return aReturn;
}
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx
index 217a4bb..c916431 100644
--- a/extensions/source/plugin/base/context.cxx
+++ b/extensions/source/plugin/base/context.cxx
@@ -127,7 +127,7 @@ XPluginContext_Impl::~XPluginContext_Impl()
void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException )
{
- Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) );
+ Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString("com.sun.star.frame.Desktop") );
if( ! xInst.is() )
return;
@@ -154,7 +154,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu
try
{
::com::sun::star::beans::PropertyValue aValue;
- aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+ aValue.Name = ::rtl::OUString("Referer");
aValue.Value <<= pPlugin->getRefererURL();
Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 );
@@ -189,7 +189,7 @@ void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin
::rtl::OUString XPluginContext_Impl::getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/)
throw( ::com::sun::star::plugin::PluginException, RuntimeException )
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Mozilla 3.0"));
+ return ::rtl::OUString("Mozilla 3.0");
}
void XPluginContext_Impl::displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, const ::rtl::OUString& /*message*/)
@@ -220,7 +220,7 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl
}
}
- Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) );
+ Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString("com.sun.star.frame.Desktop") );
if( ! xInst.is() )
return ;
@@ -231,10 +231,10 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl
try
{
::com::sun::star::beans::PropertyValue aValues[2];
- aValues[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+ aValues[0].Name = ::rtl::OUString("Referer");
aValues[0].Value <<= pPlugin->getRefererURL();
- aValues[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostString"));
+ aValues[1].Name = ::rtl::OUString("PostString");
aValues[1].Value <<= ::rtl::OStringToOUString( (char*)( file ? aBuf : buf ).getConstArray(), m_aEncoding );
Sequence< ::com::sun::star::beans::PropertyValue > aArgs( aValues, 2 );
Reference< ::com::sun::star::lang::XComponent > xComp =
@@ -305,7 +305,7 @@ void FileSink::closeOutput() throw()
if( fp )
fclose( fp );
- Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) );
+ Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString("com.sun.star.frame.Desktop") );
Reference< ::com::sun::star::frame::XComponentLoader > xLoader( xInst, UNO_QUERY );
XPlugin_Impl* pPlugin = XPluginManager_Impl::getPluginImplementation( m_xPlugin );
@@ -314,7 +314,7 @@ void FileSink::closeOutput() throw()
try
{
::com::sun::star::beans::PropertyValue aValue;
- aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+ aValue.Name = ::rtl::OUString("Referer");
aValue.Value <<= pPlugin->getRefererURL();
Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 );
diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx
index 9d1b8fb..e2c5488 100644
--- a/extensions/source/plugin/base/manager.cxx
+++ b/extensions/source/plugin/base/manager.cxx
@@ -133,7 +133,7 @@ Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames(void)
Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames_Static(void) throw( )
{
Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager"));
+ aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.plugin.PluginManager");
return aSNS;
}
@@ -178,8 +178,8 @@ Sequence<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPlug
Sequence<com::sun::star::plugin::PluginDescription> aRet;
vcl::SettingsConfigItem* pCfg = vcl::SettingsConfigItem::get();
- rtl::OUString aVal( pCfg->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BrowserPlugins" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Disabled" ) ) ) );
+ rtl::OUString aVal( pCfg->getValue( rtl::OUString( "BrowserPlugins" ),
+ rtl::OUString( "Disabled" ) ) );
if( ! aVal.toBoolean() )
{
aRet = impl_getPluginDescriptions();
diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx
index d551add..296685c 100644
--- a/extensions/source/plugin/base/plmodel.cxx
+++ b/extensions/source/plugin/base/plmodel.cxx
@@ -56,7 +56,7 @@ Any PluginModel::queryAggregation( const Type& type ) throw( RuntimeException )
Sequence< ::rtl::OUString > PluginModel::getSupportedServiceNames_Static(void) throw()
{
Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginModel"));
+ aSNS.getArray()[0] = ::rtl::OUString("com.sun.star.plugin.PluginModel");
return aSNS;
}
@@ -188,7 +188,7 @@ void PluginModel::dispose(void) throw()
// ::com::sun::star::io::XPersistObject
::rtl::OUString PluginModel::getServiceName() throw()
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginModel"));
+ return ::rtl::OUString("com.sun.star.plugin.PluginModel");
}
void PluginModel::write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream) throw()
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index f6989c1..897be13 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -325,7 +325,7 @@ void XPlugin_Impl::handleSpecialArgs()
try
{
uno::Reference< XPropertySet > xProp( m_xModel, UNO_QUERY );
- Any aProp = xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) );
+ Any aProp = xProp->getPropertyValue( OUString( "URL" ) );
aProp >>= aURL;
}
catch(const UnknownPropertyException &)
@@ -395,7 +395,7 @@ void XPlugin_Impl::handleSpecialArgs()
try
{
uno::Reference< XPropertySet > xProp( m_xModel, UNO_QUERY );
- Any aProp = xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) );
+ Any aProp = xProp->getPropertyValue( OUString( "URL" ) );
aProp >>= aURL;
}
catch(const UnknownPropertyException &)
@@ -468,7 +468,7 @@ OUString XPlugin_Impl::getCreationURL()
uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY );
if( xPS.is() )
{
- Any aValue = xPS->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) );
+ Any aValue = xPS->getPropertyValue( OUString("URL") );
aValue >>= aRet;
}
return aRet;
@@ -666,9 +666,9 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype,
{
try
{
- xPS->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("URL")), aAny );
+ xPS->setPropertyValue( OUString("URL"), aAny );
aAny <<= mimetype;
- xPS->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE")), aAny );
+ xPS->setPropertyValue( OUString("TYPE"), aAny );
}
catch(...)
{
@@ -730,7 +730,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype,
{
Any aAny;
aAny <<= m_aDescription.Mimetype;
- xPS->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE")), aAny );
+ xPS->setPropertyValue( OUString("TYPE"), aAny );
}
catch(...)
{
@@ -893,7 +893,7 @@ void XPlugin_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_,
PluginDescription XPlugin_Impl::fitDescription( const OUString& rURL )
{
- uno::Reference< XPluginManager > xPMgr( m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")) ), UNO_QUERY );
+ uno::Reference< XPluginManager > xPMgr( m_xSMgr->createInstance( OUString("com.sun.star.plugin.PluginManager") ), UNO_QUERY );
if( !xPMgr.is() )
{
m_nProvidingState = PROVIDING_NONE;
@@ -1143,7 +1143,7 @@ PluginOutputStream::PluginOutputStream( XPlugin_Impl* pPlugin,
sal_uInt32 len,
sal_uInt32 lastmod ) :
PluginStream( pPlugin, url, len, lastmod ),
- m_xStream( pPlugin->getServiceManager()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataOutputStream")) ), UNO_QUERY )
+ m_xStream( pPlugin->getServiceManager()->createInstance( OUString("com.sun.star.io.DataOutputStream") ), UNO_QUERY )
{
Guard< Mutex > aGuard( m_pPlugin->getMutex() );
diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx
index 0891e99..b954b6a 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -401,7 +401,7 @@ Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(vo
rDescr.Description = aComment;
sal_Int32 nPos = 0, nLen = aExtToken.getLength();
- OUString aExtensions = nLen ? OUString(RTL_CONSTASCII_USTRINGPARAM("*.")) : OUString(RTL_CONSTASCII_USTRINGPARAM("*.*"));
+ OUString aExtensions = nLen ? OUString("*.") : OUString("*.*");
for ( ; nPos < nLen; ++nPos )
{
@@ -410,7 +410,7 @@ Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(vo
{
case ',':
case ';':
- aExtensions += OUString(RTL_CONSTASCII_USTRINGPARAM(";*."));
+ aExtensions += OUString(";*.");
case ' ':
break;
case '*':
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
index faf85d2..8841c10 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
@@ -73,7 +73,7 @@ namespace pcr
//---------------------------------------------------------------------
::rtl::OUString MasterDetailLinkDialog::getImplementationName_static() throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.MasterDetailLinkDialog"));
+ return ::rtl::OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog");
}
//---------------------------------------------------------------------
@@ -86,7 +86,7 @@ namespace pcr
::comphelper::StringSequence MasterDetailLinkDialog::getSupportedServiceNames_static() throw(RuntimeException)
{
::comphelper::StringSequence aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.MasterDetailLinkDialog"));
+ aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.form.MasterDetailLinkDialog");
return aSupported;
}
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index 1986741..3919a0e 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -95,7 +95,7 @@ namespace pcr
//---------------------------------------------------------------------
::rtl::OUString OControlFontDialog::getImplementationName_static() throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.OControlFontDialog"));
+ return ::rtl::OUString("org.openoffice.comp.form.ui.OControlFontDialog");
}
//---------------------------------------------------------------------
@@ -108,7 +108,7 @@ namespace pcr
::comphelper::StringSequence OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException)
{
::comphelper::StringSequence aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.ControlFontDialog"));
+ aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.form.ControlFontDialog");
return aSupported;
}
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index b9055d3..3389d48 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -100,14 +100,14 @@ namespace pcr
//------------------------------------------------------------------------
::rtl::OUString DefaultFormComponentInspectorModel::getImplementationName_static( ) throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"));
+ return ::rtl::OUString("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel");
}
//------------------------------------------------------------------------
Sequence< ::rtl::OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.form.inspection.DefaultFormComponentInspectorModel");
return aSupported;
}
diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx
index b1bb884..bcced92 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.cxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.cxx
@@ -88,14 +88,14 @@ namespace pcr
//------------------------------------------------------------------------
::rtl::OUString DefaultHelpProvider::getImplementationName_static( ) throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.DefaultHelpProvider"));
+ return ::rtl::OUString("org.openoffice.comp.extensions.DefaultHelpProvider");
}
//------------------------------------------------------------------------
Sequence< ::rtl::OUString > DefaultHelpProvider::getSupportedServiceNames_static( ) throw(RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.inspection.DefaultHelpProvider"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.inspection.DefaultHelpProvider");
return aSupported;
}
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 5b29ee2..ecc045a 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -293,7 +293,7 @@ namespace pcr
aScriptEvent.ScriptCode = aNewStyleSpec.makeStringAndClear();
// also, this new-style spec requires the script code to be "Script" instead of "StarBasic"
- aScriptEvent.ScriptType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Script" ) );
+ aScriptEvent.ScriptType = ::rtl::OUString( "Script" );
}
return aScriptEvent;
}
@@ -447,9 +447,9 @@ namespace pcr
Any aRet;
Sequence< PropertyValue > aScriptDescriptor( 2 );
- aScriptDescriptor[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EventType"));
+ aScriptDescriptor[0].Name = ::rtl::OUString("EventType");
aScriptDescriptor[0].Value <<= aDescriptor.ScriptType;
- aScriptDescriptor[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script"));
+ aScriptDescriptor[1].Name = ::rtl::OUString("Script");
aScriptDescriptor[1].Value <<= aDescriptor.ScriptCode;
return makeAny( aScriptDescriptor );
@@ -542,14 +542,14 @@ namespace pcr
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL EventHandler::getImplementationName_static( ) throw (RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.EventHandler" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.EventHandler" );
}
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL EventHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< ::rtl::OUString > aSupported( 1 );
- aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.EventHandler" ) );
+ aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.EventHandler" );
return aSupported;
}
@@ -716,9 +716,9 @@ namespace pcr
aComposeBuffer.append( xScriptUri->getName() );
// location
- const ::rtl::OUString sLocationParamName( RTL_CONSTASCII_USTRINGPARAM( "location" ) );
+ const ::rtl::OUString sLocationParamName( "location" );
const ::rtl::OUString sLocation = xScriptUri->getParameter( sLocationParamName );
- const ::rtl::OUString sLangParamName( RTL_CONSTASCII_USTRINGPARAM( "language" ) );
+ const ::rtl::OUString sLangParamName( "language" );
const ::rtl::OUString sLanguage = xScriptUri->getParameter( sLangParamName );
if ( !(sLocation.isEmpty() && sLanguage.isEmpty()) )
@@ -883,7 +883,7 @@ namespace pcr
aDescriptor.HelpURL = HelpIdUrl::getHelpURL( rEvent.sHelpId );
aDescriptor.PrimaryButtonId = rtl::OStringToOUString(rEvent.sUniqueBrowseId, RTL_TEXTENCODING_UTF8);
aDescriptor.HasPrimaryButton = sal_True;
- aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Events" ) );
+ aDescriptor.Category = ::rtl::OUString( "Events" );
return aDescriptor;
}
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index c977d28..4d13636 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -171,14 +171,14 @@ namespace pcr
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL FormComponentPropertyHandler::getImplementationName_static( ) throw (RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.extensions.FormComponentPropertyHandler" ) );
+ return ::rtl::OUString( "com.sun.star.comp.extensions.FormComponentPropertyHandler" );
}
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL FormComponentPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
Sequence< ::rtl::OUString > aSupported( 1 );
- aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.inspection.FormComponentPropertyHandler" ) );
+ aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.FormComponentPropertyHandler" );
return aSupported;
}
@@ -229,7 +229,7 @@ namespace pcr
if ( (eType == TypeClass_STRING || eType == TypeClass_SEQUENCE) &&
lcl_isLanguageDependentProperty( _rPropertyName ) )
{
- static const ::rtl::OUString s_sResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("ResourceResolver"));
+ static const ::rtl::OUString s_sResourceResolverPropName("ResourceResolver");
Reference< resource::XStringResourceResolver > xStringResourceResolver;
try
@@ -338,7 +338,7 @@ namespace pcr
if ( PROPERTY_ID_IMAGE_URL == nPropId && ( _rValue >>= xGrfObj ) )
{
DBG_ASSERT( xGrfObj.is(), "FormComponentPropertyHandler::setPropertyValue() xGrfObj is invalid");
- rtl::OUString sObjectID( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
+ rtl::OUString sObjectID( GRAPHOBJ_URLPREFIX );
sObjectID = sObjectID + xGrfObj->getUniqueID();
m_xComponent->setPropertyValue( _rPropertyName, uno::makeAny( sObjectID ) );
}
@@ -382,8 +382,8 @@ namespace pcr
// StringItemList?
else if( eType == TypeClass_SEQUENCE )
{
- static ::rtl::OUString aDot(RTL_CONSTASCII_USTRINGPARAM("."));
- static ::rtl::OUString aEsc(RTL_CONSTASCII_USTRINGPARAM("&"));
+ static ::rtl::OUString aDot(".");
+ static ::rtl::OUString aEsc("&");
// Put strings into resource using new ids
Sequence< ::rtl::OUString > aNewStrings;
@@ -1423,7 +1423,7 @@ namespace pcr
aDescriptor.HasSecondaryButton = sal_True;
bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0;
- aDescriptor.Category = bIsDataProperty ? ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Data")) : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("General"));
+ aDescriptor.Category = bIsDataProperty ? ::rtl::OUString("Data") : ::rtl::OUString("General");
return aDescriptor;
}
@@ -2170,7 +2170,7 @@ namespace pcr
for ( sal_Int32 i = 0; i < nKnownControlTypes; ++i )
{
- ::rtl::OUString sServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt." ) );
+ ::rtl::OUString sServiceName( "com.sun.star.awt." );
sServiceName += ::rtl::OUString::createFromAscii( aControlModelServiceNames[ i ] );
if ( xServiceInfo->supportsService( sServiceName ) )
@@ -2662,10 +2662,10 @@ namespace pcr
// initialize the dialog
Reference< XPropertySet > xDialogProps( xDialog, UNO_QUERY_THROW );
- xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "QueryComposer" ) ), makeAny( xComposer ) );
- xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RowSet" ) ), makeAny( m_xComponent ) );
- xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ) ), makeAny( VCLUnoHelper::GetInterface( impl_getDefaultDialogParent_nothrow() ) ) );
- xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ), makeAny( sPropertyUIName ) );
+ xDialogProps->setPropertyValue( ::rtl::OUString( "QueryComposer" ), makeAny( xComposer ) );
+ xDialogProps->setPropertyValue( ::rtl::OUString( "RowSet" ), makeAny( m_xComponent ) );
+ xDialogProps->setPropertyValue( ::rtl::OUString( "ParentWindow" ), makeAny( VCLUnoHelper::GetInterface( impl_getDefaultDialogParent_nothrow() ) ) );
+ xDialogProps->setPropertyValue( ::rtl::OUString( "Title" ), makeAny( sPropertyUIName ) );
_rClearBeforeDialog.clear();
bSuccess = ( xDialog->execute() != 0 );
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index acf83ae..556e646 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -136,21 +136,21 @@ namespace pcr
{
Sequence< ::rtl::OUString > aSupported( m_aServiceDescriptor.GetSupportedServiceNames() );
aSupported.realloc( aSupported.getLength() + 1 );
- aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.inspection.ObjectInspector" ) );
+ aSupported[ aSupported.getLength() - 1 ] = ::rtl::OUString( "com.sun.star.inspection.ObjectInspector" );
return aSupported;
}
//------------------------------------------------------------------------
::rtl::OUString FormController::getImplementationName_static( ) throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.FormController"));
+ return ::rtl::OUString("org.openoffice.comp.extensions.FormController");
}
//------------------------------------------------------------------------
Sequence< ::rtl::OUString > FormController::getSupportedServiceNames_static( ) throw(RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.PropertyBrowserController"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.form.PropertyBrowserController");
return aSupported;
}
@@ -271,14 +271,14 @@ namespace pcr
//------------------------------------------------------------------------
::rtl::OUString DialogController::getImplementationName_static( ) throw(RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.DialogController"));
+ return ::rtl::OUString("org.openoffice.comp.extensions.DialogController");
}
//------------------------------------------------------------------------
Sequence< ::rtl::OUString > DialogController::getSupportedServiceNames_static( ) throw(RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.PropertyBrowserController"));
+ aSupported[0] = ::rtl::OUString("com.sun.star.awt.PropertyBrowserController");
return aSupported;
}
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index 0309c9a..0f15f84 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list