diff options
Diffstat (limited to 'xmloff/source/style/xmlnumi.cxx')
-rw-r--r-- | xmloff/source/style/xmlnumi.cxx | 139 |
1 files changed, 58 insertions, 81 deletions
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index faa03f0fbd..46943c7b2e 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,10 +35,8 @@ #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> -// --> OD 2008-01-16 #newlistlevelattrs# #include <com/sun/star/text/PositionAndSpaceMode.hpp> #include <com/sun/star/text/LabelFollow.hpp> -// <-- #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/style/XStyle.hpp> @@ -83,36 +82,37 @@ using namespace ::com::sun::star::frame; using namespace ::xmloff::token; using namespace ::com::sun::star::io; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_SYMBOL_TEXT_DISTANCE[] = +using rtl::OUString; +using rtl::OUStringBuffer; + +static sal_Char const XML_UNO_NAME_NRULE_SYMBOL_TEXT_DISTANCE[] = "SymbolTextDistance"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_PARENT_NUMBERING[] = +static sal_Char const XML_UNO_NAME_NRULE_PARENT_NUMBERING[] = "ParentNumbering"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_CHAR_STYLE_NAME[] = +static sal_Char const XML_UNO_NAME_NRULE_CHAR_STYLE_NAME[] = "CharStyleName"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_BULLET_CHAR[] ="BulletChar"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_BULLET_RELSIZE[] = "BulletRelSize"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_GRAPHIC_SIZE[] = +static sal_Char const XML_UNO_NAME_NRULE_BULLET_CHAR[] ="BulletChar"; +static sal_Char const XML_UNO_NAME_NRULE_BULLET_RELSIZE[] = "BulletRelSize"; +static sal_Char const XML_UNO_NAME_NRULE_GRAPHIC_SIZE[] = "GraphicSize"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_VERT_ORIENT[] ="VertOrient"; - -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_NUMBERINGTYPE[] = "NumberingType"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_PREFIX[] = "Prefix"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_SUFFIX[] = "Suffix"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_ADJUST[] = "Adjust"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_LEFT_MARGIN[] = "LeftMargin"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_FIRST_LINE_OFFSET[] = +static sal_Char const XML_UNO_NAME_NRULE_VERT_ORIENT[] ="VertOrient"; + +static sal_Char const XML_UNO_NAME_NRULE_NUMBERINGTYPE[] = "NumberingType"; +static sal_Char const XML_UNO_NAME_NRULE_PREFIX[] = "Prefix"; +static sal_Char const XML_UNO_NAME_NRULE_SUFFIX[] = "Suffix"; +static sal_Char const XML_UNO_NAME_NRULE_ADJUST[] = "Adjust"; +static sal_Char const XML_UNO_NAME_NRULE_LEFT_MARGIN[] = "LeftMargin"; +static sal_Char const XML_UNO_NAME_NRULE_FIRST_LINE_OFFSET[] = "FirstLineOffset"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_BULLET_FONT[] = "BulletFont"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_GRAPHICURL[] = "GraphicURL"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_START_WITH[] = "StartWith"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_BULLET_COLOR[] = "BulletColor"; -// --> OD 2008-01-15 #newlistlevelattrs# -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE[] = "PositionAndSpaceMode"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_LABEL_FOLLOWED_BY[] = "LabelFollowedBy"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_LISTTAB_STOP_POSITION[] = "ListtabStopPosition"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_FIRST_LINE_INDENT[] = "FirstLineIndent"; -static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_INDENT_AT[] = "IndentAt"; -// <-- +static sal_Char const XML_UNO_NAME_NRULE_BULLET_FONT[] = "BulletFont"; +static sal_Char const XML_UNO_NAME_NRULE_GRAPHICURL[] = "GraphicURL"; +static sal_Char const XML_UNO_NAME_NRULE_START_WITH[] = "StartWith"; +static sal_Char const XML_UNO_NAME_NRULE_BULLET_COLOR[] = "BulletColor"; +static sal_Char const XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE[] = "PositionAndSpaceMode"; +static sal_Char const XML_UNO_NAME_NRULE_LABEL_FOLLOWED_BY[] = "LabelFollowedBy"; +static sal_Char const XML_UNO_NAME_NRULE_LISTTAB_STOP_POSITION[] = "ListtabStopPosition"; +static sal_Char const XML_UNO_NAME_NRULE_FIRST_LINE_INDENT[] = "FirstLineIndent"; +static sal_Char const XML_UNO_NAME_NRULE_INDENT_AT[] = "IndentAt"; // --------------------------------------------------------------------- @@ -131,16 +131,13 @@ public: SvxXMLListLevelStyleContext_Impl& rLLevel ); virtual ~SvxXMLListLevelStyleAttrContext_Impl(); - // --> OD 2008-01-16 #newlistlevelattrs# virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ); - // <-- }; // --------------------------------------------------------------------- -// --> OD 2008-01-16 #newlistlevelattrs# class SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl : public SvXMLImportContext { SvxXMLListLevelStyleContext_Impl& rListLevel; @@ -154,7 +151,6 @@ public: SvxXMLListLevelStyleContext_Impl& rLLevel ); virtual ~SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl(); }; -// <-- // --------------------------------------------------------------------- @@ -179,7 +175,7 @@ enum SvxXMLTextListLevelStyleAttrTokens const SvXMLTokenMapEntry* lcl_getLevelAttrTokenMap() { - static __FAR_DATA SvXMLTokenMapEntry aLevelAttrTokenMap[] = + static SvXMLTokenMapEntry aLevelAttrTokenMap[] = { { XML_NAMESPACE_TEXT, XML_LEVEL, XML_TOK_TEXT_LEVEL_ATTR_LEVEL }, { XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_TEXT_LEVEL_ATTR_STYLE_NAME }, @@ -238,13 +234,11 @@ class SvxXMLListLevelStyleContext_Impl : public SvXMLImportContext sal_Int16 nRelSize; Color aColor; - // --> OD 2008-01-16 #newlistlevelattrs# sal_Int16 ePosAndSpaceMode; sal_Int16 eLabelFollowedBy; sal_Int32 nListtabStopPosition; sal_Int32 nFirstLineIndent; sal_Int32 nIndentAt; - // <-- sal_Bool bBullet : 1; sal_Bool bImage : 1; @@ -287,7 +281,6 @@ public: Sequence<beans::PropertyValue> GetProperties( const SvI18NMap *pI18NMap=0 ); - // --> OD 2008-01-16 #newlistlevelattrs# inline void SetPosAndSpaceMode( sal_Int16 eValue ) { ePosAndSpaceMode = eValue; @@ -308,7 +301,6 @@ public: { nIndentAt = nValue; } - // <-- }; SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl( @@ -319,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 ) @@ -336,13 +328,11 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl( , cBullet( 0 ) , nRelSize(0) , aColor( 0 ) -// --> OD 2008-01-16 #newlistelevelattrs# , ePosAndSpaceMode( PositionAndSpaceMode::LABEL_WIDTH_AND_POSITION ) , eLabelFollowedBy( LabelFollow::LISTTAB ) , nListtabStopPosition( 0 ) , nFirstLineIndent( 0 ) , nIndentAt( 0 ) -// <-- , bBullet( sal_False ) , bImage( sal_False ) , bNum( sal_False ) @@ -507,50 +497,48 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties( beans::PropertyValue *pProps = aPropSeq.getArray(); sal_Int32 nPos = 0; 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; - // --> OD 2008-01-16 #newlistlevelattrs# 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( XML_STYLE_FAMILY_TEXT_TEXT, sTextStyleName ); @@ -558,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 ) @@ -594,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; } @@ -621,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(); } @@ -686,15 +674,12 @@ enum SvxXMLStyleAttributesAttrTokens XML_TOK_STYLE_ATTRIBUTES_ATTR_COLOR, XML_TOK_STYLE_ATTRIBUTES_ATTR_WINDOW_FONT_COLOR, XML_TOK_STYLE_ATTRIBUTES_ATTR_FONT_SIZE, - // --> OD 2008-01-16 #newlistlevelattrs# XML_TOK_STYLE_ATTRIBUTES_ATTR_POSITION_AND_SPACE_MODE, - // <-- - XML_TOK_STYLE_ATTRIBUTES_ATTR_END=XML_TOK_UNKNOWN }; const SvXMLTokenMapEntry* lcl_getStyleAttributesAttrTokenMap() { - static __FAR_DATA SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] = + static SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] = { { XML_NAMESPACE_TEXT, XML_SPACE_BEFORE, XML_TOK_STYLE_ATTRIBUTES_ATTR_SPACE_BEFORE }, @@ -730,11 +715,8 @@ const SvXMLTokenMapEntry* lcl_getStyleAttributesAttrTokenMap() XML_TOK_STYLE_ATTRIBUTES_ATTR_WINDOW_FONT_COLOR }, { XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TOK_STYLE_ATTRIBUTES_ATTR_FONT_SIZE }, - // --> OD 2008-01-16 #newlistlevelattrs# { XML_NAMESPACE_TEXT, XML_LIST_LEVEL_POSITION_AND_SPACE_MODE, XML_TOK_STYLE_ATTRIBUTES_ATTR_POSITION_AND_SPACE_MODE }, - // <-- - XML_TOKEN_MAP_END }; return aStyleAttributesAttrTokenMap; @@ -839,7 +821,6 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl( if(SvXMLUnitConverter::convertPercent( nVal, rValue ) ) rListLevel.SetRelSize( (sal_Int16)nVal ); break; - // --> OD 2008-01-16 #newlistlevelattrs# case XML_TOK_STYLE_ATTRIBUTES_ATTR_POSITION_AND_SPACE_MODE: { sal_Int16 ePosAndSpaceMode = PositionAndSpaceMode::LABEL_WIDTH_AND_POSITION; @@ -848,7 +829,6 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl( rListLevel.SetPosAndSpaceMode( ePosAndSpaceMode ); } break; - // <-- } } @@ -986,7 +966,6 @@ SvxXMLListLevelStyleAttrContext_Impl::~SvxXMLListLevelStyleAttrContext_Impl() { } -// --> OD 2008-01-16 #newlistlevelattrs# SvXMLImportContext* SvxXMLListLevelStyleAttrContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) @@ -1008,11 +987,9 @@ SvXMLImportContext* SvxXMLListLevelStyleAttrContext_Impl::CreateChildContext( return pContext; } -// <-- // --------------------------------------------------------------------- -// --> OD 2008-01-16 #newlistlevelattrs# enum SvxXMLStyleAttributesLabelAlignmentAttrTokens { XML_TOK_STYLE_ATTRIBUTES_ATTR_LABEL_FOLLOWED_BY, @@ -1024,7 +1001,7 @@ enum SvxXMLStyleAttributesLabelAlignmentAttrTokens }; const SvXMLTokenMapEntry* lcl_getStyleAlignmentAttributesAttrTokenMap() { - static __FAR_DATA SvXMLTokenMapEntry aStyleAlignmentAttributesAttrTokenMap[] = + static SvXMLTokenMapEntry aStyleAlignmentAttributesAttrTokenMap[] = { { XML_NAMESPACE_TEXT, XML_LABEL_FOLLOWED_BY, XML_TOK_STYLE_ATTRIBUTES_ATTR_LABEL_FOLLOWED_BY }, @@ -1092,7 +1069,6 @@ SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl::SvxXMLListLevelStyleLabelAli SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl::~SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl() { } -// <-- // --------------------------------------------------------------------- @@ -1366,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 ) @@ -1387,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" ) ); } @@ -1406,3 +1382,4 @@ void SvxXMLListStyleContext::SetDefaultStyle( rNumRule->replaceByIndex( nLevel, aAny ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |