[Libreoffice-commits] .: framework/source
David Tardon
dtardon at kemper.freedesktop.org
Sun Nov 21 01:04:35 PST 2010
framework/source/jobs/jobdata.cxx | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 75de4f13901c7e95c45b6996d30131e462af3c74
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun Nov 21 10:04:29 2010 +0100
RTL_CONSTASCII_USTRINGPARAM for libs-core/framework
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 55cda74..09b2165 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -182,7 +182,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;
- sKey = ::rtl::OUString::createFromAscii(JOBCFG_ROOT);
+ sKey = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(JOBCFG_ROOT));
sKey += ::utl::wrapConfigurationElementName(m_sAlias);
ConfigAccess aConfig(m_xSMGR, sKey);
@@ -199,11 +199,11 @@ void JobData::setAlias( const ::rtl::OUString& sAlias )
css::uno::Any aValue;
// read uno implementation name
- aValue = xJobProperties->getPropertyValue(::rtl::OUString::createFromAscii(JOBCFG_PROP_SERVICE));
+ aValue = xJobProperties->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(JOBCFG_PROP_SERVICE)));
aValue >>= m_sService;
// read whole argument list
- aValue = xJobProperties->getPropertyValue(::rtl::OUString::createFromAscii(JOBCFG_PROP_ARGUMENTS));
+ aValue = xJobProperties->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(JOBCFG_PROP_ARGUMENTS)));
css::uno::Reference< css::container::XNameAccess > xArgumentList;
if (
(aValue >>= xArgumentList) &&
@@ -313,7 +313,7 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >&
// It doesn nothing here then ... or it change the mode automaticly, if
// it was opened using another one before.
::rtl::OUString sKey;
- sKey = ::rtl::OUString::createFromAscii(JOBCFG_ROOT);
+ sKey = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(JOBCFG_ROOT));
sKey += ::utl::wrapConfigurationElementName(m_sAlias);
ConfigAccess aConfig(m_xSMGR, sKey);
@@ -481,11 +481,11 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const
lConfig.realloc(2);
sal_Int32 i = 0;
- lConfig[i].Name = ::rtl::OUString::createFromAscii(PROP_ALIAS);
+ lConfig[i].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_ALIAS));
lConfig[i].Value <<= m_sAlias;
++i;
- lConfig[i].Name = ::rtl::OUString::createFromAscii(PROP_SERVICE);
+ lConfig[i].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_SERVICE));
lConfig[i].Value <<= m_sService;
++i;
}
@@ -556,7 +556,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::createFromAscii(EVENTCFG_PROP_USERTIME), aValue);
+ xPropSet->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(EVENTCFG_PROP_USERTIME)), aValue);
}
aConfig.close();
More information about the Libreoffice-commits
mailing list