[Libreoffice-commits] .: binfilter/bf_so3 binfilter/bf_svtools
Gert Faller
gfaller at kemper.freedesktop.org
Fri Dec 3 07:30:23 PST 2010
binfilter/bf_so3/source/persist/binddata.cxx | 18 ++---
binfilter/bf_so3/source/persist/transprt.cxx | 4 -
binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigCache.cxx | 2
binfilter/bf_svtools/source/numbers/svt_numfmuno.cxx | 34 +++++-----
4 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit 652cdc598af0a6be7b95cc37ce8b0206db7897be
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Fri Dec 3 16:29:42 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in filters 20
diff --git a/binfilter/bf_so3/source/persist/binddata.cxx b/binfilter/bf_so3/source/persist/binddata.cxx
index 05750f2..dd2db9a 100644
--- a/binfilter/bf_so3/source/persist/binddata.cxx
+++ b/binfilter/bf_so3/source/persist/binddata.cxx
@@ -437,7 +437,7 @@ Reference<ifc_type> SvBindingData_Impl::getConfigManager_Impl (void)
try
{
m_xManager = m_xFactory->createInstance (
- OUString::createFromAscii (INIMANAGER_SERVICE_NAME));
+ OUString(RTL_CONSTASCII_USTRINGPARAM (INIMANAGER_SERVICE_NAME)));
if (m_xManager.is())
{
readConfigManager_Impl();
@@ -514,13 +514,13 @@ void SvBindingData_Impl::initConfigManager_Impl (void)
try
{
xConfig->addPropertyChangeListener (
- OUString::createFromAscii (STR_KEY_INET_PROXYTYPE), this);
+ OUString(RTL_CONSTASCII_USTRINGPARAM (STR_KEY_INET_PROXYTYPE)), this);
xConfig->addPropertyChangeListener (
- OUString::createFromAscii (STR_KEY_INET_NOPROXY), this);
+ OUString(RTL_CONSTASCII_USTRINGPARAM (STR_KEY_INET_NOPROXY)), this);
xConfig->addPropertyChangeListener (
- OUString::createFromAscii (STR_KEY_INET_FTPPROXYNAME), this);
+ OUString(RTL_CONSTASCII_USTRINGPARAM (STR_KEY_INET_FTPPROXYNAME)), this);
xConfig->addPropertyChangeListener (
- OUString::createFromAscii (STR_KEY_INET_FTPPROXYPORT), this);
+ OUString(RTL_CONSTASCII_USTRINGPARAM (STR_KEY_INET_FTPPROXYPORT)), this);
}
catch (Exception)
{
@@ -539,13 +539,13 @@ void SvBindingData_Impl::dispose (void)
try
{
xConfig->removePropertyChangeListener (
- OUString::createFromAscii (STR_KEY_INET_PROXYTYPE), this);
+ OUString(RTL_CONSTASCII_USTRINGPARAM (STR_KEY_INET_PROXYTYPE)), this);
xConfig->removePropertyChangeListener (
- OUString::createFromAscii (STR_KEY_INET_NOPROXY), this);
+ OUString(RTL_CONSTASCII_USTRINGPARAM (STR_KEY_INET_NOPROXY)), this);
xConfig->removePropertyChangeListener (
- OUString::createFromAscii (STR_KEY_INET_FTPPROXYNAME), this);
+ OUString(RTL_CONSTASCII_USTRINGPARAM (STR_KEY_INET_FTPPROXYNAME)), this);
xConfig->removePropertyChangeListener (
- OUString::createFromAscii (STR_KEY_INET_FTPPROXYPORT), this);
+ OUString(RTL_CONSTASCII_USTRINGPARAM (STR_KEY_INET_FTPPROXYPORT)), this);
}
catch (Exception)
{
diff --git a/binfilter/bf_so3/source/persist/transprt.cxx b/binfilter/bf_so3/source/persist/transprt.cxx
index 72739b8..e498fe5 100644
--- a/binfilter/bf_so3/source/persist/transprt.cxx
+++ b/binfilter/bf_so3/source/persist/transprt.cxx
@@ -1342,8 +1342,8 @@ void UcbTransport_Impl::start (void)
{
m_aContentType = getContentType_Impl (xProcessor);
if (m_aContentType.getLength() == 0)
- m_aContentType = OUString::createFromAscii(
- CONTENT_TYPE_STR_APP_OCTSTREAM);
+ m_aContentType = OUString(RTL_CONSTASCII_USTRINGPARAM(
+ CONTENT_TYPE_STR_APP_OCTSTREAM));
m_bMimeAvail = sal_True;
xProps->addPropertiesChangeListener (Sequence<OUString>(), this);
}
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigCache.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigCache.cxx
index 64d2f83..879679c 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigCache.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigCache.cxx
@@ -109,7 +109,7 @@ sal_Bool FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUSt
if ( sFilterName.EqualsIgnoreCaseAscii( *pPtr ) )
bIsPixelFormat = sal_True;
}
- String aTemp( OUString::createFromAscii( SVLIBRARY( "?" ) ) );
+ String aTemp( OUString(RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "?" )) ) );
xub_StrLen nIndex = aTemp.Search( (sal_Unicode)'?' );
aTemp.Replace( nIndex, 1, sFilterName );
sFilterName = aTemp;
diff --git a/binfilter/bf_svtools/source/numbers/svt_numfmuno.cxx b/binfilter/bf_svtools/source/numbers/svt_numfmuno.cxx
index 0bc4388..7b4decd 100644
--- a/binfilter/bf_svtools/source/numbers/svt_numfmuno.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_numfmuno.cxx
@@ -419,7 +419,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SvNumberFormatterServiceObj::getSupportedS
{
uno::Sequence<rtl::OUString> aRet(1);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString::createFromAscii(SERVICENAME_NUMBERFORMATTER);
+ pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERFORMATTER));
return aRet;
}
@@ -709,7 +709,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SvNumberFormatsObj::getSupportedServiceNam
{
uno::Sequence<rtl::OUString> aRet(1);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString::createFromAscii(SERVICENAME_NUMBERFORMATS);
+ pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERFORMATS));
return aRet;
}
@@ -911,31 +911,31 @@ uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValue
uno::Sequence<beans::PropertyValue> aSeq(13);
beans::PropertyValue* pArray = aSeq.getArray();
- pArray[0].Name = rtl::OUString::createFromAscii( PROPERTYNAME_FMTSTR );
+ pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_FMTSTR ));
pArray[0].Value <<= rtl::OUString( aFmtStr );
- pArray[1].Name = rtl::OUString::createFromAscii( PROPERTYNAME_LOCALE );
+ pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_LOCALE ));
pArray[1].Value <<= aLocale;
- pArray[2].Name = rtl::OUString::createFromAscii( PROPERTYNAME_TYPE );
+ pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_TYPE ));
pArray[2].Value <<= (sal_Int16)( pFormat->GetType() );
- pArray[3].Name = rtl::OUString::createFromAscii( PROPERTYNAME_COMMENT );
+ pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_COMMENT ));
pArray[3].Value <<= rtl::OUString( aComment );
- pArray[4].Name = rtl::OUString::createFromAscii( PROPERTYNAME_STDFORM );
+ pArray[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_STDFORM ));
pArray[4].Value.setValue( &bStandard, getBooleanCppuType() );
- pArray[5].Name = rtl::OUString::createFromAscii( PROPERTYNAME_USERDEF );
+ pArray[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_USERDEF ));
pArray[5].Value.setValue( &bUserDef, getBooleanCppuType() );
- pArray[6].Name = rtl::OUString::createFromAscii( PROPERTYNAME_DECIMALS );
+ pArray[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_DECIMALS ));
pArray[6].Value <<= (sal_Int16)( nDecimals );
- pArray[7].Name = rtl::OUString::createFromAscii( PROPERTYNAME_LEADING );
+ pArray[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_LEADING ));
pArray[7].Value <<= (sal_Int16)( nLeading );
- pArray[8].Name = rtl::OUString::createFromAscii( PROPERTYNAME_NEGRED );
+ pArray[8].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_NEGRED ));
pArray[8].Value.setValue( &bRed, getBooleanCppuType() );
- pArray[9].Name = rtl::OUString::createFromAscii( PROPERTYNAME_THOUS );
+ pArray[9].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_THOUS ));
pArray[9].Value.setValue( &bThousand, getBooleanCppuType() );
- pArray[10].Name = rtl::OUString::createFromAscii( PROPERTYNAME_CURRSYM );
+ pArray[10].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_CURRSYM ));
pArray[10].Value <<= rtl::OUString( aSymbol );
- pArray[11].Name = rtl::OUString::createFromAscii( PROPERTYNAME_CURREXT );
+ pArray[11].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_CURREXT ));
pArray[11].Value <<= rtl::OUString( aExt );
- pArray[12].Name = rtl::OUString::createFromAscii( PROPERTYNAME_CURRABB );
+ pArray[12].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_CURRABB ));
pArray[12].Value <<= rtl::OUString( aAbb );
return aSeq;
@@ -971,7 +971,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SvNumberFormatObj::getSupportedServiceName
{
uno::Sequence<rtl::OUString> aRet(1);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString::createFromAscii(SERVICENAME_NUMBERFORMAT);
+ pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERFORMAT));
return aRet;
}
@@ -1135,7 +1135,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SvNumberFormatSettingsObj::getSupportedSer
{
uno::Sequence<rtl::OUString> aRet(1);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString::createFromAscii(SERVICENAME_NUMBERSETTINGS);
+ pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERSETTINGS));
return aRet;
}
More information about the Libreoffice-commits
mailing list