From e8620b247dcba55f67ad7eaf63cfe5ac3831b187 Mon Sep 17 00:00:00 2001
From: Peter Foley <pefoley2@verizon.net>
Date: Fri, 15 Mar 2013 21:16:34 -0400
Subject: fix conflicting types found by lto

Change-Id: Icd1b5756e43aa17d8329d124765d75a4bbfaf327
---
 xmloff/source/text/XMLIndexTOCSourceContext.cxx  | 2 +-
 xmloff/source/text/XMLIndexTemplateContext.cxx   | 2 +-
 xmloff/source/text/XMLIndexTemplateContext.hxx   | 2 +-
 xmloff/source/text/XMLIndexUserSourceContext.cxx | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'xmloff')

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);
-- 
cgit