[Libreoffice-commits] .: 2 commits - extensions/source package/source

[Caolán McNamara]

 extensions/source/oooimprovement/onlogrotate_job.cxx |    2 +-
 package/source/zipapi/ZipFile.cxx                    |    4 ++--
 package/source/zipapi/blowfishcontext.cxx            |    6 +++---
 package/source/zipapi/sha1context.cxx                |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 72da24c2308dc776cba5b31faf48ac49590a7066
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jun 11 00:07:53 2011 +0100

    createFromAscii -> RTL_CONSTASCII_USTRINGPARAM

diff --git a/extensions/source/oooimprovement/onlogrotate_job.cxx b/extensions/source/oooimprovement/onlogrotate_job.cxx
index 9ada204..c13690e 100644
--- a/extensions/source/oooimprovement/onlogrotate_job.cxx
+++ b/extensions/source/oooimprovement/onlogrotate_job.cxx
@@ -201,7 +201,7 @@ namespace oooimprovement
         throw(RuntimeException)
     {
         Reference<XDesktop> xDesktop(
-            m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.frame.Desktop")),
+            m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))),
             UNO_QUERY);
         if(xDesktop.is())
             xDesktop->addTerminateListener(Reference<XTerminateListener>(new OnLogRotateThreadWatcher(m_ServiceFactory)));
commit d3a7ab7ccd6fbf21e846f8399ec63a67033af659
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 10 23:32:49 2011 +0100

    createFromAscii -> RTL_CONSTASCII_USTRINGPARAM

diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 61a385d..91ffb42 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -168,7 +168,7 @@ uno::Reference< xml::crypto::XCipherContext > ZipFile::StaticGetCipher( const un
                             xEncryptionData->m_aSalt.getLength(),
                             xEncryptionData->m_nIterationCount ) )
         {
-            throw ZipIOException( ::rtl::OUString::createFromAscii( "Can not create derived key!\n" ),
+            throw ZipIOException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not create derived key!") ),
                                   uno::Reference< XInterface >() );
         }
 
@@ -190,7 +190,7 @@ uno::Reference< xml::crypto::XCipherContext > ZipFile::StaticGetCipher( const un
         }
         else
         {
-            throw ZipIOException( ::rtl::OUString::createFromAscii( "Unknown cipher algorithm is requested!\n" ),
+            throw ZipIOException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown cipher algorithm is requested!") ),
                                   uno::Reference< XInterface >() );
         }
     }
diff --git a/package/source/zipapi/blowfishcontext.cxx b/package/source/zipapi/blowfishcontext.cxx
index 1739bb1..6459cc4 100644
--- a/package/source/zipapi/blowfishcontext.cxx
+++ b/package/source/zipapi/blowfishcontext.cxx
@@ -41,7 +41,7 @@ uno::Reference< xml::crypto::XCipherContext > BlowfishCFB8CipherContext::Create(
     ::rtl::Reference< BlowfishCFB8CipherContext > xResult = new BlowfishCFB8CipherContext();
     xResult->m_pCipher = rtl_cipher_create( rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeStream );
     if ( !xResult->m_pCipher )
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii( "Can not create cipher!\n" ),
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not create cipher!")),
                                      uno::Reference< XInterface >() );
 
     if ( rtl_Cipher_E_None != rtl_cipher_init(
@@ -52,7 +52,7 @@ uno::Reference< xml::crypto::XCipherContext > BlowfishCFB8CipherContext::Create(
                                 reinterpret_cast< const sal_uInt8* >( aInitVector.getConstArray() ),
                                 aInitVector.getLength() ) )
     {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii( "Can not initialize cipher!\n" ),
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not initialize cipher!") ),
                                      uno::Reference< XInterface >() );
     }
 
@@ -99,7 +99,7 @@ uno::Sequence< sal_Int8 > SAL_CALL BlowfishCFB8CipherContext::convertWithCipherC
 
     if ( rtl_Cipher_E_None != nError )
     {
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii( "Can not decrypt/encrypt with cipher!\n" ),
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not decrypt/encrypt with cipher!") ),
                                      uno::Reference< uno::XInterface >() );
     }
 
diff --git a/package/source/zipapi/sha1context.cxx b/package/source/zipapi/sha1context.cxx
index a71f20a..0e34fd4 100644
--- a/package/source/zipapi/sha1context.cxx
+++ b/package/source/zipapi/sha1context.cxx
@@ -41,7 +41,7 @@ uno::Reference< xml::crypto::XDigestContext > SHA1DigestContext::Create()
     ::rtl::Reference< SHA1DigestContext > xResult = new SHA1DigestContext();
     xResult->m_pDigest = rtl_digest_createSHA1();
     if ( !xResult->m_pDigest )
-        throw uno::RuntimeException( ::rtl::OUString::createFromAscii( "Can not create cipher!\n" ),
+        throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not create cipher!") ),
                                      uno::Reference< XInterface >() );
 
     return uno::Reference< xml::crypto::XDigestContext >( xResult.get() );