[Libreoffice-commits] .: xmloff/source

Gert Faller gfaller at kemper.freedesktop.org
Sun Nov 21 08:21:38 PST 2010


 xmloff/source/meta/xmlmetai.cxx                 |    4 ++--
 xmloff/source/meta/xmlversion.cxx               |    4 ++--
 xmloff/source/style/xmlbahdl.cxx                |    8 ++++----
 xmloff/source/style/xmlnumfe.cxx                |    2 +-
 xmloff/source/style/xmlnumfi.cxx                |    6 +++---
 xmloff/source/style/xmlnumi.cxx                 |    2 +-
 xmloff/source/text/XMLAutoTextEventExport.cxx   |    2 +-
 xmloff/source/text/XMLTextMarkImportContext.cxx |    2 +-
 xmloff/source/text/txtfldi.cxx                  |   10 +++++-----
 xmloff/source/text/txtimp.cxx                   |    2 +-
 xmloff/source/text/txtlists.cxx                 |    2 +-
 xmloff/source/text/txtparae.cxx                 |   17 +++++++++--------
 xmloff/source/text/txtparai.cxx                 |   12 ++++++------
 xmloff/source/text/txtvfldi.cxx                 |    8 ++++----
 xmloff/source/transform/StyleOASISTContext.cxx  |    2 +-
 xmloff/source/transform/StyleOOoTContext.cxx    |    2 +-
 xmloff/source/transform/TransformerBase.cxx     |    4 ++--
 17 files changed, 45 insertions(+), 44 deletions(-)

New commits:
commit 0ca362ffc694f42c95807e309fec85556bdd88dc
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date:   Sun Nov 21 17:21:04 2010 +0100

    RTL_CONSTASCII_USTRINGPARAM in libs core 46

diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 7e0722a..fd37b42 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -252,11 +252,11 @@ void SvXMLMetaDocumentContext::setBuildId(::rtl::OUString const& i_rBuildId, con
             (i_rBuildId.compareToAscii(
                 RTL_CONSTASCII_STRINGPARAM("OpenOffice.org 1") ) == 0))
         {
-            sBuildId = OUString::createFromAscii( "645$8687" );
+            sBuildId = OUString(RTL_CONSTASCII_USTRINGPARAM("645$8687"));
         }
         if ((i_rBuildId.compareToAscii( RTL_CONSTASCII_STRINGPARAM("NeoOffice/2") ) == 0) )
         {
-            sBuildId = OUString::createFromAscii( "680$9134" ); // fake NeoOffice as OpenOffice.org 2.2 release
+            sBuildId = OUString(RTL_CONSTASCII_USTRINGPARAM("680$9134")); // fake NeoOffice as OpenOffice.org 2.2 release
         }
     }
 
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index 1c6cb48..be7ed27 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -445,7 +445,7 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con
             if ( xProps.is() )
             {
                 try {
-                    xProps->getPropertyValue( ::rtl::OUString::createFromAscii( "URL" ) ) >>= aParserInput.sSystemId;
+                    xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ) >>= aParserInput.sSystemId;
                 }
                 catch( uno::Exception& )
                 {}
@@ -468,7 +468,7 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con
 
             // get parser
             Reference< XInterface > xXMLParser = xServiceFactory->createInstance(
-                OUString::createFromAscii("com.sun.star.xml.sax.Parser") );
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) );
             DBG_ASSERT( xXMLParser.is(),
                     "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
 
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index b2a5967..926a83d 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -539,13 +539,13 @@ sal_Bool XMLColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue,
         Sequence< double > aHSL;
         if( (rValue >>= aHSL) && (aHSL.getLength() == 3) )
         {
-            aOut.append( OUString::createFromAscii("hsl(") );
+            aOut.append( OUString(RTL_CONSTASCII_USTRINGPARAM("hsl(")) );
             aOut.append( aHSL[0] );
-            aOut.append( OUString::createFromAscii(",") );
+            aOut.append( OUString(RTL_CONSTASCII_USTRINGPARAM(",")) );
             aOut.append( aHSL[1] * 100.0 );
-            aOut.append( OUString::createFromAscii("%,") );
+            aOut.append( OUString(RTL_CONSTASCII_USTRINGPARAM("%,")) );
             aOut.append( aHSL[2] * 100.0 );
-            aOut.append( OUString::createFromAscii("%)") );
+            aOut.append( OUString(RTL_CONSTASCII_USTRINGPARAM("%)")) );
             rStrExpValue = aOut.makeStringAndClear();
 
             bRet = sal_True;
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 66f5b68..40b635a 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -248,7 +248,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
             SvXMLExport& rExp,
             const uno::Reference< util::XNumberFormatsSupplier >& rSupp ) :
     rExport( rExp ),
-    sPrefix( OUString::createFromAscii( "N" ) ),
+    sPrefix( OUString(RTL_CONSTASCII_USTRINGPARAM("N")) ),
     pFormatter( NULL ),
     pCharClass( NULL ),
     pLocaleData( NULL )
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 7f38b03..4953452 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -1233,7 +1233,7 @@ void SvXMLNumFmtElementContext::EndElement()
             {
                 rParent.AddNumber( aNumInfo );		// simple number
 
-                rParent.AddToCode( OUString::createFromAscii( "E+" ) );
+                rParent.AddToCode( OUString(RTL_CONSTASCII_USTRINGPARAM("E+")) );
                 for (sal_Int32 i=0; i<aNumInfo.nExpDigits; i++)
                     rParent.AddToCode( OUString::valueOf((sal_Unicode)'0') );
             }
@@ -2104,7 +2104,7 @@ void SvXMLNumFormatContext::AddCondition( const sal_Int32 nIndex )
     rtl::OUString rCondition = aMyConditions[nIndex].sCondition;
     SvNumberFormatter* pFormatter = pData->GetNumberFormatter();
     sal_uInt32 l_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 && l_nKey != NUMBERFORMAT_ENTRY_NOT_FOUND &&
@@ -2154,7 +2154,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 )
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 7251fa8..4c03674 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -311,7 +311,7 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl(
 :	SvXMLImportContext( rImport, nPrfx, rLName )
 ,	sStarBats( RTL_CONSTASCII_USTRINGPARAM( "StarBats" ) )
 ,	sStarMath( RTL_CONSTASCII_USTRINGPARAM( "StarMath" ) )
-,	sNumFormat( OUString::createFromAscii( "1" ) )
+,	sNumFormat( OUString(RTL_CONSTASCII_USTRINGPARAM("1")) )
 ,	nLevel( -1L )
 ,	nSpaceBefore( 0L )
 ,	nMinLabelWidth( 0L )
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index d84f908..b4cf6c6 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -158,7 +158,7 @@ sal_uInt32 XMLAutoTextEventExport::exportDoc( enum XMLTokenEnum )
                 // get filter component
                 Reference< xml::sax::XDocumentHandler > xTmpDocHandler(
                     xFactory->createInstanceWithArguments(
-                    OUString::createFromAscii("com.sun.star.comp.Oasis2OOoTransformer"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Oasis2OOoTransformer")),
                                 aArgs), UNO_QUERY);
                 OSL_ENSURE( xTmpDocHandler.is(),
                     "can't instantiate OASIS transformer component" );
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index e4a2d09..3f1c069 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -186,7 +186,7 @@ void XMLTextMarkImportContext::StartElement(
     {
         if (m_sBookmarkName.getLength() == 0) 
         {
-            m_sBookmarkName = ::rtl::OUString::createFromAscii("Unknown");
+            m_sBookmarkName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown"));
         }
         m_rHelper.pushFieldCtx( m_sBookmarkName, m_sFieldName );
     }
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 12ae3ec..dc40a89 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -1995,7 +1995,7 @@ void XMLUserDocInfoImportContext::ProcessAttribute(
         {
             if (!bValid)
             {
-                SetServiceName(OUString::createFromAscii( sAPI_docinfo_custom ) );
+                SetServiceName(OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_docinfo_custom )) );
                 aName = sAttrValue;
                 bValid = sal_True;
             }
@@ -3902,7 +3902,7 @@ void XMLMeasureFieldImportContext::PrepareField(
 {
     Any aAny;
     aAny <<= mnKind;
-    xPropertySet->setPropertyValue(OUString::createFromAscii("Kind"), aAny);
+    xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Kind")), aAny);
 }
 
 
@@ -4062,7 +4062,7 @@ XMLHeaderFieldImportContext::XMLHeaderFieldImportContext(
         const ::rtl::OUString& sLocalName)		/// element name w/o prefix
 : XMLTextFieldImportContext(rImport, rHlp, sAPI_header, nPrfx, sLocalName )
 {
-    sServicePrefix = OUString::createFromAscii( sAPI_presentation_prefix );
+    sServicePrefix = OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_presentation_prefix ));
     bValid = sal_True;
 }
 
@@ -4086,7 +4086,7 @@ XMLFooterFieldImportContext::XMLFooterFieldImportContext(
         const ::rtl::OUString& sLocalName)		/// element name w/o prefix
 : XMLTextFieldImportContext(rImport, rHlp, sAPI_footer, nPrfx, sLocalName )
 {
-    sServicePrefix = OUString::createFromAscii( sAPI_presentation_prefix );
+    sServicePrefix = OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_presentation_prefix ));
     bValid = sal_True;
 }
 
@@ -4111,7 +4111,7 @@ XMLDateTimeFieldImportContext::XMLDateTimeFieldImportContext(
         const ::rtl::OUString& sLocalName)		/// element name w/o prefix
 : XMLTextFieldImportContext(rImport, rHlp, sAPI_datetime, nPrfx, sLocalName )
 {
-    sServicePrefix = OUString::createFromAscii( sAPI_presentation_prefix );
+    sServicePrefix = OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_presentation_prefix ));
     bValid = sal_True;
 }
 
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 471675b..a121d8b 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -923,7 +923,7 @@ namespace
         {
             Sequence<OUString> vListEntriesSeq(vListEntries.size());
             copy(vListEntries.begin(), vListEntries.end(), ::comphelper::stl_begin(vListEntriesSeq));
-            vOutParams[OUString::createFromAscii(ODF_FORMDROPDOWN_LISTENTRY)] = makeAny(vListEntriesSeq);
+            vOutParams[OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_LISTENTRY))] = makeAny(vListEntriesSeq);
         }
         for(::std::map<OUString, Any>::const_iterator pCurrent = vOutParams.begin();
             pCurrent != vOutParams.end();
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index 5754d9d..88640d1 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -239,7 +239,7 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con
 ::rtl::OUString XMLTextListsHelper::GenerateNewListId() const
 {
     // Value of xml:id in element <text:list> has to be a valid ID type (#i92478#)
-    ::rtl::OUString sTmpStr( ::rtl::OUString::createFromAscii( "list" ) );
+    ::rtl::OUString sTmpStr( RTL_CONSTASCII_USTRINGPARAM( "list" ) );
     sal_Int64 n = Time().GetTime();
     n += Date().GetDate();
     n += rand();
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 8ea90dd..46c43b7 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -176,9 +176,9 @@ namespace
 
     static bool lcl_ShapeFilter(const Reference<XTextContent>& xTxtContent)
     {
-        static const OUString sTextFrameService = OUString::createFromAscii("com.sun.star.text.TextFrame");
-        static const OUString sTextGraphicService = OUString::createFromAscii("com.sun.star.text.TextGraphicObject");
-        static const OUString sTextEmbeddedService = OUString::createFromAscii("com.sun.star.text.TextEmbeddedObject");
+        static const OUString sTextFrameService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame"));
+        static const OUString sTextGraphicService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextGraphicObject"));
+        static const OUString sTextEmbeddedService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextEmbeddedObject"));
         Reference<XShape> xShape(xTxtContent, UNO_QUERY);
         if(!xShape.is())
             return false;
@@ -231,8 +231,8 @@ namespace
             static const OUString our_sAnchorType;
             static const OUString our_sAnchorFrame;
     };
-    const OUString BoundFrames::our_sAnchorType = OUString::createFromAscii("AnchorType");
-    const OUString BoundFrames::our_sAnchorFrame = OUString::createFromAscii("AnchorFrame");
+    const OUString BoundFrames::our_sAnchorType(RTL_CONSTASCII_USTRINGPARAM("AnchorType"));
+    const OUString BoundFrames::our_sAnchorFrame(RTL_CONSTASCII_USTRINGPARAM("AnchorFrame"));
 
     class FieldParamExporter
     {
@@ -423,14 +423,14 @@ void FieldParamExporter::Export()
                 // Save the OLE object
                 Reference< embed::XStorage > xTargetStg = m_pExport->GetTargetStorage();
                 Reference< embed::XStorage > xDstStg = xTargetStg->openStorageElement(
-                        rtl::OUString::createFromAscii( "OLELinks" ), embed::ElementModes::WRITE );
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OLELinks")), embed::ElementModes::WRITE );
 
                 if ( !xDstStg->hasByName( sValue ) ) {
                     Reference< XStorageBasedDocument > xStgDoc (
                             m_pExport->GetModel( ), UNO_QUERY );
                     Reference< embed::XStorage > xDocStg = xStgDoc->getDocumentStorage();
                     Reference< embed::XStorage > xOleStg = xDocStg->openStorageElement(
-                            rtl::OUString::createFromAscii( "OLELinks" ), embed::ElementModes::READ );
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OLELinks")), embed::ElementModes::READ );
 
                     xOleStg->copyElementTo( sValue, xDstStg, sValue );
                     Reference< embed::XTransactedObject > xTransact( xDstStg, UNO_QUERY );
@@ -444,6 +444,7 @@ void FieldParamExporter::Export()
             sal_Bool bValue = false;
             aValue >>= bValue;
             ExportParameter(*pCurrent,OUString::createFromAscii(bValue ? "true" : "false"));
+            ExportParameter(*pCurrent, (bValue ? OUString(RTL_CONSTASCII_USTRINGPARAM( "true" )) : OUString(RTL_CONSTASCII_USTRINGPARAM("false"))) );
         }
         else if(aValueType == aSeqType)
         {
@@ -1523,7 +1524,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres
             {
                 Reference < XPropertySet > xSet( xTextField, UNO_QUERY );
                 Reference < XText > xText;
-                Any a = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("TextRange") );
+                Any a = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextRange")) );
                 a >>= xText;
                 if ( xText.is() )
                 {
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 7cd46fe..a787070 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -919,8 +919,8 @@ void XMLMetaImportContext::InsertMeta(
         const uno::Reference<rdf::XMetadatable> xMeta(
             XMLTextMarkImportContext::CreateAndInsertMark(
                 GetImport(),
-                OUString::createFromAscii(
-                    "com.sun.star.text.InContentMetadata"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.text.InContentMetadata")),
                 OUString(),
                 i_xInsertionRange, m_XmlId),
             uno::UNO_QUERY);
@@ -998,8 +998,8 @@ void XMLMetaFieldImportContext::InsertMeta(
         const Reference<XPropertySet> xPropertySet(
             XMLTextMarkImportContext::CreateAndInsertMark(
                 GetImport(),
-                OUString::createFromAscii(
-                    "com.sun.star.text.textfield.MetadataField"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.text.textfield.MetadataField")),
                 OUString(),
                 i_xInsertionRange, m_XmlId),
             UNO_QUERY);
@@ -1016,11 +1016,11 @@ void XMLMetaFieldImportContext::InsertMeta(
             if (-1 != nKey)
             {
                 static ::rtl::OUString sPropertyIsFixedLanguage(
-                    ::rtl::OUString::createFromAscii("IsFixedLanguage") );
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFixedLanguage")) );
                 Any any;
                 any <<= nKey;
                 xPropertySet->setPropertyValue(
-                    OUString::createFromAscii("NumberFormat"), any);
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")), any);
                 if ( xPropertySet->getPropertySetInfo()->
                         hasPropertyByName( sPropertyIsFixedLanguage ) )
                 {
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index bf2c91d..4029d9a 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -343,7 +343,7 @@ void XMLSetVarFieldImportContext::EndElement()
         {
             // create field/Service
             Reference<XPropertySet> xPropSet;
-            if (CreateField(xPropSet, OUString::createFromAscii(sAPI_textfield_prefix) + GetServiceName()))
+            if (CreateField(xPropSet, OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_textfield_prefix)) + GetServiceName()))
             {
                 Reference<XDependentTextField> xDepTextField(xPropSet, UNO_QUERY);
                 if (xDepTextField.is()) 
@@ -995,7 +995,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
 
         aAny = xMaster->getPropertyValue(
             // sPropertySubType
-            OUString::createFromAscii(sAPI_sub_type)
+            OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type))
             );
         sal_Int16 nType = 0;
         aAny >>= nType;
@@ -1072,7 +1072,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
                 aAny <<= sName;
                 xMaster->setPropertyValue(
                     // sPropertyName
-                    OUString::createFromAscii(sAPI_name)
+                    OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_name))
                     , aAny);
 
                 if (eVarType != VarTypeUserField) {
@@ -1083,7 +1083,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster(
                               SetVariableType::SEQUENCE);
                     xMaster->setPropertyValue(
                         // sPropertySubType
-                        OUString::createFromAscii(sAPI_sub_type)
+                        OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type))
                         , aAny);
                 } // else : user field: no subtype
 
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index 6856cb8..9f52f8f 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -503,7 +503,7 @@ void XMLPropertiesTContext_Impl::StartElement(
                         {
                             if ( aNewAttrValue.getLength() > 0 )
                             {
-                                aNewAttrValue += rtl::OUString::createFromAscii( " " );
+                                aNewAttrValue += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " ));
                             }
 
                             if ( IsXMLToken( aToken, XML_HORIZONTAL_ON_EVEN ) )
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index f779868..74dafbf 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -906,7 +906,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement(
                 {
                     if ( aStyleMirrorAttrValue.getLength() > 0 )
                     {
-                        aStyleMirrorAttrValue += rtl::OUString::createFromAscii( " " );
+                        aStyleMirrorAttrValue += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " ));
                     }
 
                     if ( IsXMLToken( aToken, XML_HORIZONTAL_ON_LEFT_PAGES ) )
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index f07bc01..0d2b4c8 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -1055,8 +1055,8 @@ sal_Bool XMLTransformerBase::EncodeStyleName( OUString& rName ) const
                                 ->xCharClass =
                                     Reference < XCharacterClassification >(
                                 xFactory->createInstance(
-                                    OUString::createFromAscii(
-                        "com.sun.star.i18n.CharacterClassification_Unicode") ),
+                                    OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.i18n.CharacterClassification_Unicode")) ),
                                 UNO_QUERY );
 
                             OSL_ENSURE( xCharClass.is(),


More information about the Libreoffice-commits mailing list