[Libreoffice-commits] .: binfilter/bf_forms binfilter/bf_sc binfilter/bf_sd binfilter/bf_so3 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_xmloff
David Tardon
dtardon at kemper.freedesktop.org
Tue Nov 9 23:26:29 PST 2010
binfilter/bf_forms/source/component/forms_Columns.cxx | 4 +-
binfilter/bf_forms/source/component/forms_ComboBox.cxx | 2 -
binfilter/bf_forms/source/component/forms_FormattedField.cxx | 6 +--
binfilter/bf_forms/source/component/forms_ListBox.cxx | 2 -
binfilter/bf_forms/source/misc/forms_limitedformats.cxx | 2 -
binfilter/bf_forms/source/misc/forms_services.cxx | 2 -
binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx | 2 -
binfilter/bf_sd/source/ui/app/sd_sdlib.cxx | 2 -
binfilter/bf_so3/source/dialog/insdlg.cxx | 8 +---
binfilter/bf_so3/source/persist/persist.cxx | 2 -
binfilter/bf_svtools/source/config/svt_helpopt.cxx | 18 +++++------
binfilter/bf_svx/source/form/svx_fmpgeimp.cxx | 2 -
binfilter/bf_xmloff/source/forms/xmloff_elementimport.cxx | 10 +++---
binfilter/bf_xmloff/source/forms/xmloff_layerexport.cxx | 2 -
binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx | 4 +-
binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx | 4 +-
16 files changed, 35 insertions(+), 37 deletions(-)
New commits:
commit f2922e0fd29394e5af847924456c64e9ea9c52c9
Author: Kevin Hunter <hunteke at earlham.edu>
Date: Tue Nov 9 15:02:07 2010 -0500
EasyHack: RTL conversion from createFromAscii
diff --git a/binfilter/bf_forms/source/component/forms_Columns.cxx b/binfilter/bf_forms/source/component/forms_Columns.cxx
index d02c2d0..156708d 100644
--- a/binfilter/bf_forms/source/component/forms_Columns.cxx
+++ b/binfilter/bf_forms/source/component/forms_Columns.cxx
@@ -102,8 +102,8 @@ const StringSequence& getColumnTypes()
//------------------------------------------------------------------------------
sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName)
{
- const ::rtl::OUString aModelPrefix = ::rtl::OUString::createFromAscii("com.sun.star.form.component.");
- const ::rtl::OUString aCompatibleModelPrefix = ::rtl::OUString::createFromAscii("stardiv.one.form.component.");
+ const ::rtl::OUString aModelPrefix( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component." ));
+ const ::rtl::OUString aCompatibleModelPrefix( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component." ));
sal_Int32 nTypeId = -1;
if (aModelName == FRM_COMPONENT_EDIT)
diff --git a/binfilter/bf_forms/source/component/forms_ComboBox.cxx b/binfilter/bf_forms/source/component/forms_ComboBox.cxx
index 42a25ce..0fbff97 100644
--- a/binfilter/bf_forms/source/component/forms_ComboBox.cxx
+++ b/binfilter/bf_forms/source/component/forms_ComboBox.cxx
@@ -517,7 +517,7 @@ void OComboBoxModel::loadData()
Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData();
::rtl::OUString aQuote = xMeta->getIdentifierQuoteString();
- ::rtl::OUString aStatement = ::rtl::OUString::createFromAscii("SELECT DISTINCT ");
+ ::rtl::OUString aStatement( RTL_CONSTASCII_USTRINGPARAM( "SELECT DISTINCT " ));
aStatement += quoteName(aQuote, aFieldName);
aStatement += ::rtl::OUString::createFromAscii(" FROM ");
diff --git a/binfilter/bf_forms/source/component/forms_FormattedField.cxx b/binfilter/bf_forms/source/component/forms_FormattedField.cxx
index 9bee716..fb4ca5c 100644
--- a/binfilter/bf_forms/source/component/forms_FormattedField.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormattedField.cxx
@@ -692,7 +692,7 @@ void OFormattedModel::loaded(const EventObject& rEvent) throw ( ::com::sun::star
//------------------------------------------------------------------------------
void OFormattedModel::_loaded(const EventObject& rEvent)
{
- static const ::rtl::OUString s_aNullDataProp = ::rtl::OUString::createFromAscii("NullDate");
+ static const ::rtl::OUString s_aNullDataProp( RTL_CONSTASCII_USTRINGPARAM( "NullDate" ));
m_xOriginalFormatter = NULL;
@@ -861,7 +861,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
::rtl::OUString sFormatDescription;
LanguageType eFormatLanguage = LANGUAGE_DONTKNOW;
- static const ::rtl::OUString s_aLocaleProp = ::rtl::OUString::createFromAscii("Locale");
+ static const ::rtl::OUString s_aLocaleProp( RTL_CONSTASCII_USTRINGPARAM( "Locale" ));
Reference<com::sun::star::beans::XPropertySet> xFormat = xFormats->getByKey(nKey);
if (hasProperty(s_aLocaleProp, xFormat))
{
@@ -874,7 +874,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
}
}
- static const ::rtl::OUString s_aFormatStringProp = ::rtl::OUString::createFromAscii("FormatString");
+ static const ::rtl::OUString s_aFormatStringProp( RTL_CONSTASCII_USTRINGPARAM( "FormatString" ));
if (hasProperty(s_aFormatStringProp, xFormat))
xFormat->getPropertyValue(s_aFormatStringProp) >>= sFormatDescription;
diff --git a/binfilter/bf_forms/source/component/forms_ListBox.cxx b/binfilter/bf_forms/source/component/forms_ListBox.cxx
index c7077fb..3039c17 100644
--- a/binfilter/bf_forms/source/component/forms_ListBox.cxx
+++ b/binfilter/bf_forms/source/component/forms_ListBox.cxx
@@ -641,7 +641,7 @@ void OListBoxModel::loadData()
Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData();
::rtl::OUString aQuote = xMeta->getIdentifierQuoteString();
- ::rtl::OUString aStatement = ::rtl::OUString::createFromAscii("SELECT ");
+ ::rtl::OUString aStatement( RTL_CONSTASCII_USTRINGPARAM( "SELECT " ));
if (!aBoundFieldName.getLength()) // act like a combobox
aStatement += ::rtl::OUString::createFromAscii("DISTINCT ");
diff --git a/binfilter/bf_forms/source/misc/forms_limitedformats.cxx b/binfilter/bf_forms/source/misc/forms_limitedformats.cxx
index 28b9930..13cbe6b 100644
--- a/binfilter/bf_forms/source/misc/forms_limitedformats.cxx
+++ b/binfilter/bf_forms/source/misc/forms_limitedformats.cxx
@@ -342,7 +342,7 @@ namespace frm
if (!bFoundIt)
{ // somebody gave us an format which we can't translate
- ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("This control supports only a very limited number of formats.");
+ ::rtl::OUString sMessage( RTL_CONSTASCII_USTRINGPARAM( "This control supports only a very limited number of formats." ));
throw IllegalArgumentException(sMessage, NULL, 2);
}
diff --git a/binfilter/bf_forms/source/misc/forms_services.cxx b/binfilter/bf_forms/source/misc/forms_services.cxx
index 0620dc6..9237483 100644
--- a/binfilter/bf_forms/source/misc/forms_services.cxx
+++ b/binfilter/bf_forms/source/misc/forms_services.cxx
@@ -443,7 +443,7 @@ void ensureClassInfos()
//---------------------------------------------------------------------------------------
void registerServiceProvider(const ::rtl::OUString& _rServiceImplName, const Sequence< ::rtl::OUString >& _rServices, starregistry::XRegistryKey* _pKey)
{
- ::rtl::OUString sMainKeyName = ::rtl::OUString::createFromAscii("/");
+ ::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
sMainKeyName += _rServiceImplName;
sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
Reference<starregistry::XRegistryKey> xNewKey = _pKey->createKey(sMainKeyName);
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
index c821f83..c05b0b1 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
@@ -168,7 +168,7 @@ void lcl_WriteInfo( registry::XRegistryKey* pRegistryKey,
const uno::Sequence< ::rtl::OUString >& rServices )
throw( registry::InvalidRegistryException )
{
- ::rtl::OUString aImpl = ::rtl::OUString::createFromAscii( "/" );
+ ::rtl::OUString aImpl( RTL_CONSTASCII_USTRINGPARAM( "/" ));
aImpl += rImplementationName;
aImpl += ::rtl::OUString::createFromAscii( "/UNO/SERVICES" );
uno::Reference<registry::XRegistryKey> xNewKey = pRegistryKey->createKey(aImpl);
diff --git a/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx b/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx
index 96c48cc..df39cba 100644
--- a/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx
+++ b/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx
@@ -132,7 +132,7 @@ ULONG __EXPORT SdDLL::DetectFilter(SfxMedium& rMedium, const SfxFilter** pFilter
// extract extra data
OUString aPath( rMedium.GetOrigURL() );
OUString aExtraData( xPacker->getExtraData( aPath ) );
- const OUString aSig1= OUString::createFromAscii( "private:" );
+ const OUString aSig1( RTL_CONSTASCII_USTRINGPARAM( "private:" ));
String aTmp;
aTmp += sal_Unicode( '?' );
aTmp += (*pFilter)->GetFilterContainer()->GetName();
diff --git a/binfilter/bf_so3/source/dialog/insdlg.cxx b/binfilter/bf_so3/source/dialog/insdlg.cxx
index 7735eb2..7f9628c 100644
--- a/binfilter/bf_so3/source/dialog/insdlg.cxx
+++ b/binfilter/bf_so3/source/dialog/insdlg.cxx
@@ -124,15 +124,13 @@ void SvObjectServerList::FillInsertObjects()
Reference< XMultiServiceFactory > _globalMSFactory= utl::getProcessServiceFactory();
if( _globalMSFactory.is())
{
- OUString sProviderService =
- OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" );
+ OUString sProviderService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ));
Reference<XMultiServiceFactory > sProviderMSFactory(
_globalMSFactory->createInstance( sProviderService ),UNO_QUERY );
if( sProviderMSFactory.is())
{
- OUString sReaderService =
- OUString::createFromAscii( "com.sun.star.configuration.ConfigurationAccess" );
+ OUString sReaderService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" ));
Sequence< Any > aArguments( 1 );
aArguments[0] <<= OUString::createFromAscii( "org.openoffice.Office.Common");
@@ -142,7 +140,7 @@ void SvObjectServerList::FillInsertObjects()
if( xHierNameAccess.is())
{
- OUString sTagName= OUString::createFromAscii("OfficeObjects");
+ OUString sTagName( RTL_CONSTASCII_USTRINGPARAM( "OfficeObjects" ));
Any _a= xHierNameAccess->getByHierarchicalName(sTagName);
Reference<XNameAccess> nameAccess;
_a >>= nameAccess;
diff --git a/binfilter/bf_so3/source/persist/persist.cxx b/binfilter/bf_so3/source/persist/persist.cxx
index d2b7145..994b5ad 100644
--- a/binfilter/bf_so3/source/persist/persist.cxx
+++ b/binfilter/bf_so3/source/persist/persist.cxx
@@ -1840,7 +1840,7 @@ BOOL SvPersist::SaveAsChilds( SvStorage * pStor )
{
::com::sun::star::uno::Any aAny;
::rtl::OUString aMediaType;
- ::rtl::OUString aPropNameStr = ::rtl::OUString::createFromAscii( "MediaType" );
+ ::rtl::OUString aPropNameStr( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ));
GetStorage()->GetProperty( rEle.GetName(), aPropNameStr, aAny );
if( ( aAny >>= aMediaType ) && aMediaType.getLength()
diff --git a/binfilter/bf_svtools/source/config/svt_helpopt.cxx b/binfilter/bf_svtools/source/config/svt_helpopt.cxx
index c52aec6..c51da51 100644
--- a/binfilter/bf_svtools/source/config/svt_helpopt.cxx
+++ b/binfilter/bf_svtools/source/config/svt_helpopt.cxx
@@ -276,10 +276,10 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty
void SvtHelpOptions_Impl::implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounters )
{
// the ignore counters for the help agent URLs
- const ::rtl::OUString sIgnoreListNodePath = ::rtl::OUString::createFromAscii("HelpAgent/IgnoreList");
- const ::rtl::OUString sPathSeparator = ::rtl::OUString::createFromAscii("/");
- const ::rtl::OUString sURLLocalPath = ::rtl::OUString::createFromAscii("/Name");
- const ::rtl::OUString sCounterLocalPath = ::rtl::OUString::createFromAscii("/Counter");
+ const ::rtl::OUString sIgnoreListNodePath( RTL_CONSTASCII_USTRINGPARAM( "HelpAgent/IgnoreList" ));
+ const ::rtl::OUString sPathSeparator( RTL_CONSTASCII_USTRINGPARAM( "/" ));
+ const ::rtl::OUString sURLLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Name" ));
+ const ::rtl::OUString sCounterLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Counter" ));
// get the names of all the nodes containing ignore counters
// collect the node names we have to ask
@@ -336,10 +336,10 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
{
::osl::MutexGuard aGuard(aIgnoreCounterSafety);
- const ::rtl::OUString sIgnoreListNodePath = ::rtl::OUString::createFromAscii("HelpAgent/IgnoreList");
- const ::rtl::OUString sPathSeparator = ::rtl::OUString::createFromAscii("/");
- const ::rtl::OUString sURLLocalPath = ::rtl::OUString::createFromAscii("/Name");
- const ::rtl::OUString sCounterLocalPath = ::rtl::OUString::createFromAscii("/Counter");
+ const ::rtl::OUString sIgnoreListNodePath( RTL_CONSTASCII_USTRINGPARAM( "HelpAgent/IgnoreList" ));
+ const ::rtl::OUString sPathSeparator( RTL_CONSTASCII_USTRINGPARAM( "/" ));
+ const ::rtl::OUString sURLLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Name" ));
+ const ::rtl::OUString sCounterLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Counter" ));
// get the current URL/counter pairs (as they're persistent at the moment)
Sequence< ::rtl::OUString > aNodeNames;
@@ -423,7 +423,7 @@ void SvtHelpOptions_Impl::implSaveURLCounters()
::rtl::OUString sNewNodeName;
Sequence< ::rtl::OUString > aNewCounterDataNodeNames(2);
Sequence< Any > aNewCounterDataValues(2);
- const ::rtl::OUString sNodeNameBase = ::rtl::OUString::createFromAscii("URL");
+ const ::rtl::OUString sNodeNameBase( RTL_CONSTASCII_USTRINGPARAM( "URL" ));
for ( ConstMapString2IntIterator aCollectNew = aURLIgnoreCounters.begin();
aCollectNew != aURLIgnoreCounters.end();
++aCollectNew
diff --git a/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx b/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
index c04bba3..69d0ba1 100644
--- a/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
@@ -101,7 +101,7 @@ using namespace ::binfilter::svxform;
/*N*/ m_sPageId = pDrawModel->GetUniquePageId();
/*N*/ }
/*N*/
-/*N*/ static const ::rtl::OUString sFormsCollectionServiceName = ::rtl::OUString::createFromAscii("com.sun.star.form.Forms");
+/*N*/ static const ::rtl::OUString sFormsCollectionServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.Forms" ));
/*N*/ xForms = Reference< ::com::sun::star::container::XNameContainer > (
/*N*/ ::legacy_binfilters::getLegacyProcessServiceFactory()->createInstance(
/*N*/ sFormsCollectionServiceName), ::com::sun::star::uno::UNO_QUERY);
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_elementimport.cxx b/binfilter/bf_xmloff/source/forms/xmloff_elementimport.cxx
index c0ec178..dc965e6 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_elementimport.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_elementimport.cxx
@@ -142,7 +142,7 @@ namespace xmloff
SvXMLImportContext* OElementImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName,
const Reference< sax::XAttributeList >& _rxAttrList)
{
- static const ::rtl::OUString s_sEventTagName = ::rtl::OUString::createFromAscii("events");
+ static const ::rtl::OUString s_sEventTagName( RTL_CONSTASCII_USTRINGPARAM( "events" ));
if ((s_sEventTagName == _rLocalName) && (XML_NAMESPACE_OFFICE == _nPrefix))
return new OFormEventsImportContext(m_rFormImport.getGlobalContext(), _nPrefix, _rLocalName, *this);
@@ -266,7 +266,7 @@ namespace xmloff
// no optimization here. If this method gets called, the XML stream did not contain a name for the
// element, which is a heavy error. So in this case we don't care for performance
Sequence< ::rtl::OUString > aNames = m_xParentContainer->getElementNames();
- static const ::rtl::OUString sUnnamedName = ::rtl::OUString::createFromAscii("unnamed");
+ static const ::rtl::OUString sUnnamedName( RTL_CONSTASCII_USTRINGPARAM( "unnamed" ));
::rtl::OUString sReturn;
const ::rtl::OUString* pNames = NULL;
@@ -898,12 +898,12 @@ namespace xmloff
const Reference< sax::XAttributeList >& _rxAttrList)
{
// is it the "option" sub tag of a listbox ?
- static const ::rtl::OUString s_sOptionElementName = ::rtl::OUString::createFromAscii("option");
+ static const ::rtl::OUString s_sOptionElementName( RTL_CONSTASCII_USTRINGPARAM( "option" ));
if (s_sOptionElementName == _rLocalName)
return new OListOptionImport(GetImport(), _nPrefix, _rLocalName, this);
// is it the "item" sub tag of a combobox ?
- static const ::rtl::OUString s_sItemElementName = ::rtl::OUString::createFromAscii("item");
+ static const ::rtl::OUString s_sItemElementName( RTL_CONSTASCII_USTRINGPARAM( "item" ));
if (s_sItemElementName == _rLocalName)
return new OComboItemImport(GetImport(), _nPrefix, _rLocalName, this);
@@ -1336,7 +1336,7 @@ namespace xmloff
SvXMLImportContext* OFormImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName,
const Reference< sax::XAttributeList >& _rxAttrList)
{
- static const ::rtl::OUString s_sFormElementName = ::rtl::OUString::createFromAscii("form");
+ static const ::rtl::OUString s_sFormElementName( RTL_CONSTASCII_USTRINGPARAM( "form" ));
if (s_sFormElementName.equals(_rLocalName))
return new OFormImport(m_rFormImport, *this, _nPrefix, _rLocalName, m_xMeAsContainer);
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_layerexport.cxx b/binfilter/bf_xmloff/source/forms/xmloff_layerexport.cxx
index f07e641..6fa11bc 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_layerexport.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_layerexport.cxx
@@ -64,7 +64,7 @@ namespace xmloff
//---------------------------------------------------------------------
const ::rtl::OUString& OFormLayerXMLExport_Impl::getControlNumberStyleNamePrefix()
{
- static const ::rtl::OUString s_sControlNumberStyleNamePrefix = ::rtl::OUString::createFromAscii("C");
+ static const ::rtl::OUString s_sControlNumberStyleNamePrefix( RTL_CONSTASCII_USTRINGPARAM( "C" ));
return s_sControlNumberStyleNamePrefix;
}
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx b/binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx
index c71738e..14d3038 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx
@@ -330,7 +330,7 @@ namespace xmloff
SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName,
const Reference< sax::XAttributeList >& _rxAttrList)
{
- static const ::rtl::OUString s_sSinglePropertyElementName = ::rtl::OUString::createFromAscii("property");
+ static const ::rtl::OUString s_sSinglePropertyElementName( RTL_CONSTASCII_USTRINGPARAM( "property" ));
if (_rLocalName == s_sSinglePropertyElementName)
{
return new OSinglePropertyContext(GetImport(), _nPrefix, _rLocalName, m_xPropertyImporter);
@@ -377,7 +377,7 @@ namespace xmloff
SvXMLImportContext* OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName,
const Reference< sax::XAttributeList >& _rxAttrList)
{
- static const ::rtl::OUString s_sPropertyValueElementName = ::rtl::OUString::createFromAscii("property-value");
+ static const ::rtl::OUString s_sPropertyValueElementName( RTL_CONSTASCII_USTRINGPARAM( "property-value" ));
if (_rLocalName == s_sPropertyValueElementName)
{
OSL_ENSURE(!m_xValueReader.Is(), "OSinglePropertyContext::CreateChildContext: already had a value element!");
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
index d26ecad..82ed491 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
@@ -2039,7 +2039,7 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex )
::rtl::OUString rCondition = aMyConditions[nIndex].sCondition;
SvNumberFormatter* pFormatter = pData->GetNumberFormatter();
sal_uInt32 nKey = pData->GetKeyForName( rApplyName );
- OUString sValue = OUString::createFromAscii( "value()" ); //! define constant
+ OUString sValue( RTL_CONSTASCII_USTRINGPARAM( "value()" )); //! define constant
sal_Int32 nValLen = sValue.getLength();
if ( pFormatter && nKey != NUMBERFORMAT_ENTRY_NOT_FOUND &&
@@ -2089,7 +2089,7 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex )
void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex, const ::rtl::OUString& rFormat, const LocaleDataWrapper& rData )
{
::rtl::OUString rCondition = aMyConditions[nIndex].sCondition;
- OUString sValue = OUString::createFromAscii( "value()" ); //! define constant
+ OUString sValue( RTL_CONSTASCII_USTRINGPARAM( "value()" )); //! define constant
sal_Int32 nValLen = sValue.getLength();
if ( rCondition.copy( 0, nValLen ) == sValue )
More information about the Libreoffice-commits
mailing list