diff options
Diffstat (limited to 'xmloff/source')
| -rw-r--r-- | xmloff/source/forms/elementimport.cxx | 10 | ||||
| -rw-r--r-- | xmloff/source/forms/eventexport.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/transform/EventOASISTContext.cxx | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 9731e5fba7..5d928789d3 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -457,7 +457,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; @@ -1443,12 +1443,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); @@ -1655,9 +1655,9 @@ namespace xmloff // the label and the value const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); const ::rtl::OUString sLabelAttribute = rMap.GetQNameByKey( - GetPrefix(), ::rtl::OUString::createFromAscii("label")); + GetPrefix(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("label"))); const ::rtl::OUString sValueAttribute = rMap.GetQNameByKey( - GetPrefix(), ::rtl::OUString::createFromAscii("value")); + GetPrefix(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))); // ------------------- // the label attribute diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx index f0b4fe80c8..9d898b6102 100644 --- a/xmloff/source/forms/eventexport.cxx +++ b/xmloff/source/forms/eventexport.cxx @@ -107,7 +107,7 @@ namespace xmloff void SAL_CALL OEventDescriptorMapper::replaceByName( const ::rtl::OUString&, const Any& ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { throw IllegalArgumentException( - ::rtl::OUString::createFromAscii("replacing is not implemented for this wrapper class."), static_cast< ::cppu::OWeakObject* >(this), 1); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("replacing is not implemented for this wrapper class.")), static_cast< ::cppu::OWeakObject* >(this), 1); } //--------------------------------------------------------------------- @@ -116,7 +116,7 @@ namespace xmloff ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName); if (m_aMappedEvents.end() == aPos) throw NoSuchElementException( - ::rtl::OUString::createFromAscii("There is no element named ") += _rName, + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("There is no element named ")) += _rName, static_cast< ::cppu::OWeakObject* >(this)); return makeAny(aPos->second); diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index b353ab5bb2..ecd4dfe33e 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -203,8 +203,8 @@ bool ParseURL( xSMgr = ::comphelper::getProcessServiceFactory(); Reference< com::sun::star::uri::XUriReferenceFactory > - xFactory( xSMgr->createInstance( OUString::createFromAscii( - "com.sun.star.uri.UriReferenceFactory" ) ), UNO_QUERY ); + xFactory( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.uri.UriReferenceFactory" )) ), UNO_QUERY ); if ( xFactory.is() ) { @@ -306,7 +306,7 @@ void XMLEventOASISTransformerContext::StartElement( GetXMLToken( XML_LANGUAGE ) ) ); pMutableAttrList->SetValueByIndex( idx, - OUString::createFromAscii("StarBasic") ); + OUString(RTL_CONSTASCII_USTRINGPARAM("StarBasic")) ); OUString aLocQName( GetTransformer().GetNamespaceMap().GetQNameByKey( @@ -358,7 +358,7 @@ void XMLEventOASISTransformerContext::StartElement( GetXMLToken( XML_LANGUAGE ) ) ); pMutableAttrList->SetValueByIndex( idx, - OUString::createFromAscii("StarBasic") ); + OUString(RTL_CONSTASCII_USTRINGPARAM("StarBasic")) ); OUString aLocQName( GetTransformer().GetNamespaceMap().GetQNameByKey( |