Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING

Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd
Reviewed-on: https://gerrit.libreoffice.org/1924
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>

3 files changed, 8 insertions, 14 deletions

diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index b4fbde86ef52..ed17c86f531b 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -53,8 +53,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
-
 DocumentDigitalSignatures::DocumentDigitalSignatures( const Reference< XComponentContext >& rxCtx ):
     mxCtx(rxCtx),
     m_sODFVersion(ODFVER_012_TEXT),
@@ -68,7 +66,7 @@ void DocumentDigitalSignatures::initialize( const Sequence< Any >& aArguments)
 {
     if (aArguments.getLength() > 2)
         throw css::lang::IllegalArgumentException(
-        OUSTR("DocumentDigitalSignatures::initialize requires zero, one, or two arguments"),
+        "DocumentDigitalSignatures::initialize requires zero, one, or two arguments",
         Reference<XInterface>(static_cast<XInitialization*>(this), UNO_QUERY), 0);
 
     m_nArgumentsCount = aArguments.getLength();
@@ -77,13 +75,13 @@ void DocumentDigitalSignatures::initialize( const Sequence< Any >& aArguments)
     {
         if (!(aArguments[0] >>= m_sODFVersion))
             throw css::lang::IllegalArgumentException(
-                OUSTR("DocumentDigitalSignatures::initialize: the first arguments must be a string"),
+                "DocumentDigitalSignatures::initialize: the first arguments must be a string",
                 Reference<XInterface>(static_cast<XInitialization*>(this), UNO_QUERY), 0);
 
         if (aArguments.getLength() == 2
             && !(aArguments[1] >>= m_bHasDocumentSignature))
             throw css::lang::IllegalArgumentException(
-                OUSTR("DocumentDigitalSignatures::initialize: the second arguments must be a bool"),
+                "DocumentDigitalSignatures::initialize: the second arguments must be a bool",
                 Reference<XInterface>(static_cast<XInitialization*>(this), UNO_QUERY), 1);
 
         //the Version is supported as of ODF1.2, so for and 1.1 document or older we will receive the
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index cf8f692b8ecc..03b8fbfdff46 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -58,8 +58,6 @@
 #include <unotools/configitem.hxx>
 #include <comphelper/componentcontext.hxx>
 
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
-
 
 /* HACK: disable some warnings for MS-C */
 #ifdef _MSC_VER
@@ -146,7 +144,7 @@ bool DigitalSignaturesDialog::isXML(const rtl::OUString& rURI )
         }
         if (DocumentSignatureHelper::equalsReferenceUriManifestPath(rURI, sPath))
         {
-            bIsXML = sMediaType.equals(OUSTR("text/xml")) && ! bEncrypted;
+            bIsXML = sMediaType.equals("text/xml") && ! bEncrypted;
             bPropsAvailable = true;
             break;
         }
@@ -272,10 +270,10 @@ void DigitalSignaturesDialog::SetStorage( const com::sun::star::uno::Reference <
 
     //Get the manifest.xml
     Reference < css::embed::XStorage > xSubStore(rxStore->openStorageElement(
-                OUSTR("META-INF"), css::embed::ElementModes::READ), UNO_QUERY_THROW);
+                "META-INF", css::embed::ElementModes::READ), UNO_QUERY_THROW);
 
     Reference< css::io::XInputStream > xStream(
-        xSubStore->openStreamElement(OUSTR("manifest.xml"), css::embed::ElementModes::READ),
+        xSubStore->openStreamElement("manifest.xml", css::embed::ElementModes::READ),
         UNO_QUERY_THROW);
 
     m_manifest = xReader->readManifestSequence(xStream);
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index 23363e7cc829..bf9b518cfc2b 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -39,8 +39,6 @@ using ::rtl::OUString ;
 using ::com::sun::star::security::XCertificate ;
 using ::com::sun::star::util::DateTime ;
 
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
-
 /*Resturns the index withing rRawString where sTypeName starts and where it ends.
     The starting index is pair.first. The ending index in pair.second points
     one char after the last character of the type.
@@ -153,12 +151,12 @@ findTypeInDN(const OUString& rRawString, const OUString& sTypeName)
 
 OUString replaceTagSWithTagST(OUString oldDN)
 {
-    std::pair<sal_Int32, sal_Int32 > pairIndex = findTypeInDN(oldDN, OUSTR("S"));
+    std::pair<sal_Int32, sal_Int32 > pairIndex = findTypeInDN(oldDN, "S");
 
     if (pairIndex.first != -1)
     {
         OUString newDN = oldDN.copy(0, pairIndex.first);
-        newDN += OUSTR("ST");
+        newDN += "ST";
         newDN += oldDN.copy(pairIndex.second);
         return newDN;
     }