diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 11:39:07 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 10:48:30 +0000 |
commit | 39d45390f4fab1e9e85f211d74ed2c08fda5b652 (patch) | |
tree | ac4b224a66a18429cd4722a61ee3d401f8e9951c /svtools/source/dialogs | |
parent | 5c908d0431ee975c1ee7aa245af83b9eb7f95da6 (diff) |
removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations
s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms
Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b
Reviewed-on: https://gerrit.libreoffice.org/2835
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'svtools/source/dialogs')
-rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 6 | ||||
-rw-r--r-- | svtools/source/dialogs/colrdlg.cxx | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/insdlg.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 639ddfe8dca9..74984e68b55e 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -346,7 +346,7 @@ void AssignmentPersistentData::Commit() ::rtl::OUString sAssignment; if (hasFieldAssignment(_rLogicalName)) { - ::rtl::OUString sFieldPath(RTL_CONSTASCII_USTRINGPARAM("Fields/")); + ::rtl::OUString sFieldPath("Fields/"); sFieldPath += _rLogicalName; sFieldPath += ::rtl::OUString("/AssignedFieldName"); sAssignment = getStringProperty(sFieldPath); @@ -417,7 +417,7 @@ void AssignmentPersistentData::Commit() } // Fields - ::rtl::OUString sDescriptionNodePath(RTL_CONSTASCII_USTRINGPARAM("Fields")); + ::rtl::OUString sDescriptionNodePath("Fields"); // Fields/<field> ::rtl::OUString sFieldElementNodePath(sDescriptionNodePath); @@ -449,7 +449,7 @@ void AssignmentPersistentData::Commit() // nothing to do return; - ::rtl::OUString sDescriptionNodePath(RTL_CONSTASCII_USTRINGPARAM("Fields")); + ::rtl::OUString sDescriptionNodePath("Fields"); Sequence< ::rtl::OUString > aNames(&_rLogicalName, 1); ClearNodeElements(sDescriptionNodePath, aNames); } diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index 92c64ff6f177..38e738e1a102 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -76,7 +76,7 @@ short SvColorDialog::Execute() short ret = 0; try { - const OUString sColor( RTL_CONSTASCII_USTRINGPARAM( "Color" ) ); + const OUString sColor( "Color" ); Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference< com::sun::star::awt::XWindow > xParent( VCLUnoHelper::GetInterface( mpParent ) ); diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index 29078cc949dd..b268cc4b2a3e 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -105,7 +105,7 @@ void SvObjectServerList::FillInsertObjects() uno::Reference< lang::XMultiServiceFactory > sProviderMSFactory = configuration::theDefaultProvider::get(xContext); - ::rtl::OUString sReaderService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" )); + ::rtl::OUString sReaderService( "com.sun.star.configuration.ConfigurationAccess" ); uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aPathProp; aPathProp.Name = ::rtl::OUString( "nodepath" ); @@ -121,10 +121,10 @@ void SvObjectServerList::FillInsertObjects() uno::Sequence< ::rtl::OUString > seqNames= xNameAccess->getElementNames(); sal_Int32 nInd; - ::rtl::OUString aStringProductName( RTL_CONSTASCII_USTRINGPARAM( "%PRODUCTNAME" ) ); + ::rtl::OUString aStringProductName( "%PRODUCTNAME" ); sal_Int32 nStringProductNameLength = aStringProductName.getLength(); - ::rtl::OUString aStringProductVersion( RTL_CONSTASCII_USTRINGPARAM( "%PRODUCTVERSION" ) ); + ::rtl::OUString aStringProductVersion( "%PRODUCTVERSION" ); sal_Int32 nStringProductVersionLength = aStringProductVersion.getLength(); for( nInd = 0; nInd < seqNames.getLength(); nInd++ ) |