diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-07-10 11:01:00 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2012-07-10 11:03:39 +0200 |
commit | a8fb1a123f6c46eed611dbaea699624ea0b7962b (patch) | |
tree | 9b9a2267fb27d9b27ad5448f244b20463d1cbd43 /xmloff/source/text | |
parent | 57ce2ffc718a089bf71b722c8e5f94cd902fd8e3 (diff) |
xmloff: kill RTL_CONSTASCII_USTRINGPARAM in rebased code
Change-Id: I3d5227c299d78d4492c47e29385c2c5ca25cfe49
Diffstat (limited to 'xmloff/source/text')
-rw-r--r-- | xmloff/source/text/XMLAutoMarkFileContext.cxx | 3 | ||||
-rw-r--r-- | xmloff/source/text/XMLAutoTextEventImport.cxx | 3 | ||||
-rw-r--r-- | xmloff/source/text/XMLIndexTemplateContext.cxx | 44 | ||||
-rw-r--r-- | xmloff/source/text/XMLIndexTitleTemplateContext.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/text/XMLTextMasterPageExport.cxx | 16 | ||||
-rw-r--r-- | xmloff/source/text/XMLTextShapeStyleContext.cxx | 2 |
6 files changed, 35 insertions, 41 deletions
diff --git a/xmloff/source/text/XMLAutoMarkFileContext.cxx b/xmloff/source/text/XMLAutoMarkFileContext.cxx index fc6761c7cf7a..00cc9bf51b12 100644 --- a/xmloff/source/text/XMLAutoMarkFileContext.cxx +++ b/xmloff/source/text/XMLAutoMarkFileContext.cxx @@ -46,8 +46,7 @@ XMLAutoMarkFileContext::XMLAutoMarkFileContext( sal_uInt16 nPrefix, const OUString& rLocalName) : SvXMLImportContext(rImport, nPrefix, rLocalName), - sIndexAutoMarkFileURL( - RTL_CONSTASCII_USTRINGPARAM("IndexAutoMarkFileURL")) + sIndexAutoMarkFileURL("IndexAutoMarkFileURL") { } diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx index 73f8d10befa0..c313accca867 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextEventImport.cxx @@ -119,8 +119,7 @@ Sequence< OUString > SAL_CALL OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter" ) ); + return OUString( "com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter" ); } Reference< XInterface > SAL_CALL XMLAutoTextEventImport_createInstance( diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index f16d60a79405..b57698cbfc90 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -84,28 +84,28 @@ XMLIndexTemplateContext::XMLIndexTemplateContext( , bOutlineLevelOK(sal_False) , bTOC( bT ) , rPropertySet(rPropSet) -, sTokenEntryNumber(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenEntryNumber)) -, sTokenEntryText(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenEntryText)) -, sTokenTabStop(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenTabStop)) -, sTokenText(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenText)) -, sTokenPageNumber(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenPageNumber)) -, sTokenChapterInfo(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenChapterInfo)) -, sTokenHyperlinkStart(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenHyperlinkStart)) -, sTokenHyperlinkEnd(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenHyperlinkEnd)) -, sTokenBibliographyDataField(RTL_CONSTASCII_USTRINGPARAM(sAPI_TokenBibliographyDataField)) - -, sCharacterStyleName(RTL_CONSTASCII_USTRINGPARAM("CharacterStyleName")) -, sTokenType(RTL_CONSTASCII_USTRINGPARAM("TokenType")) -, sText(RTL_CONSTASCII_USTRINGPARAM("Text")) -, sTabStopRightAligned(RTL_CONSTASCII_USTRINGPARAM("TabStopRightAligned")) -, sTabStopPosition(RTL_CONSTASCII_USTRINGPARAM("TabStopPosition")) -, sTabStopFillCharacter(RTL_CONSTASCII_USTRINGPARAM("TabStopFillCharacter")) -, sBibliographyDataField(RTL_CONSTASCII_USTRINGPARAM("BibliographyDataField")) -, sChapterFormat(RTL_CONSTASCII_USTRINGPARAM("ChapterFormat")) -, sChapterLevel(RTL_CONSTASCII_USTRINGPARAM("ChapterLevel")) //#i53420 - -, sLevelFormat(RTL_CONSTASCII_USTRINGPARAM("LevelFormat")) -, sParaStyleLevel(RTL_CONSTASCII_USTRINGPARAM("ParaStyleLevel")) +, sTokenEntryNumber(sAPI_TokenEntryNumber) +, sTokenEntryText(sAPI_TokenEntryText) +, sTokenTabStop(sAPI_TokenTabStop) +, sTokenText(sAPI_TokenText) +, sTokenPageNumber(sAPI_TokenPageNumber) +, sTokenChapterInfo(sAPI_TokenChapterInfo) +, sTokenHyperlinkStart(sAPI_TokenHyperlinkStart) +, sTokenHyperlinkEnd(sAPI_TokenHyperlinkEnd) +, sTokenBibliographyDataField(sAPI_TokenBibliographyDataField) + +, sCharacterStyleName("CharacterStyleName") +, sTokenType("TokenType") +, sText("Text") +, sTabStopRightAligned("TabStopRightAligned") +, sTabStopPosition("TabStopPosition") +, sTabStopFillCharacter("TabStopFillCharacter") +, sBibliographyDataField("BibliographyDataField") +, sChapterFormat("ChapterFormat") +, sChapterLevel("ChapterLevel") //#i53420 + +, sLevelFormat("LevelFormat") +, sParaStyleLevel("ParaStyleLevel") { DBG_ASSERT( ((XML_TOKEN_INVALID != eLevelAttrName) && (NULL != pLevelNameMap)) || ((XML_TOKEN_INVALID == eLevelAttrName) && (NULL == pLevelNameMap)), diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx index fa99e1c68fef..7a42c49c6c36 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx @@ -35,10 +35,6 @@ using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_STYLE_NAME; -const sal_Char sAPI_Title[] = "Title"; -const sal_Char sAPI_ParaStyleHeading[] = "ParaStyleHeading"; - - TYPEINIT1( XMLIndexTitleTemplateContext, SvXMLImportContext ); XMLIndexTitleTemplateContext::XMLIndexTitleTemplateContext( @@ -47,8 +43,8 @@ XMLIndexTitleTemplateContext::XMLIndexTitleTemplateContext( sal_uInt16 nPrfx, const OUString& rLocalName) : SvXMLImportContext(rImport, nPrfx, rLocalName) -, sTitle(RTL_CONSTASCII_USTRINGPARAM(sAPI_Title)) -, sParaStyleHeading(RTL_CONSTASCII_USTRINGPARAM(sAPI_ParaStyleHeading)) +, sTitle("Title") +, sParaStyleHeading("ParaStyleHeading") , bStyleNameOK(sal_False) , rTOCPropertySet(rPropSet) { diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx index c9714c500dea..a449f9204c47 100644 --- a/xmloff/source/text/XMLTextMasterPageExport.cxx +++ b/xmloff/source/text/XMLTextMasterPageExport.cxx @@ -37,17 +37,17 @@ using namespace ::xmloff::token; XMLTextMasterPageExport::XMLTextMasterPageExport( SvXMLExport& rExp ) : XMLPageExport( rExp ), - sHeaderText( RTL_CONSTASCII_USTRINGPARAM( "HeaderText" ) ), - sHeaderOn( RTL_CONSTASCII_USTRINGPARAM( "HeaderIsOn" ) ), - sHeaderShareContent( RTL_CONSTASCII_USTRINGPARAM( "HeaderIsShared" ) ), + sHeaderText( "HeaderText" ), + sHeaderOn( "HeaderIsOn" ), + sHeaderShareContent( "HeaderIsShared" ), sHeaderTextFirst( "HeaderTextFirst" ), - sHeaderTextLeft( RTL_CONSTASCII_USTRINGPARAM( "HeaderTextLeft" ) ), + sHeaderTextLeft( "HeaderTextLeft" ), sFirstShareContent( "FirstIsShared" ), - sFooterText( RTL_CONSTASCII_USTRINGPARAM( "FooterText" ) ), - sFooterOn( RTL_CONSTASCII_USTRINGPARAM( "FooterIsOn" ) ), - sFooterShareContent( RTL_CONSTASCII_USTRINGPARAM( "FooterIsShared" ) ), + sFooterText( "FooterText" ), + sFooterOn( "FooterIsOn" ), + sFooterShareContent( "FooterIsShared" ), sFooterTextFirst( "FooterTextFirst" ), - sFooterTextLeft( RTL_CONSTASCII_USTRINGPARAM( "FooterTextLeft" ) ) + sFooterTextLeft( "FooterTextLeft" ) { } diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx index c27c02f7d1b8..9b84ef671e4b 100644 --- a/xmloff/source/text/XMLTextShapeStyleContext.cxx +++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx @@ -150,7 +150,7 @@ XMLTextShapeStyleContext::XMLTextShapeStyleContext( SvXMLImport& rImport, sal_Bool /*bDefaultStyle*/ ) : XMLShapeStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily ), - sIsAutoUpdate( RTL_CONSTASCII_USTRINGPARAM( "IsAutoUpdate" ) ), + sIsAutoUpdate( "IsAutoUpdate" ), bAutoUpdate( sal_False ) { } |