summaryrefslogtreecommitdiff
path: root/xmloff/source/text
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2010-10-04 15:36:52 +0100
committerMichael Meeks <michael.meeks@novell.com>2010-10-04 17:01:12 +0100
commitaa3926d8122a2627a99a4bb7bc6ec98637d45efe (patch)
tree9a4366acdd2d93434f420299acd4e36c3a7aa071 /xmloff/source/text
parent45169c93d57acf066748c3ff93b45c919e209db7 (diff)
native bool support in SvXMLUnitConverter
Diffstat (limited to 'xmloff/source/text')
-rw-r--r--xmloff/source/text/XMLChangedRegionImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx4
-rw-r--r--xmloff/source/text/XMLIndexObjectSourceContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexSourceBaseContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexTOCContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexTOCSourceContext.cxx6
-rw-r--r--xmloff/source/text/XMLIndexTabStopEntryContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexTableSourceContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexUserSourceContext.cxx2
-rw-r--r--xmloff/source/text/XMLLineNumberingImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLSectionImportContext.cxx4
-rw-r--r--xmloff/source/text/XMLSectionSourceDDEImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextFrameHyperlinkContext.cxx2
-rw-r--r--xmloff/source/text/XMLTrackedChangesImportContext.cxx2
-rw-r--r--xmloff/source/text/txtfldi.cxx22
-rw-r--r--xmloff/source/text/txtimppr.cxx2
-rw-r--r--xmloff/source/text/txtparai.cxx7
-rw-r--r--xmloff/source/text/txtvfldi.cxx2
19 files changed, 36 insertions, 35 deletions
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx
index 52e4ccc8e048..3fbdcf418842 100644
--- a/xmloff/source/text/XMLChangedRegionImportContext.cxx
+++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx
@@ -94,7 +94,7 @@ void XMLChangedRegionImportContext::StartElement(
}
else if( IsXMLToken( sLocalName, XML_MERGE_LAST_PARAGRAPH ) )
{
- sal_Bool bTmp;
+ bool bTmp;
if( SvXMLUnitConverter::convertBool(bTmp, sValue) )
{
bMergeLastPara = bTmp;
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
index aaebd7a27dca..425dfd753921 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
@@ -108,7 +108,7 @@ void XMLIndexAlphabeticalSourceContext::ProcessAttribute(
enum IndexSourceParamEnum eParam,
const OUString& rValue)
{
- sal_Bool bTmp;
+ bool bTmp;
switch (eParam)
{
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index cbd959b65084..a3c9dfafc762 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -131,7 +131,7 @@ void XMLIndexBibliographyConfigurationContext::ProcessAttribute(
}
else if( IsXMLToken(sLocalName, XML_SORT_BY_POSITION) )
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sValue))
{
bSortByPosition = bTmp;
@@ -184,7 +184,7 @@ SvXMLImportContext *XMLIndexBibliographyConfigurationContext::CreateChildContext
}
else if ( IsXMLToken( sLocalName, XML_SORT_ASCENDING ) )
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(
bTmp, xAttrList->getValueByIndex(nAttr)))
{
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
index f44154193e33..6878699c49bf 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
@@ -100,7 +100,7 @@ void XMLIndexObjectSourceContext::ProcessAttribute(
{
switch (eParam)
{
- sal_Bool bTmp;
+ bool bTmp;
case XML_TOK_INDEXSOURCE_USE_OTHER_OBJECTS:
if (SvXMLUnitConverter::convertBool(bTmp, rValue))
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index 3ee80500d21f..2b460a6fd8b6 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -215,7 +215,7 @@ void XMLIndexSourceBaseContext::ProcessAttribute(
case XML_TOK_INDEXSOURCE_RELATIVE_TABS:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, rValue))
{
bRelativeTabs = bTmp;
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index ad9f7ce10d7a..b06374046242 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -165,7 +165,7 @@ void XMLIndexTOCContext::StartElement(
}
else if ( IsXMLToken( sLocalName, XML_PROTECTED ) )
{
- sal_Bool bTmp;
+ bool bTmp;
if ( SvXMLUnitConverter::convertBool(
bTmp, xAttrList->getValueByIndex(nAttr) ) )
{
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
index c52a3f1ee2ab..50880d04285b 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
@@ -115,7 +115,7 @@ void XMLIndexTOCSourceContext::ProcessAttribute(
case XML_TOK_INDEXSOURCE_USE_OUTLINE_LEVEL:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, rValue))
{
bUseOutline = bTmp;
@@ -126,7 +126,7 @@ void XMLIndexTOCSourceContext::ProcessAttribute(
case XML_TOK_INDEXSOURCE_USE_INDEX_MARKS:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, rValue))
{
bUseMarks = bTmp;
@@ -136,7 +136,7 @@ void XMLIndexTOCSourceContext::ProcessAttribute(
case XML_TOK_INDEXSOURCE_USE_INDEX_SOURCE_STYLES:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, rValue))
{
bUseParagraphStyles = bTmp;
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
index f2702a81ed20..82a5e9011228 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
@@ -113,7 +113,7 @@ void XMLIndexTabStopEntryContext::StartElement(
// #i21237#
else if ( IsXMLToken( sLocalName, XML_WITH_TAB ) )
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttr))
bWithTab = bTmp;
}
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx
index 240e702d2b2a..4942fd8d1beb 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx
@@ -105,7 +105,7 @@ void XMLIndexTableSourceContext::ProcessAttribute(
enum IndexSourceParamEnum eParam,
const OUString& rValue)
{
- sal_Bool bTmp;
+ bool bTmp;
switch (eParam)
{
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx
index 2554229781b0..688d6d74797e 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx
@@ -107,7 +107,7 @@ void XMLIndexUserSourceContext::ProcessAttribute(
enum IndexSourceParamEnum eParam,
const OUString& rValue)
{
- sal_Bool bTmp;
+ bool bTmp;
switch (eParam)
{
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index 55dc9db9b254..b301a987fe77 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -138,7 +138,7 @@ void XMLLineNumberingImportContext::ProcessAttribute(
enum LineNumberingToken eToken,
OUString sValue)
{
- sal_Bool bTmp;
+ bool bTmp;
sal_Int32 nTmp;
switch (eToken)
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index 4b9b94b1ced7..1e244f19713d 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -312,7 +312,7 @@ void XMLSectionImportContext::ProcessAttributes(
break;
case XML_TOK_SECTION_IS_HIDDEN:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttr))
{
bIsCurrentlyVisible = !bTmp;
@@ -326,7 +326,7 @@ void XMLSectionImportContext::ProcessAttributes(
break;
case XML_TOK_SECTION_PROTECT:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttr))
{
bProtect = bTmp;
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index de61e78e564b..1e17b2554e06 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -128,7 +128,7 @@ void XMLSectionSourceDDEImportContext::StartElement(
break;
case XML_TOK_SECTION_IS_AUTOMATIC_UPDATE:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(
bTmp, xAttrList->getValueByIndex(nAttr)))
{
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
index 6ded2b4d5cbd..3dc297de8a98 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx
@@ -88,7 +88,7 @@ XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext(
break;
case XML_TOK_TEXT_HYPERLINK_SERVER_MAP:
{
- sal_Bool bTmp;
+ bool bTmp;
if( rImport.GetMM100UnitConverter().convertBool( bTmp,
rValue ) )
{
diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
index ed207fed6c37..ed297464e9e8 100644
--- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
@@ -77,7 +77,7 @@ void XMLTrackedChangesImportContext::StartElement(
{
if ( IsXMLToken( sLocalName, XML_TRACK_CHANGES ) )
{
- sal_Bool bTmp;
+ bool bTmp;
if( SvXMLUnitConverter::convertBool(
bTmp, xAttrList->getValueByIndex(i)) )
{
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 579ad91ddfe9..b975dd976aff 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -713,8 +713,8 @@ void XMLSenderFieldImportContext::ProcessAttribute(
if (XML_TOK_TEXTFIELD_FIXED == nAttrToken) {
// set bVal
- sal_Bool bVal;
- sal_Bool bRet = GetImport().GetMM100UnitConverter().
+ bool bVal;
+ bool bRet = GetImport().GetMM100UnitConverter().
convertBool(bVal, sAttrValue);
// set bFixed if successfull
@@ -1132,7 +1132,7 @@ void XMLTimeFieldImportContext::ProcessAttribute(
}
case XML_TOK_TEXTFIELD_FIXED:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
{
bFixed = bTmp;
@@ -1683,7 +1683,7 @@ void XMLSimpleDocInfoImportContext::ProcessAttribute(
{
if (XML_TOK_TEXTFIELD_FIXED == nAttrToken)
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
{
bFixed = bTmp;
@@ -2076,7 +2076,7 @@ void XMLHiddenParagraphImportContext::ProcessAttribute(
}
else if (XML_TOK_TEXTFIELD_IS_HIDDEN == nAttrToken)
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
{
bIsHidden = bTmp;
@@ -2150,7 +2150,7 @@ void XMLConditionalTextImportContext::ProcessAttribute(
break;
case XML_TOK_TEXTFIELD_CURRENT_VALUE:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
{
bCurrentValue = bTmp;
@@ -2231,7 +2231,7 @@ void XMLHiddenTextImportContext::ProcessAttribute(
break;
case XML_TOK_TEXTFIELD_IS_HIDDEN:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
{
bIsHidden = bTmp;
@@ -2298,7 +2298,7 @@ void XMLFileNameImportContext::ProcessAttribute(
{
case XML_TOK_TEXTFIELD_FIXED:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
{
bFixed = bTmp;
@@ -2680,7 +2680,7 @@ void XMLPageVarSetFieldImportContext::ProcessAttribute(
{
case XML_TOK_TEXTFIELD_ACTIVE:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue))
{
bActive = bTmp;
@@ -3113,7 +3113,7 @@ void XMLDdeFieldDeclImportContext::StartElement(
break;
case XML_TOK_DDEFIELD_UPDATE:
{
- sal_Bool bTmp;
+ bool bTmp;
if ( SvXMLUnitConverter::convertBool(
bTmp, xAttrList->getValueByIndex(i)) )
{
@@ -3959,7 +3959,7 @@ bool lcl_ProcessLabel( const SvXMLImport& rImport,
}
else if( IsXMLToken( sLocalName, XML_CURRENT_SELECTED ) )
{
- sal_Bool bTmp;
+ bool bTmp;
if( SvXMLUnitConverter::convertBool( bTmp, sValue ) )
rIsSelected = bTmp;
}
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 4a338c6cf832..fa2f4cc08273 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::table;
using namespace ::com::sun::star::text;
-sal_Bool XMLTextImportPropertyMapper::handleSpecialItem(
+bool XMLTextImportPropertyMapper::handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 566c94ed166a..d0fca2f5745a 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -1540,7 +1540,8 @@ void XMLAlphaIndexMarkImportContext_Impl::ProcessAttribute(
}
else if ( IsXMLToken( sLocalName, XML_MAIN_ENTRY ) )
{
- sal_Bool bMainEntry = sal_False, bTmp;
+ sal_Bool bMainEntry = sal_False;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, sValue))
bMainEntry = bTmp;
@@ -1977,7 +1978,7 @@ XMLParaContext::XMLParaContext(
break;
case XML_TOK_TEXT_P_IS_LIST_HEADER:
{
- sal_Bool bBool;
+ bool bBool;
if( SvXMLUnitConverter::convertBool( bBool, rValue ) )
{
bIsListHeader = bBool;
@@ -1986,7 +1987,7 @@ XMLParaContext::XMLParaContext(
break;
case XML_TOK_TEXT_P_RESTART_NUMBERING:
{
- sal_Bool bBool;
+ bool bBool;
if (SvXMLUnitConverter::convertBool(bBool, rValue))
{
bIsRestart = bBool;
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index fb0a957f6c86..a9b550675aad 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -1373,7 +1373,7 @@ void XMLValueImportHelper::ProcessAttribute(
case XML_TOK_TEXTFIELD_BOOL_VALUE:
{
- sal_Bool bTmp;
+ bool bTmp;
sal_Bool bRet = SvXMLUnitConverter::convertBool(bTmp,sAttrValue);
if (bRet) {
bFloatValueOK = sal_True;