diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:22:44 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:00:26 +0000 |
| commit | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch) | |
| tree | 2dbddceebf0f96492adc5652697e8efce8a8ba06 /xmlsecurity/source/helper | |
| parent | WaE: Potentially uninitialized local variable (diff) | |
| download | core-8b27d78b4afaa9c47ca0fda144c8060f2f14046b.tar.gz core-8b27d78b4afaa9c47ca0fda144c8060f2f14046b.zip | |
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex:
s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms
Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'xmlsecurity/source/helper')
| -rw-r--r-- | xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 10 | ||||
| -rw-r--r-- | xmlsecurity/source/helper/xsecparser.cxx | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx index 0af5650188ef..edc6ee371301 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx @@ -87,7 +87,7 @@ void SAL_CALL ImplXMLSignatureListener::endDocument( ) void SAL_CALL ImplXMLSignatureListener::startElement( const rtl::OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) { - if ( aName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Signature")) ) + if ( aName == rtl::OUString("Signature") ) { maStartVerifySignatureElementListener.Call( (void*)&xAttribs ); } @@ -195,8 +195,8 @@ uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno const ::rtl::OUString sName = ::rtl::Uri::decode( rURI, rtl_UriDecodeStrict, rtl_UriCharClassRelSegment); if (sName.isEmpty() && !rURI.isEmpty()) - throw uno::Exception(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Could not decode URI for stream element.")), 0); + throw uno::Exception(::rtl::OUString( + "Could not decode URI for stream element."), 0); uno::Reference< io::XStream > xStream; xStream = rxStore->cloneStreamElement( sName ); @@ -210,8 +210,8 @@ uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno rURI.copy( 0, nSepPos ), rtl_UriDecodeStrict, rtl_UriCharClassRelSegment); if (aStoreName.isEmpty() && !rURI.isEmpty()) throw uno::Exception( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "Could not decode URI for stream element.")), 0); + ::rtl::OUString( + "Could not decode URI for stream element."), 0); rtl::OUString aElement = rURI.copy( nSepPos+1 ); uno::Reference < embed::XStorage > xSubStore = rxStore->openStorageElement( aStoreName, embed::ElementModes::READ ); diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx index bb8aec5a31ce..547ec823580a 100644 --- a/xmlsecurity/source/helper/xsecparser.cxx +++ b/xmlsecurity/source/helper/xsecparser.cxx @@ -171,7 +171,7 @@ void SAL_CALL XSecParser::startElement( } } else if (aName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC)) - +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":")) + +rtl::OUString(":") +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE))) { m_ouDate = rtl::OUString(); @@ -187,14 +187,14 @@ void SAL_CALL XSecParser::startElement( {//getCaughtException MUST be the first line in the catch block cssu::Any exc = cppu::getCaughtException(); throw cssxs::SAXException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "xmlsecurity: Exception in XSecParser::startElement")), + rtl::OUString( + "xmlsecurity: Exception in XSecParser::startElement"), 0, exc); } catch (...) { throw cssxs::SAXException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("xmlsecurity: unexpected exception in XSecParser::startElement")), 0, + rtl::OUString("xmlsecurity: unexpected exception in XSecParser::startElement"), 0, cssu::Any()); } } @@ -246,7 +246,7 @@ void SAL_CALL XSecParser::endElement( const rtl::OUString& aName ) m_bInX509Certificate = false; } else if (aName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC)) - +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":")) + +rtl::OUString(":") +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE))) { m_pXSecController->setDate( m_ouDate ); @@ -262,14 +262,14 @@ void SAL_CALL XSecParser::endElement( const rtl::OUString& aName ) {//getCaughtException MUST be the first line in the catch block cssu::Any exc = cppu::getCaughtException(); throw cssxs::SAXException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "xmlsecurity: Exception in XSecParser::endElement")), + rtl::OUString( + "xmlsecurity: Exception in XSecParser::endElement"), 0, exc); } catch (...) { throw cssxs::SAXException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("xmlsecurity: unexpected exception in XSecParser::endElement")), 0, + rtl::OUString("xmlsecurity: unexpected exception in XSecParser::endElement"), 0, cssu::Any()); } } |