diff options
Diffstat (limited to 'xmloff/source')
-rw-r--r-- | xmloff/source/draw/ximpshap.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/forms/elementexport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/XMLIndexTemplateContext.cxx | 12 | ||||
-rw-r--r-- | xmloff/source/text/XMLIndexTemplateContext.hxx | 14 |
4 files changed, 15 insertions, 15 deletions
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index c4244853c9ae..dcf623324c4f 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -619,7 +619,7 @@ public: private: SvXMLImportContextRef mxTableImportContext; OUString msTemplateStyleName; - sal_Bool maTemplateStylesUsed[6]; + bool maTemplateStylesUsed[6]; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSHAP_HXX diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 81eed72ec73b..f90e51c64f0e 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -2180,7 +2180,7 @@ namespace xmloff { FormSubmitEncoding_URL, FormSubmitMethod_GET, CommandType::COMMAND, NavigationBarMode_CURRENT, TabulatorCycle_RECORDS }; - static const sal_Bool nEnumPropertyAttrDefaultFlags[] = + static const bool nEnumPropertyAttrDefaultFlags[] = { false, false, false, false, true }; diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index d34f4035ddcd..ef970f3fac11 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -67,7 +67,7 @@ XMLIndexTemplateContext::XMLIndexTemplateContext( const SvXMLEnumMapEntry* pLevelNameMap, enum XMLTokenEnum eLevelAttrName, const sal_Char** pLevelStylePropMap, - const sal_Bool* pAllowedTokenTypes, + const bool* pAllowedTokenTypes, bool bT ) : SvXMLImportContext(rImport, nPrfx, rLocalName) , pOutlineLevelNameMap(pLevelNameMap) @@ -352,7 +352,7 @@ const sal_Char* aLevelStylePropNameTOCMap[] = "ParaStyleLevel7", "ParaStyleLevel8", "ParaStyleLevel9", "ParaStyleLevel10", nullptr }; -const sal_Bool aAllowedTokenTypesTOC[] = +const bool aAllowedTokenTypesTOC[] = { true, // XML_TOK_INDEX_TYPE_ENTRY_TEXT = true, // XML_TOK_INDEX_TYPE_TAB_STOP, @@ -364,7 +364,7 @@ const sal_Bool aAllowedTokenTypesTOC[] = false // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY }; -const sal_Bool aAllowedTokenTypesUser[] = +const bool aAllowedTokenTypesUser[] = { true, // XML_TOK_INDEX_TYPE_ENTRY_TEXT = true, // XML_TOK_INDEX_TYPE_TAB_STOP, @@ -392,7 +392,7 @@ const sal_Char* aLevelStylePropNameAlphaMap[] = { nullptr, "ParaStyleSeparator", "ParaStyleLevel1", "ParaStyleLevel2", "ParaStyleLevel3", nullptr }; -const sal_Bool aAllowedTokenTypesAlpha[] = +const bool aAllowedTokenTypesAlpha[] = { true, // XML_TOK_INDEX_TYPE_ENTRY_TEXT = true, // XML_TOK_INDEX_TYPE_TAB_STOP, @@ -446,7 +446,7 @@ const sal_Char* aLevelStylePropNameBibliographyMap[] = "ParaStyleLevel1", "ParaStyleLevel1", "ParaStyleLevel1", "ParaStyleLevel1", nullptr }; -const sal_Bool aAllowedTokenTypesBibliography[] = +const bool aAllowedTokenTypesBibliography[] = { true, // XML_TOK_INDEX_TYPE_ENTRY_TEXT = true, // XML_TOK_INDEX_TYPE_TAB_STOP, @@ -467,7 +467,7 @@ const SvXMLEnumMapEntry* aLevelNameTableMap = nullptr; const sal_Char* aLevelStylePropNameTableMap[] = { nullptr, "ParaStyleLevel1", nullptr }; -const sal_Bool aAllowedTokenTypesTable[] = +const bool aAllowedTokenTypesTable[] = { true, // XML_TOK_INDEX_TYPE_ENTRY_TEXT = true, // XML_TOK_INDEX_TYPE_TAB_STOP, diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx index a9b3983899a8..24dbd85a0a3a 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTemplateContext.hxx @@ -40,23 +40,23 @@ struct SvXMLEnumMapEntry; // TOC and user defined index: extern const SvXMLEnumMapEntry aSvLevelNameTOCMap[]; extern const sal_Char* aLevelStylePropNameTOCMap[]; -extern const sal_Bool aAllowedTokenTypesTOC[]; -extern const sal_Bool aAllowedTokenTypesUser[]; +extern const bool aAllowedTokenTypesTOC[]; +extern const bool aAllowedTokenTypesUser[]; // alphabetical index: extern const SvXMLEnumMapEntry aLevelNameAlphaMap[]; extern const sal_Char* aLevelStylePropNameAlphaMap[]; -extern const sal_Bool aAllowedTokenTypesAlpha[]; +extern const bool aAllowedTokenTypesAlpha[]; // bibliography: extern const SvXMLEnumMapEntry aLevelNameBibliographyMap[]; extern const sal_Char* aLevelStylePropNameBibliographyMap[]; -extern const sal_Bool aAllowedTokenTypesBibliography[]; +extern const bool aAllowedTokenTypesBibliography[]; // table, illustration and object tables: extern const SvXMLEnumMapEntry* aLevelNameTableMap; // NULL: no outline-level extern const sal_Char* aLevelStylePropNameTableMap[]; -extern const sal_Bool aAllowedTokenTypesTable[]; +extern const bool aAllowedTokenTypesTable[]; /** @@ -72,7 +72,7 @@ class XMLIndexTemplateContext : public SvXMLImportContext const SvXMLEnumMapEntry* pOutlineLevelNameMap; enum ::xmloff::token::XMLTokenEnum eOutlineLevelAttrName; const sal_Char** pOutlineLevelStylePropMap; - const sal_Bool* pAllowedTokenTypesMap; + const bool* pAllowedTokenTypesMap; sal_Int32 nOutlineLevel; bool bStyleNameOK; @@ -117,7 +117,7 @@ public: const SvXMLEnumMapEntry* aLevelNameMap, enum ::xmloff::token::XMLTokenEnum eLevelAttrName, const sal_Char** aLevelStylePropNameMap, - const sal_Bool* aAllowedTokenTypes, + const bool* aAllowedTokenTypes, bool bTOC=false); virtual ~XMLIndexTemplateContext(); |