[Libreoffice-commits] .: binfilter/bf_xmloff
Gert Faller
gfaller at kemper.freedesktop.org
Sat Dec 4 10:54:22 PST 2010
binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx | 8 -
binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx | 40 ++++-----
binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx | 44 +++++-----
binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx | 42 ++++-----
binfilter/bf_xmloff/source/text/xmloff_XMLTextHeaderFooterContext.cxx | 12 +-
5 files changed, 73 insertions(+), 73 deletions(-)
New commits:
commit 1c2fb7cdfc6afcf7a868e1b1a9bbd87520176535
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sat Dec 4 19:53:52 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in filters 23
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
index 47cbbdf..eadef49 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
@@ -132,16 +132,16 @@ SchXMLExportHelper::SchXMLExportHelper(
// register chart auto-style family
mrAutoStylePool.AddFamily(
XML_STYLE_FAMILY_SCH_CHART_ID,
- ::rtl::OUString::createFromAscii( XML_STYLE_FAMILY_SCH_CHART_NAME ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SCH_CHART_NAME )),
mxExpPropMapper.get(),
- ::rtl::OUString::createFromAscii( XML_STYLE_FAMILY_SCH_CHART_PREFIX ));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SCH_CHART_PREFIX )));
// register shape family
mrAutoStylePool.AddFamily(
XML_STYLE_FAMILY_SD_GRAPHICS_ID,
- ::rtl::OUString::createFromAscii( XML_STYLE_FAMILY_SD_GRAPHICS_NAME ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SD_GRAPHICS_NAME )),
mxExpPropMapper.get(),
- ::rtl::OUString::createFromAscii( XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX ));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX )));
// register paragraph family also for shapes
mrAutoStylePool.AddFamily(
XML_STYLE_FAMILY_TEXT_PARAGRAPH,
diff --git a/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx b/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx
index 5b4d070..814248e 100644
--- a/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx
+++ b/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx
@@ -166,7 +166,7 @@ SfxXMLMetaExport::SfxXMLMetaExport(
try
{
uno::Any aLocAny = xDocProp->getPropertyValue(
- ::rtl::OUString::createFromAscii( PROP_CHARLOCALE ) );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_CHARLOCALE )) );
aLocAny >>= aLocale;
}
catch (beans::UnknownPropertyException&)
@@ -267,39 +267,39 @@ void SfxXMLMetaExport::Export()
}
// document title
- SimpleStringElement( ::rtl::OUString::createFromAscii(PROP_TITLE),
+ SimpleStringElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_TITLE)),
XML_NAMESPACE_DC, XML_TITLE );
// description
- SimpleStringElement( ::rtl::OUString::createFromAscii(PROP_DESCRIPTION),
+ SimpleStringElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_DESCRIPTION)),
XML_NAMESPACE_DC, XML_DESCRIPTION );
// subject
- SimpleStringElement( ::rtl::OUString::createFromAscii(PROP_THEME),
+ SimpleStringElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_THEME)),
XML_NAMESPACE_DC, XML_SUBJECT );
// created...
- SimpleStringElement( ::rtl::OUString::createFromAscii(PROP_AUTHOR),
+ SimpleStringElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_AUTHOR)),
XML_NAMESPACE_META, XML_INITIAL_CREATOR );
- SimpleDateTimeElement( ::rtl::OUString::createFromAscii(PROP_CREATIONDATE),
+ SimpleDateTimeElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_CREATIONDATE)),
XML_NAMESPACE_META, XML_CREATION_DATE );
// modified...
- SimpleStringElement( ::rtl::OUString::createFromAscii(PROP_MODIFIEDBY),
+ SimpleStringElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_MODIFIEDBY)),
XML_NAMESPACE_DC, XML_CREATOR );
- SimpleDateTimeElement( ::rtl::OUString::createFromAscii(PROP_MODIFYDATE),
+ SimpleDateTimeElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_MODIFYDATE)),
XML_NAMESPACE_DC, XML_DATE );
// printed...
- SimpleStringElement( ::rtl::OUString::createFromAscii(PROP_PRINTEDBY),
+ SimpleStringElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_PRINTEDBY)),
XML_NAMESPACE_META, XML_PRINTED_BY );
- SimpleDateTimeElement( ::rtl::OUString::createFromAscii(PROP_PRINTDATE),
+ SimpleDateTimeElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_PRINTDATE)),
XML_NAMESPACE_META, XML_PRINT_DATE );
// keywords
// service DocumentInfo contains keywords in a single string, comma separated.
aPropVal = xInfoProp->getPropertyValue(
- ::rtl::OUString::createFromAscii(PROP_KEYWORDS) );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_KEYWORDS)) );
::rtl::OUString sKeywords;
aPropVal >>= sKeywords;
if ( sKeywords.getLength() )
@@ -335,7 +335,7 @@ void SfxXMLMetaExport::Export()
// editing cycles
aPropVal = xInfoProp->getPropertyValue(
- ::rtl::OUString::createFromAscii(PROP_EDITINGCYCLES) );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_EDITINGCYCLES)) );
sal_Int32 nCycles;
if ( aPropVal >>= nCycles )
{
@@ -350,7 +350,7 @@ void SfxXMLMetaExport::Export()
// editing duration
// property is a int32 with the Time::GetTime value
aPropVal = xInfoProp->getPropertyValue(
- ::rtl::OUString::createFromAscii(PROP_EDITINGDURATION) );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_EDITINGDURATION)) );
sal_Int32 nDurVal;
if ( aPropVal >>= nDurVal )
{
@@ -365,7 +365,7 @@ void SfxXMLMetaExport::Export()
// default target
aPropVal = xInfoProp->getPropertyValue(
- ::rtl::OUString::createFromAscii(PROP_DEFAULTTARGET) );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_DEFAULTTARGET)) );
::rtl::OUString sDefTarget;
aPropVal >>= sDefTarget;
if ( sDefTarget.getLength() )
@@ -386,14 +386,14 @@ void SfxXMLMetaExport::Export()
// auto-reload
aPropVal = xInfoProp->getPropertyValue(
- ::rtl::OUString::createFromAscii(PROP_RELOADENABLED) );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_RELOADENABLED)) );
BOOL bAutoReload = FALSE;
if ( aPropVal.getValueTypeClass() == uno::TypeClass_BOOLEAN )
bAutoReload = *(sal_Bool*)aPropVal.getValue();
if ( bAutoReload )
{
aPropVal = xInfoProp->getPropertyValue(
- ::rtl::OUString::createFromAscii(PROP_RELOADURL) );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_RELOADURL)) );
::rtl::OUString sReloadURL;
aPropVal >>= sReloadURL;
if ( sReloadURL.getLength() )
@@ -403,7 +403,7 @@ void SfxXMLMetaExport::Export()
}
aPropVal = xInfoProp->getPropertyValue(
- ::rtl::OUString::createFromAscii(PROP_RELOADSECS) );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_RELOADSECS)) );
sal_Int32 nSecs;
if ( aPropVal >>= nSecs )
{
@@ -421,7 +421,7 @@ void SfxXMLMetaExport::Export()
// template
aPropVal = xInfoProp->getPropertyValue(
- ::rtl::OUString::createFromAscii(PROP_TEMPLATEURL) );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_TEMPLATEURL)) );
::rtl::OUString sTplPath;
aPropVal >>= sTplPath;
if ( sTplPath.getLength() )
@@ -436,7 +436,7 @@ void SfxXMLMetaExport::Export()
// template name
aPropVal = xInfoProp->getPropertyValue(
- ::rtl::OUString::createFromAscii(PROP_TEMPLATENAME) );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_TEMPLATENAME)) );
::rtl::OUString sTplName;
aPropVal >>= sTplName;
if ( sTplName.getLength() )
@@ -446,7 +446,7 @@ void SfxXMLMetaExport::Export()
// template date
aPropVal = xInfoProp->getPropertyValue(
- ::rtl::OUString::createFromAscii(PROP_TEMPLATEDATE) );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_TEMPLATEDATE)) );
util::DateTime aDateTime;
if ( aPropVal >>= aDateTime )
{
diff --git a/binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx b/binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx
index 0cb8236..919422e 100644
--- a/binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx
+++ b/binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx
@@ -409,13 +409,13 @@ SfxXMLMetaElementContext::SfxXMLMetaElementContext( SvXMLImport& rImport, sal_uI
case XML_TOK_META_TEMPLATE_HREF:
aPropAny <<= GetImport().GetAbsoluteReference(sValue);
xInfoProp->setPropertyValue(
- ::rtl::OUString::createFromAscii(PROP_TEMPLATEURL),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_TEMPLATEURL)),
aPropAny );
break;
case XML_TOK_META_TEMPLATE_TITLE:
aPropAny <<= sValue;
xInfoProp->setPropertyValue(
- ::rtl::OUString::createFromAscii(PROP_TEMPLATENAME),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_TEMPLATENAME)),
aPropAny );
break;
case XML_TOK_META_TEMPLATE_DATE:
@@ -425,8 +425,8 @@ SfxXMLMetaElementContext::SfxXMLMetaElementContext( SvXMLImport& rImport, sal_uI
{
aPropAny <<= aDateTime;
xInfoProp->setPropertyValue(
- ::rtl::OUString::createFromAscii(
- PROP_TEMPLATEDATE), aPropAny );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ PROP_TEMPLATEDATE)), aPropAny );
}
}
break;
@@ -445,7 +445,7 @@ SfxXMLMetaElementContext::SfxXMLMetaElementContext( SvXMLImport& rImport, sal_uI
sal_Bool bReload = sal_True;
aPropAny.setValue( &bReload, getBooleanCppuType() );
xInfoProp->setPropertyValue(
- ::rtl::OUString::createFromAscii(PROP_RELOADENABLED),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_RELOADENABLED)),
aPropAny );
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -464,7 +464,7 @@ SfxXMLMetaElementContext::SfxXMLMetaElementContext( SvXMLImport& rImport, sal_uI
case XML_TOK_META_RELOAD_HREF:
aPropAny <<= GetImport().GetAbsoluteReference(sValue);
xInfoProp->setPropertyValue(
- ::rtl::OUString::createFromAscii(PROP_RELOADURL),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_RELOADURL)),
aPropAny );
break;
case XML_TOK_META_RELOAD_DELAY:
@@ -475,8 +475,8 @@ SfxXMLMetaElementContext::SfxXMLMetaElementContext( SvXMLImport& rImport, sal_uI
sal_Int32 nSecs = aTime.GetMSFromTime() / 1000;
aPropAny <<= nSecs;
xInfoProp->setPropertyValue(
- ::rtl::OUString::createFromAscii(
- PROP_RELOADSECS), aPropAny );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ PROP_RELOADSECS)), aPropAny );
}
}
break;
@@ -504,7 +504,7 @@ SfxXMLMetaElementContext::SfxXMLMetaElementContext( SvXMLImport& rImport, sal_uI
::rtl::OUString sValue = xAttrList->getValueByIndex( i );
aPropAny <<= sValue;
xInfoProp->setPropertyValue(
- ::rtl::OUString::createFromAscii(PROP_DEFAULTTARGET),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_DEFAULTTARGET)),
aPropAny );
}
}
@@ -575,48 +575,48 @@ void SfxXMLMetaElementContext::EndElement()
// simple strings
case XML_TOK_META_TITLE:
aPropAny <<= sContent;
- xInfoProp->setPropertyValue( ::rtl::OUString::createFromAscii(PROP_TITLE), aPropAny );
+ xInfoProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_TITLE)), aPropAny );
break;
case XML_TOK_META_DESCRIPTION:
aPropAny <<= sContent;
- xInfoProp->setPropertyValue( ::rtl::OUString::createFromAscii(PROP_DESCRIPTION), aPropAny );
+ xInfoProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_DESCRIPTION)), aPropAny );
break;
case XML_TOK_META_SUBJECT:
aPropAny <<= sContent;
- xInfoProp->setPropertyValue( ::rtl::OUString::createFromAscii(PROP_THEME), aPropAny );
+ xInfoProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_THEME)), aPropAny );
break;
case XML_TOK_META_INITIALCREATOR:
aPropAny <<= sContent;
- xInfoProp->setPropertyValue( ::rtl::OUString::createFromAscii(PROP_AUTHOR), aPropAny );
+ xInfoProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_AUTHOR)), aPropAny );
break;
case XML_TOK_META_CREATOR:
aPropAny <<= sContent;
- xInfoProp->setPropertyValue( ::rtl::OUString::createFromAscii(PROP_MODIFIEDBY), aPropAny );
+ xInfoProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_MODIFIEDBY)), aPropAny );
break;
case XML_TOK_META_PRINTEDBY:
aPropAny <<= sContent;
- xInfoProp->setPropertyValue( ::rtl::OUString::createFromAscii(PROP_PRINTEDBY), aPropAny );
+ xInfoProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_PRINTEDBY)), aPropAny );
break;
// date/time
case XML_TOK_META_CREATIONDATE:
if ( ParseISODateTimeString( sContent, aDateTime ) )
{
aPropAny <<= aDateTime;
- xInfoProp->setPropertyValue( ::rtl::OUString::createFromAscii(PROP_CREATIONDATE), aPropAny );
+ xInfoProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_CREATIONDATE)), aPropAny );
}
break;
case XML_TOK_META_DATE:
if ( ParseISODateTimeString( sContent, aDateTime ) )
{
aPropAny <<= aDateTime;
- xInfoProp->setPropertyValue( ::rtl::OUString::createFromAscii(PROP_MODIFYDATE), aPropAny );
+ xInfoProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_MODIFYDATE)), aPropAny );
}
break;
case XML_TOK_META_PRINTDATE:
if ( ParseISODateTimeString( sContent, aDateTime ) )
{
aPropAny <<= aDateTime;
- xInfoProp->setPropertyValue( ::rtl::OUString::createFromAscii(PROP_PRINTDATE), aPropAny );
+ xInfoProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_PRINTDATE)), aPropAny );
}
break;
// others
@@ -643,7 +643,7 @@ void SfxXMLMetaElementContext::EndElement()
try
{
xDocProp->setPropertyValue(
- ::rtl::OUString::createFromAscii( PROP_CHARLOCALE ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_CHARLOCALE )),
aPropAny );
}
catch (beans::UnknownPropertyException&)
@@ -657,7 +657,7 @@ void SfxXMLMetaElementContext::EndElement()
if ( lcl_GetNumber( sContent, nValue, USHRT_MAX ) )
{
aPropAny <<= (sal_Int16) nValue;
- xInfoProp->setPropertyValue( ::rtl::OUString::createFromAscii(PROP_EDITINGCYCLES), aPropAny );
+ xInfoProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_EDITINGCYCLES)), aPropAny );
}
break;
case XML_TOK_META_EDITINGDURATION:
@@ -665,7 +665,7 @@ void SfxXMLMetaElementContext::EndElement()
if ( ParseISODurationString( sContent, aTime ) )
{
aPropAny <<= (sal_Int32) aTime.GetTime();
- xInfoProp->setPropertyValue( ::rtl::OUString::createFromAscii(PROP_EDITINGDURATION), aPropAny );
+ xInfoProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_EDITINGDURATION)), aPropAny );
}
break;
case XML_TOK_META_KEYWORDS:
@@ -767,7 +767,7 @@ void SfxXMLMetaContext::EndElement()
{
uno::Any aAny;
aAny <<= ::rtl::OUString(sKeywords);
- xInfoProp->setPropertyValue( ::rtl::OUString::createFromAscii(PROP_KEYWORDS), aAny );
+ xInfoProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(PROP_KEYWORDS)), aAny );
}
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
index aee33a5..927b109 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
@@ -421,41 +421,41 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
beans::PropertyValue *pProps = aPropSeq.getArray();
sal_Int32 nPos = 0L;
pProps[nPos].Name =
- OUString::createFromAscii( XML_UNO_NAME_NRULE_NUMBERINGTYPE );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_NUMBERINGTYPE ));
pProps[nPos++].Value <<= (sal_Int16)eType ;
- pProps[nPos].Name = OUString::createFromAscii( XML_UNO_NAME_NRULE_PREFIX );
+ pProps[nPos].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_PREFIX ));
pProps[nPos++].Value <<= sPrefix;
- pProps[nPos].Name = OUString::createFromAscii( XML_UNO_NAME_NRULE_SUFFIX );
+ pProps[nPos].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_SUFFIX ));
pProps[nPos++].Value <<= sSuffix;
- pProps[nPos].Name = OUString::createFromAscii( XML_UNO_NAME_NRULE_ADJUST );
+ pProps[nPos].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_ADJUST ));
pProps[nPos++].Value <<= eAdjust;
sal_Int32 nLeftMargin = nSpaceBefore + nMinLabelWidth;
if( nLeftMargin < 0 )
nLeftMargin = 0;
pProps[nPos].Name =
- OUString::createFromAscii( XML_UNO_NAME_NRULE_LEFT_MARGIN );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_LEFT_MARGIN ));
pProps[nPos++].Value <<= (sal_Int32)nLeftMargin;
sal_Int32 nFirstLineOffset =
nMinLabelWidth <= nLeftMargin ? -nMinLabelWidth : -nLeftMargin;
pProps[nPos].Name =
- OUString::createFromAscii( XML_UNO_NAME_NRULE_FIRST_LINE_OFFSET );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_FIRST_LINE_OFFSET ));
pProps[nPos++].Value <<= (sal_Int32)nFirstLineOffset;
pProps[nPos].Name =
- OUString::createFromAscii(XML_UNO_NAME_NRULE_SYMBOL_TEXT_DISTANCE);
+ OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_SYMBOL_TEXT_DISTANCE));
pProps[nPos++].Value <<= (sal_Int16)nMinLabelDist;
OUString sStyleName = sTextStyleName;
if( sStyleName.getLength() && pI18NMap )
sStyleName = pI18NMap->Get( SFX_STYLE_FAMILY_CHAR, sStyleName );
pProps[nPos].Name =
- OUString::createFromAscii( XML_UNO_NAME_NRULE_CHAR_STYLE_NAME );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_CHAR_STYLE_NAME ));
pProps[nPos++].Value <<= sTextStyleName;
if( bBullet )
@@ -493,12 +493,12 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
OUStringBuffer sTmp(1);
sTmp.append( cBullet );
pProps[nPos].Name =
- OUString::createFromAscii( XML_UNO_NAME_NRULE_BULLET_CHAR );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_CHAR ));
pProps[nPos++].Value <<= sTmp.makeStringAndClear();
}
pProps[nPos].Name =
- OUString::createFromAscii( XML_UNO_NAME_NRULE_BULLET_FONT );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_FONT ));
pProps[nPos++].Value <<= aFDesc;
}
@@ -520,41 +520,41 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
if( sStr.getLength() )
{
pProps[nPos].Name =
- OUString::createFromAscii( XML_UNO_NAME_NRULE_GRAPHICURL );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_GRAPHICURL ));
pProps[nPos++].Value <<= sStr;
}
awt::Size aSize( nImageWidth, nImageHeight );
pProps[nPos].Name =
- OUString::createFromAscii( XML_UNO_NAME_NRULE_GRAPHIC_SIZE );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_GRAPHIC_SIZE ));
pProps[nPos++].Value <<= aSize;
pProps[nPos].Name =
- OUString::createFromAscii( XML_UNO_NAME_NRULE_VERT_ORIENT );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_VERT_ORIENT ));
pProps[nPos++].Value <<= (sal_Int16)eImageVertOrient;
}
if( bNum )
{
pProps[nPos].Name =
- OUString::createFromAscii( XML_UNO_NAME_NRULE_START_WITH );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_START_WITH ));
pProps[nPos++].Value <<= (sal_Int16)nNumStartValue;
pProps[nPos].Name =
- OUString::createFromAscii(XML_UNO_NAME_NRULE_PARENT_NUMBERING);
+ OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_PARENT_NUMBERING));
pProps[nPos++].Value <<= (sal_Int16)nNumDisplayLevels;
}
if( ( bNum || bBullet ) && nRelSize )
{
pProps[nPos].Name =
- OUString::createFromAscii( XML_UNO_NAME_NRULE_BULLET_RELSIZE );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_RELSIZE ));
pProps[nPos++].Value <<= nRelSize;
}
if( !bImage && bHasColor )
{
- pProps[nPos].Name = OUString::createFromAscii( XML_UNO_NAME_NRULE_BULLET_COLOR );
+ pProps[nPos].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_COLOR ));
pProps[nPos++].Value <<= (sal_Int32)aColor.GetColor();
}
@@ -1128,7 +1128,7 @@ void SvxXMLListStyleContext::SetDefaultStyle(
beans::PropertyValue *pProps = aPropSeq.getArray();
pProps->Name =
- OUString::createFromAscii( XML_UNO_NAME_NRULE_NUMBERINGTYPE );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_NUMBERINGTYPE ));
(pProps++)->Value <<= (sal_Int16)(bOrdered ? NumberingType::ARABIC
: NumberingType::CHAR_SPECIAL );
if( !bOrdered )
@@ -1149,16 +1149,16 @@ void SvxXMLListStyleContext::SetDefaultStyle(
aFDesc.Weight = WEIGHT_DONTKNOW;
//aFDesc.Transparant = sal_True;
pProps->Name =
- OUString::createFromAscii( XML_UNO_NAME_NRULE_BULLET_FONT );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_FONT ));
(pProps++)->Value <<= aFDesc;
OUStringBuffer sTmp(1);
sTmp.append( (sal_Unicode)(0xF000 + 149) );
pProps->Name =
- OUString::createFromAscii( XML_UNO_NAME_NRULE_BULLET_CHAR );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_CHAR ));
(pProps++)->Value <<= sTmp.makeStringAndClear();
pProps->Name =
- OUString::createFromAscii( XML_UNO_NAME_NRULE_CHAR_STYLE_NAME );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_CHAR_STYLE_NAME ));
(pProps++)->Value <<=
OUString( RTL_CONSTASCII_USTRINGPARAM( "Numbering Symbols" ) );
}
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLTextHeaderFooterContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLTextHeaderFooterContext.cxx
index 418d32a..4065f51 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLTextHeaderFooterContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLTextHeaderFooterContext.cxx
@@ -55,12 +55,12 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa
sal_Bool bFooter, sal_Bool bLft ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
xPropSet( rPageStylePropSet ),
- sOn( OUString::createFromAscii( bFooter ? "FooterIsOn" : "HeaderIsOn" ) ),
- sShareContent( OUString::createFromAscii( bFooter ? "FooterIsShared"
- : "HeaderIsShared" ) ),
- sText( OUString::createFromAscii( bFooter ? "FooterText" : "HeaderText" ) ),
- sTextLeft( OUString::createFromAscii( bFooter ? "FooterTextLeft"
- : "HeaderTextLeft" ) ),
+ sOn( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM("FooterIsOn")) : OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn")) ),
+ sShareContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM("FooterIsShared"))
+ : OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared")) ),
+ sText( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM("FooterText")) : OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderText")) ),
+ sTextLeft( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM("FooterTextLeft"))
+ : OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderTextLeft")) ),
bInsertContent( sal_True ),
bLeft( bLft )
{
More information about the Libreoffice-commits
mailing list