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 /xmlsecurity | |
| 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 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 10 | ||||
| -rw-r--r-- | xmlsecurity/source/dialogs/resourcemanager.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index f70965f9b6d7..3adc177db5c3 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -90,7 +90,7 @@ void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString > SaveODFItem::SaveODFItem(): utl::ConfigItem(::rtl::OUString( "Office.Common/Save")), m_nODF(0) { - OUString sDef(RTL_CONSTASCII_USTRINGPARAM("ODF/DefaultVersion")); + OUString sDef("ODF/DefaultVersion"); Sequence< css::uno::Any > aValues = GetProperties( Sequence<OUString>(&sDef,1) ); if ( aValues.getLength() == 1) { @@ -121,9 +121,9 @@ bool DigitalSignaturesDialog::isXML(const rtl::OUString& rURI ) bool bIsXML = false; bool bPropsAvailable = false; - const OUString sPropFullPath(RTL_CONSTASCII_USTRINGPARAM("FullPath")); - const OUString sPropMediaType(RTL_CONSTASCII_USTRINGPARAM("MediaType")); - const OUString sPropDigest(RTL_CONSTASCII_USTRINGPARAM("Digest")); + const OUString sPropFullPath("FullPath"); + const OUString sPropMediaType("MediaType"); + const OUString sPropDigest("Digest"); for (int i = 0; i < m_manifest.getLength(); i++) { @@ -156,7 +156,7 @@ bool DigitalSignaturesDialog::isXML(const rtl::OUString& rURI ) //Files can only be encrypted if they are in the manifest.xml. //That is, the current file cannot be encrypted, otherwise bPropsAvailable //would be true. - OUString aXMLExt( RTL_CONSTASCII_USTRINGPARAM( "XML" ) ); + OUString aXMLExt( "XML" ); sal_Int32 nSep = rURI.lastIndexOf( '.' ); if ( nSep != (-1) ) { diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index ab85dca66dea..817ec2be3712 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -85,7 +85,7 @@ namespace XmlSec { vector< pair< OUString, OUString > > vecAttrValueOfDN = parseDN(rRawString); ::rtl::OUStringBuffer s1, s2; - OUString sEqual(RTL_CONSTASCII_USTRINGPARAM(" = ")); + OUString sEqual(" = "); typedef vector< pair < OUString, OUString > >::const_iterator CIT; for (CIT i = vecAttrValueOfDN.begin(); i < vecAttrValueOfDN.end(); ++i) { |