[Libreoffice-commits] .: 2 commits - framework/source ucb/source

[Caolán McNamara]

 framework/source/jobs/jobdata.cxx |   14 +++++++-------
 ucb/source/regexp/regexp.cxx      |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 4f92810206551a78c0828a09892ee867439ad2a2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 22 12:38:29 2010 +0000

    these ones aren't candidates for RTL_CONSTAS, the args are pointers

diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index be79697..5259546 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -181,7 +181,7 @@ void JobData::setAlias( const ::rtl::OUString& sAlias )
 
     // try to open the configuration set of this job directly and get a property access to it
     // We open it readonly here
-    ::rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM(JOBCFG_ROOT));
+    ::rtl::OUString sKey(::rtl::OUString::createFromAscii(JOBCFG_ROOT));
     sKey += ::utl::wrapConfigurationElementName(m_sAlias);
 
     ConfigAccess aConfig(m_xSMGR, sKey);
@@ -198,11 +198,11 @@ void JobData::setAlias( const ::rtl::OUString& sAlias )
         css::uno::Any aValue;
 
         // read uno implementation name
-        aValue   = xJobProperties->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(JOBCFG_PROP_SERVICE)));
+        aValue   = xJobProperties->getPropertyValue(::rtl::OUString::createFromAscii(JOBCFG_PROP_SERVICE));
         aValue >>= m_sService;
 
         // read whole argument list
-        aValue = xJobProperties->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(JOBCFG_PROP_ARGUMENTS)));
+        aValue = xJobProperties->getPropertyValue(::rtl::OUString::createFromAscii(JOBCFG_PROP_ARGUMENTS));
         css::uno::Reference< css::container::XNameAccess > xArgumentList;
         if (
             (aValue >>= xArgumentList)  &&
@@ -311,7 +311,7 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >&
         // It doesn't matter if this config object was already opened before.
         // It doesn nothing here then ... or it change the mode automaticly, if
         // it was opened using another one before.
-        ::rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM(JOBCFG_ROOT));
+        ::rtl::OUString sKey(::rtl::OUString::createFromAscii(JOBCFG_ROOT));
         sKey += ::utl::wrapConfigurationElementName(m_sAlias);
 
         ConfigAccess aConfig(m_xSMGR, sKey);
@@ -479,11 +479,11 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const
         lConfig.realloc(2);
         sal_Int32 i = 0;
 
-        lConfig[i].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_ALIAS));
+        lConfig[i].Name = ::rtl::OUString::createFromAscii(PROP_ALIAS);
         lConfig[i].Value <<= m_sAlias;
         ++i;
 
-        lConfig[i].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_SERVICE));
+        lConfig[i].Name = ::rtl::OUString::createFromAscii(PROP_SERVICE);
         lConfig[i].Value <<= m_sService;
         ++i;
     }
@@ -554,7 +554,7 @@ void JobData::disableJob()
         // Convert and write the user timestamp to the configuration.
         css::uno::Any aValue;
         aValue <<= Converter::convert_DateTime2ISO8601(DateTime());
-        xPropSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(EVENTCFG_PROP_USERTIME)), aValue);
+        xPropSet->setPropertyValue(::rtl::OUString::createFromAscii(EVENTCFG_PROP_USERTIME), aValue);
     }
 
     aConfig.close();
commit 9f90f92ad2f7d8081e444ae727acef0141d4c5db
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 22 12:14:44 2010 +0000

    WaE, && ||

diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx
index 4720196..b61772e 100644
--- a/ucb/source/regexp/regexp.cxx
+++ b/ucb/source/regexp/regexp.cxx
@@ -61,7 +61,7 @@ inline Regexp::Regexp(Kind eTheKind, rtl::OUString const & rThePrefix,
     m_bTranslation(bTheTranslation)
 {
     OSL_ASSERT(m_eKind == KIND_DOMAIN
-               || !m_bEmptyDomain && m_aInfix.getLength() == 0);
+               || (!m_bEmptyDomain && m_aInfix.getLength() == 0));
     OSL_ASSERT(m_bTranslation || m_aReversePrefix.getLength() == 0);
 }