diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-15 21:16:34 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-15 21:19:14 -0400 |
| commit | e8620b247dcba55f67ad7eaf63cfe5ac3831b187 (patch) | |
| tree | 0526afdd0734138bba88b60ee73b1bbfa6c6b7fd /xmloff | |
| parent | b659d7c33fcacdbbef86557e78f071abf94bead2 (diff) | |
fix conflicting types found by lto
Change-Id: Icd1b5756e43aa17d8329d124765d75a4bbfaf327
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/XMLIndexTOCSourceContext.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/text/XMLIndexTemplateContext.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/text/XMLIndexTemplateContext.hxx | 2 | ||||
| -rw-r--r-- | xmloff/source/text/XMLIndexUserSourceContext.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx index b1399d7b5166..98ce76534549 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx @@ -169,7 +169,7 @@ SvXMLImportContext* XMLIndexTOCSourceContext::CreateChildContext( { return new XMLIndexTemplateContext(GetImport(), rIndexPropertySet, nPrefix, rLocalName, - aLevelNameTOCMap, + aSvLevelNameTOCMap, XML_OUTLINE_LEVEL, aLevelStylePropNameTOCMap, aAllowedTokenTypesTOC, sal_True ); diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index b57698cbfc90..ec7eac4fede4 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -341,7 +341,7 @@ SvXMLImportContext *XMLIndexTemplateContext::CreateChildContext( // table of content and user defined index: -const SvXMLEnumMapEntry aLevelNameTOCMap[] = +const SvXMLEnumMapEntry aSvLevelNameTOCMap[] = { { XML_1, 1 }, { XML_2, 2 }, diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx index 3227c1162b5f..079da8b695c2 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTemplateContext.hxx @@ -40,7 +40,7 @@ struct SvXMLEnumMapEntry; // constants for the XMLIndexTemplateContext constructor // TOC and user defined index: -extern const SvXMLEnumMapEntry aLevelNameTOCMap[]; +extern const SvXMLEnumMapEntry aSvLevelNameTOCMap[]; extern const sal_Char* aLevelStylePropNameTOCMap[]; extern const sal_Bool aAllowedTokenTypesTOC[]; extern const sal_Bool aAllowedTokenTypesUser[]; diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx index ff2409a9136a..09ff595493ae 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.cxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx @@ -198,7 +198,7 @@ SvXMLImportContext* XMLIndexUserSourceContext::CreateChildContext( { return new XMLIndexTemplateContext(GetImport(), rIndexPropertySet, nPrefix, rLocalName, - aLevelNameTOCMap, + aSvLevelNameTOCMap, XML_OUTLINE_LEVEL, aLevelStylePropNameTOCMap, aAllowedTokenTypesUser); |