[Libreoffice-commits] .: xmloff/source
Gert Faller
gfaller at kemper.freedesktop.org
Sun Nov 21 09:26:30 PST 2010
xmloff/source/style/xmlnumi.cxx | 52 +++++++++++-----------
xmloff/source/text/XMLTextHeaderFooterContext.cxx | 12 ++---
2 files changed, 32 insertions(+), 32 deletions(-)
New commits:
commit 2e59f42fa0bf64d3e31e9ea68cc25c17e7f7dc60
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sun Nov 21 18:25:47 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in libs core 48
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 4c03674..f7e9b39 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -497,47 +497,47 @@ 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;
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;
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;
pProps[nPos].Name =
- OUString::createFromAscii(XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE);
+ OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE));
pProps[nPos++].Value <<= (sal_Int16)ePosAndSpaceMode;
pProps[nPos].Name =
- OUString::createFromAscii(XML_UNO_NAME_NRULE_LABEL_FOLLOWED_BY);
+ OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_LABEL_FOLLOWED_BY));
pProps[nPos++].Value <<= (sal_Int16)eLabelFollowedBy;
pProps[nPos].Name =
- OUString::createFromAscii(XML_UNO_NAME_NRULE_LISTTAB_STOP_POSITION);
+ OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_LISTTAB_STOP_POSITION));
pProps[nPos++].Value <<= (sal_Int32)nListtabStopPosition;
pProps[nPos].Name =
- OUString::createFromAscii(XML_UNO_NAME_NRULE_FIRST_LINE_INDENT);
+ OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_FIRST_LINE_INDENT));
pProps[nPos++].Value <<= (sal_Int32)nFirstLineIndent;
pProps[nPos].Name =
- OUString::createFromAscii(XML_UNO_NAME_NRULE_INDENT_AT);
+ OUString(RTL_CONSTASCII_USTRINGPARAM(XML_UNO_NAME_NRULE_INDENT_AT));
pProps[nPos++].Value <<= (sal_Int32)nIndentAt;
OUString sDisplayTextStyleName = GetImport().GetStyleDisplayName(
@@ -546,7 +546,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
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 <<= sDisplayTextStyleName;
if( bBullet )
@@ -582,12 +582,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;
}
@@ -609,41 +609,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();
}
@@ -1342,7 +1342,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 )
@@ -1363,16 +1363,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/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index cc2110a..8b297b7 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -61,12 +61,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