xmloff/source/style/xmlstyle.cxx | 6 ++--- xmloff/source/text/XMLLineNumberingImportContext.cxx | 22 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-)
New commits: commit da8af42a2d783588359d33f79d15b94fa0d91bb4 Author: Chr. Rossmanith <chrrossman...@gmx.de> Date: Sat Nov 24 16:34:13 2012 +0100 Removed RTL_CONSTASCII_USTRINGPARAM Change-Id: Ifb14257ef20c14f8e1551a1470d0dbea1dc0759b diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 433b140..b69f3f6 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -418,7 +418,7 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext( sal_uInt16 p_nPr { const SvXMLTokenMap& rTokenMap = GetStyleStylesElemTokenMap(); sal_uInt16 nToken = rTokenMap.Get( p_nPrefix, rLocalName ); - switch( nToken ) + switch( nToken ) { case XML_TOK_STYLE_STYLE: case XML_TOK_STYLE_DEFAULT_STYLE: @@ -804,8 +804,8 @@ SvXMLStylesContext::SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > &, sal_Bool bAuto ) : SvXMLImportContext( rImport, nPrfx, rLName ), - msParaStyleServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.ParagraphStyle" ) ), - msTextStyleServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterStyle" ) ), + msParaStyleServiceName( "com.sun.star.style.ParagraphStyle" ), + msTextStyleServiceName( "com.sun.star.style.CharacterStyle" ), mpImpl( new SvXMLStylesContext_Impl( bAuto ) ), mpStyleStylesElemTokenMap( 0 ) { diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx index 103e5d6..77dd3ba 100644 --- a/xmloff/source/text/XMLLineNumberingImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx @@ -51,17 +51,17 @@ XMLLineNumberingImportContext::XMLLineNumberingImportContext( const OUString& rLocalName, const Reference<XAttributeList> & xAttrList) : SvXMLStyleContext(rImport, nPrfx, rLocalName, xAttrList, XML_STYLE_FAMILY_TEXT_LINENUMBERINGCONFIG) -, sCharStyleName(RTL_CONSTASCII_USTRINGPARAM("CharStyleName")) -, sCountEmptyLines(RTL_CONSTASCII_USTRINGPARAM("CountEmptyLines")) -, sCountLinesInFrames(RTL_CONSTASCII_USTRINGPARAM("CountLinesInFrames")) -, sDistance(RTL_CONSTASCII_USTRINGPARAM("Distance")) -, sInterval(RTL_CONSTASCII_USTRINGPARAM("Interval")) -, sSeparatorText(RTL_CONSTASCII_USTRINGPARAM("SeparatorText")) -, sNumberPosition(RTL_CONSTASCII_USTRINGPARAM("NumberPosition")) -, sNumberingType(RTL_CONSTASCII_USTRINGPARAM("NumberingType")) -, sIsOn(RTL_CONSTASCII_USTRINGPARAM("IsOn")) -, sRestartAtEachPage(RTL_CONSTASCII_USTRINGPARAM("RestartAtEachPage")) -, sSeparatorInterval(RTL_CONSTASCII_USTRINGPARAM("SeparatorInterval")) +, sCharStyleName("CharStyleName") +, sCountEmptyLines("CountEmptyLines") +, sCountLinesInFrames("CountLinesInFrames") +, sDistance("Distance") +, sInterval("Interval") +, sSeparatorText("SeparatorText") +, sNumberPosition("NumberPosition") +, sNumberingType("NumberingType") +, sIsOn("IsOn") +, sRestartAtEachPage("RestartAtEachPage") +, sSeparatorInterval("SeparatorInterval") , sNumFormat(GetXMLToken(XML_1)) , sNumLetterSync(GetXMLToken(XML_FALSE)) , nOffset(-1) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits