[PATCH] native bool support in SvXMLUnitConverter and connexe
bool-related-issues
dbaccess/source/core/recovery/settingsimport.cxx | 2 +-
.../source/filter/xml/xmlDataSourceSetting.cxx | 2 +-
.../source/filter/xml/xmlControlProperty.cxx | 2 +-
reportdesign/source/filter/xml/xmlStyleImport.cxx | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
unotools/source/config/fltrcfg.cxx | 70 ++++++++++++++++++------------------
1 files changed, 35 insertions(+), 35 deletions(-)
sc/source/filter/xml/xmlstyle.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
xmloff/inc/XMLChartPropertySetMapper.hxx | 2 +-
xmloff/inc/txtimppr.hxx | 2 +-
xmloff/inc/xmloff/shapeimport.hxx | 6 ++--
xmloff/inc/xmloff/xmlimppr.hxx | 2 +-
xmloff/inc/xmloff/xmlstyle.hxx | 2 +-
xmloff/inc/xmloff/xmluconv.hxx | 2 +-
xmloff/source/chart/PropertyMaps.cxx | 4 +-
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 4 +-
.../source/chart/XMLErrorIndicatorPropertyHdl.cxx | 2 +-
xmloff/source/core/xmluconv.cxx | 4 +-
xmloff/source/draw/animationimport.cxx | 4 +-
xmloff/source/draw/ximp3dscene.cxx | 6 ++--
xmloff/source/draw/ximpcustomshape.cxx | 2 +-
xmloff/source/forms/elementimport.cxx | 4 +-
xmloff/source/forms/officeforms.cxx | 2 +-
xmloff/source/forms/propertyimport.cxx | 2 +-
xmloff/source/style/PageMasterImportPropMapper.cxx | 2 +-
xmloff/source/style/PageMasterImportPropMapper.hxx | 2 +-
xmloff/source/style/xmlbahdl.cxx | 6 ++--
xmloff/source/style/xmlimppr.cxx | 2 +-
xmloff/source/style/xmlnume.cxx | 2 +-
xmloff/source/style/xmlnumfi.cxx | 4 +-
.../source/text/XMLChangedRegionImportContext.cxx | 2 +-
.../text/XMLIndexAlphabeticalSourceContext.cxx | 2 +-
.../XMLIndexBibliographyConfigurationContext.cxx | 8 +++---
xmloff/source/text/XMLIndexObjectSourceContext.cxx | 2 +-
xmloff/source/text/XMLIndexSourceBaseContext.cxx | 2 +-
xmloff/source/text/XMLIndexTOCContext.cxx | 2 +-
xmloff/source/text/XMLIndexTOCSourceContext.cxx | 6 ++--
xmloff/source/text/XMLIndexTabStopEntryContext.cxx | 2 +-
xmloff/source/text/XMLIndexTableSourceContext.cxx | 2 +-
xmloff/source/text/XMLIndexUserSourceContext.cxx | 2 +-
.../source/text/XMLLineNumberingImportContext.cxx | 2 +-
xmloff/source/text/XMLSectionImportContext.cxx | 4 +-
.../text/XMLSectionSourceDDEImportContext.cxx | 2 +-
.../source/text/XMLTextFrameHyperlinkContext.cxx | 2 +-
.../source/text/XMLTrackedChangesImportContext.cxx | 4 +-
xmloff/source/text/txtfldi.cxx | 22 ++++++++++----------
xmloff/source/text/txtimppr.cxx | 2 +-
xmloff/source/text/txtparai.cxx | 7 +++--
xmloff/source/text/txtvfldi.cxx | 4 +-
xmloff/source/xforms/XFormsSubmissionContext.cxx | 2 +-
42 files changed, 75 insertions(+), 74 deletions(-)
sw/source/filter/xml/xmlimpit.cxx | 2 +-
sw/source/filter/xml/xmltbli.cxx | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx
b/dbaccess/source/core/recovery/settingsimport.cxx
index c30792b..e644b11 100644
--- a/dbaccess/source/core/recovery/settingsimport.cxx
+++ b/dbaccess/source/core/recovery/settingsimport.cxx
@@ -224,7 +224,7 @@ namespace dbaccess
}
else if ( ::xmloff::token::IsXMLToken( rItemType,
::xmloff::token::XML_BOOLEAN ) )
{
- sal_Bool nValue( sal_False );
+ bool nValue( sal_False );
if ( SvXMLUnitConverter::convertBool( nValue, sValue ) )
o_rValue <<= nValue;
else
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index 6bc1bb9..4a7db41 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -207,7 +207,7 @@ Any OXMLDataSourceSetting::convertString(const
::com::sun::star::uno::Type& _rEx
{
case TypeClass_BOOLEAN: // sal_Bool
{
- sal_Bool bValue;
+ bool bValue;
#if OSL_DEBUG_LEVEL > 0
sal_Bool bSuccess =
#endif
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx
b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 2330c6a..37a9d26 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -204,7 +204,7 @@ Any OXMLControlProperty::convertString(const
::com::sun::star::uno::Type& _rExpe
{
case TypeClass_BOOLEAN: // sal_Bool
{
- sal_Bool bValue;
+ bool bValue;
#if OSL_DEBUG_LEVEL > 0
sal_Bool bSuccess =
#endif
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx
b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 25db1be..90cb7f8 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -71,7 +71,7 @@ public:
{
}
/** this method is called for every item that has the
MID_FLAG_SPECIAL_ITEM_IMPORT flag set */
- virtual sal_Bool handleSpecialItem(
+ virtual bool handleSpecialItem(
XMLPropertyState& /*rProperty*/,
::std::vector< XMLPropertyState >& /*rProperties*/,
const ::rtl::OUString& /*rValue*/,
diff --git a/sc/source/filter/xml/xmlstyle.cxx
b/sc/source/filter/xml/xmlstyle.cxx
index 90fa69a..af1fdac 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -1121,7 +1121,7 @@ sal_Bool XmlScPropHdl_PrintContent::importXML(
}
if ((rValue >>= aCellProtection) || bDefault)
{
- sal_Bool bValue;
+ bool bValue;
if (SvXMLUnitConverter::convertBool(bValue, rStrImpValue))
{
aCellProtection.IsPrintHidden = !bValue;
diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx
b/xmloff/inc/XMLChartPropertySetMapper.hxx
index 93aa8dd..359eb88 100644
--- a/xmloff/inc/XMLChartPropertySetMapper.hxx
+++ b/xmloff/inc/XMLChartPropertySetMapper.hxx
@@ -112,7 +112,7 @@ public:
const SvXMLImport& rImport );
virtual ~XMLChartImportPropertyMapper();
- virtual sal_Bool handleSpecialItem(
+ virtual bool handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
diff --git a/xmloff/inc/txtimppr.hxx b/xmloff/inc/txtimppr.hxx
index 1277bcf..dfe249b 100644
--- a/xmloff/inc/txtimppr.hxx
+++ b/xmloff/inc/txtimppr.hxx
@@ -57,7 +57,7 @@ class XMLOFF_DLLPUBLIC XMLTextImportPropertyMapper :
public SvXMLImportPropertyM
XMLPropertyState** ppNewFontCharSet ) const;
protected:
- virtual sal_Bool handleSpecialItem(
+ virtual bool handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
diff --git a/xmloff/inc/xmloff/shapeimport.hxx
b/xmloff/inc/xmloff/shapeimport.hxx
index ae72a20..ae0cd7d 100644
--- a/xmloff/inc/xmloff/shapeimport.hxx
+++ b/xmloff/inc/xmloff/shapeimport.hxx
@@ -189,8 +189,8 @@ class SdXML3DLightContext: public SvXMLImportContext
// local parameters which need to be read
Color maDiffuseColor;
::basegfx::B3DVector maDirection;
- BOOL mbEnabled;
- BOOL mbSpecular;
+ bool mbEnabled;
+ bool mbSpecular;
public:
SdXML3DLightContext(
@@ -228,7 +228,7 @@ protected:
sal_Int32 mnShadowSlant;
com::sun::star::drawing::ShadeMode mxShadeMode;
Color maAmbientColor;
- BOOL mbLightingMode;
+ bool mbLightingMode;
::basegfx::B3DVector maVRP;
::basegfx::B3DVector maVPN;
diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/xmloff/inc/xmloff/xmlimppr.hxx
index 960c01b..cbc4560 100644
--- a/xmloff/inc/xmloff/xmlimppr.hxx
+++ b/xmloff/inc/xmloff/xmlimppr.hxx
@@ -114,7 +114,7 @@ public:
sal_Int32 nStartIdx, sal_Int32 nEndIdx ) const;
/** this method is called for every item that has the
MID_FLAG_SPECIAL_ITEM_IMPORT flag set */
- virtual sal_Bool handleSpecialItem(
+ virtual bool handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
diff --git a/xmloff/inc/xmloff/xmlstyle.hxx b/xmloff/inc/xmloff/xmlstyle.hxx
index 5f721a6..a999a63 100644
--- a/xmloff/inc/xmloff/xmlstyle.hxx
+++ b/xmloff/inc/xmloff/xmlstyle.hxx
@@ -243,7 +243,7 @@ public:
const SvXMLStyleContext *FindStyleChildContext(
sal_uInt16 nFamily,
const ::rtl::OUString& rName,
- BOOL bCreateIndex=sal_False ) const;
+ sal_Bool bCreateIndex=sal_False ) const;
virtual sal_uInt16 GetFamily( const ::rtl::OUString& rFamily ) const;
virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
sal_uInt16 nFamily ) const;
diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx
index ca22ef8..fb5c971 100644
--- a/xmloff/inc/xmloff/xmluconv.hxx
+++ b/xmloff/inc/xmloff/xmluconv.hxx
@@ -173,7 +173,7 @@ public:
MapUnit eDstUnit );
/** convert string to boolean */
- static sal_Bool convertBool( sal_Bool& rBool,
+ static sal_Bool convertBool( bool& rBool,
const ::rtl::OUString& rString );
/** convert boolean to string */
diff --git a/xmloff/source/chart/PropertyMaps.cxx
b/xmloff/source/chart/PropertyMaps.cxx
index 0514d4b..0a987d9 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -496,7 +496,7 @@
XMLChartImportPropertyMapper::~XMLChartImportPropertyMapper()
{
}
-sal_Bool XMLChartImportPropertyMapper::handleSpecialItem(
+bool XMLChartImportPropertyMapper::handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
@@ -510,7 +510,7 @@ sal_Bool XMLChartImportPropertyMapper::handleSpecialItem(
if( nContextId )
{
sal_Int32 nValue = 0;
- sal_Bool bValue = sal_False;
+ bool bValue = false;
switch( nContextId )
{
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index c6722cf..1c312a5 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -2053,8 +2053,8 @@ void SchXMLEquationContext::StartElement( const
uno::Reference< xml::sax::XAttri
const SvXMLTokenMap& rAttrTokenMap =
mrImportHelper.GetRegEquationAttrTokenMap();
OUString sAutoStyleName;
- sal_Bool bShowEquation = sal_True;
- sal_Bool bShowRSquare = sal_False;
+ bool bShowEquation = true;
+ bool bShowRSquare = false;
awt::Point aPosition;
bool bHasXPos = false;
bool bHasYPos = false;
diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
index 1fb3899..9af4040 100644
--- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
+++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.cxx
@@ -40,7 +40,7 @@ XMLErrorIndicatorPropertyHdl::~XMLErrorIndicatorPropertyHdl()
sal_Bool XMLErrorIndicatorPropertyHdl::importXML( const
::rtl::OUString& rStrImpValue,
uno::Any& rValue,
const SvXMLUnitConverter& /*rUnitConverter*/ ) const
{
- sal_Bool bValue;
+ bool bValue;
SvXMLUnitConverter::convertBool( bValue, rStrImpValue );
// modify existing value
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 0346aff..bbbcac9 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -441,7 +441,7 @@ void SvXMLUnitConverter::convertMeasure(
OUStringBuffer& rBuffer,
}
/** convert string to boolean */
-sal_Bool SvXMLUnitConverter::convertBool( sal_Bool& rBool,
+sal_Bool SvXMLUnitConverter::convertBool( bool& rBool,
const OUString& rString )
{
rBool = IsXMLToken(rString, XML_TRUE);
@@ -2253,7 +2253,7 @@ sal_Bool SvXMLUnitConverter::convertAny(
com::sun::star::uno::Any& aValue,
if (sType.equalsAscii("boolean"))
{
- sal_Bool bTempValue = sal_False;
+ bool bTempValue = false;
SvXMLUnitConverter::convertBool(bTempValue, sValue);
aValue <<= bTempValue;
bConverted = sal_True;
diff --git a/xmloff/source/draw/animationimport.cxx
b/xmloff/source/draw/animationimport.cxx
index 38cccc9..c9afbf8 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -873,7 +873,7 @@ void AnimationNodeContext::init_node( const
::com::sun::star::uno::Reference< :
break;
case ANA_AutoReverse:
{
- sal_Bool bTemp;
+ bool bTemp;
if( SvXMLUnitConverter::convertBool( bTemp, rValue ) )
mxNode->setAutoReverse( bTemp );
}
@@ -918,7 +918,7 @@ void AnimationNodeContext::init_node( const
::com::sun::star::uno::Reference< :
break;
case ANA_After_Effect:
{
- sal_Bool bTemp;
+ bool bTemp;
if( SvXMLUnitConverter::convertBool( bTemp, rValue ) )
aUserData.push_back( NamedValue( GetXMLToken(
XML_AFTER_EFFECT ), makeAny( bTemp ) ) );
}
diff --git a/xmloff/source/draw/ximp3dscene.cxx
b/xmloff/source/draw/ximp3dscene.cxx
index a691c47..9a5959e 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -54,8 +54,8 @@ SdXML3DLightContext::SdXML3DLightContext(
: SvXMLImportContext( rImport, nPrfx, rLName),
maDiffuseColor(0x00000000),
maDirection(0.0, 0.0, 1.0),
- mbEnabled(FALSE),
- mbSpecular(FALSE)
+ mbEnabled(false),
+ mbSpecular(false)
{
// read attributes for the 3DScene
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -231,7 +231,7 @@
SdXML3DSceneAttributesHelper::SdXML3DSceneAttributesHelper(
SvXMLImport& rImport
mnShadowSlant(0),
mxShadeMode(drawing::ShadeMode_SMOOTH),
maAmbientColor(0x00666666),
- mbLightingMode(FALSE),
+ mbLightingMode(false),
maVRP(0.0, 0.0, 1.0),
maVPN(0.0, 0.0, 1.0),
maVUP(0.0, 1.0, 0.0),
diff --git a/xmloff/source/draw/ximpcustomshape.cxx
b/xmloff/source/draw/ximpcustomshape.cxx
index 4462553..75d1985 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -86,7 +86,7 @@ const SvXMLEnumMapEntry aXML_GluePointEnumMap[] =
void GetBool( std::vector< com::sun::star::beans::PropertyValue >& rDest,
const rtl::OUString& rValue, const
EnhancedCustomShapeTokenEnum eDestProp )
{
- sal_Bool bAttrBool;
+ bool bAttrBool;
if ( SvXMLUnitConverter::convertBool( bAttrBool, rValue ) )
{
beans::PropertyValue aProp;
diff --git a/xmloff/source/forms/elementimport.cxx
b/xmloff/source/forms/elementimport.cxx
index 036d803..bbe0376 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1693,13 +1693,13 @@ namespace xmloff
GetPrefix(),
::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_SELECTED)));
// propagate the selected flag
- sal_Bool bSelected;
+ bool bSelected;
GetImport().GetMM100UnitConverter().convertBool(bSelected,
_rxAttrList->getValueByName(sSelectedAttribute));
if (bSelected)
m_xListBoxImport->implSelectCurrentItem();
// same for the default selected
- sal_Bool bDefaultSelected;
+ bool bDefaultSelected;
GetImport().GetMM100UnitConverter().convertBool(bDefaultSelected,
_rxAttrList->getValueByName(sDefaultSelectedAttribute));
if (bDefaultSelected)
m_xListBoxImport->implDefaultSelectCurrentItem();
diff --git a/xmloff/source/forms/officeforms.cxx
b/xmloff/source/forms/officeforms.cxx
index 69bc154..204d619 100644
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -83,7 +83,7 @@ namespace xmloff
// get and convert the value
::rtl::OUString sAttributeValue =
_rxAttributes->getValueByName(sCompleteAttributeName);
- sal_Bool bValue = _bDefault;
+ bool bValue = _bDefault;
GetImport().GetMM100UnitConverter().convertBool(bValue,
sAttributeValue);
// set the property
diff --git a/xmloff/source/forms/propertyimport.cxx
b/xmloff/source/forms/propertyimport.cxx
index 9cf2bea..6b01f93 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -109,7 +109,7 @@ Any PropertyConversion::convertString(
SvXMLImport& _rImporter, const ::com::sun
{
case TypeClass_BOOLEAN: // sal_Bool
{
- sal_Bool bValue;
+ bool bValue;
#if OSL_DEBUG_LEVEL > 0
sal_Bool bSuccess =
#endif
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx
b/xmloff/source/style/PageMasterImportPropMapper.cxx
index 76eab35..fc3cfcc 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -62,7 +62,7 @@
PageMasterImportPropertyMapper::~PageMasterImportPropertyMapper()
{
}
-sal_Bool PageMasterImportPropertyMapper::handleSpecialItem(
+bool PageMasterImportPropertyMapper::handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
diff --git a/xmloff/source/style/PageMasterImportPropMapper.hxx
b/xmloff/source/style/PageMasterImportPropMapper.hxx
index f64a91a..b3991c4 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.hxx
@@ -46,7 +46,7 @@ public:
virtual ~PageMasterImportPropertyMapper();
/** this method is called for every item that has the
MID_FLAG_SPECIAL_ITEM_IMPORT flag set */
- virtual sal_Bool handleSpecialItem(
+ virtual bool handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index 7dc81eb..caf73f1 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -247,7 +247,7 @@ sal_Bool XMLBoolPropHdl::importXML( const
OUString& rStrImpValue, Any& rValue, c
{
sal_Bool bRet = sal_False;
- sal_Bool bValue;
+ bool bValue;
bRet = SvXMLUnitConverter::convertBool( bValue, rStrImpValue );
rValue <<= sal_Bool(bValue);
@@ -285,7 +285,7 @@ sal_Bool XMLNBoolPropHdl::importXML( const
OUString& rStrImpValue, Any& rValue,
{
sal_Bool bRet = sal_False;
- sal_Bool bValue;
+ bool bValue;
bRet = SvXMLUnitConverter::convertBool( bValue, rStrImpValue );
rValue <<= sal_Bool(!bValue);
@@ -808,7 +808,7 @@ XMLIsAutoColorPropHdl::~XMLIsAutoColorPropHdl()
sal_Bool XMLIsAutoColorPropHdl::importXML( const OUString&
rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const
{
- sal_Bool bValue;
+ bool bValue;
// An auto color overrides any other color set!
sal_Bool bRet = SvXMLUnitConverter::convertBool( bValue, rStrImpValue );
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 1c5ddc7..fbb8327 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -354,7 +354,7 @@ void SvXMLImportPropertyMapper::importXML(
}
/** this method is called for every item that has the
MID_FLAG_SPECIAL_ITEM_IMPORT flag set */
-BOOL SvXMLImportPropertyMapper::handleSpecialItem(
+bool SvXMLImportPropertyMapper::handleSpecialItem(
XMLPropertyState& rProperty,
vector< XMLPropertyState >& rProperties,
const OUString& rValue,
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 39614be..4790a48 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -115,7 +115,7 @@ void SvxXMLNumRuleExport::exportLevelStyles( const
uno::Reference< ::com::sun::s
void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel,
const
uno::Sequence<beans::PropertyValue>& rProps,
- BOOL bOutline )
+ sal_Bool bOutline )
{
sal_Int16 eType = NumberingType::CHAR_SPECIAL;
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 01d684c..f1274bb 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -950,7 +950,7 @@
SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport&
rImport,
{
OUString sLanguage, sCountry;
sal_Int32 nAttrVal;
- sal_Bool bAttrBool;
+ bool bAttrBool;
sal_uInt16 nAttrEnum;
double fAttrDouble;
@@ -1399,7 +1399,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext(
SvXMLImport& rImport,
{
OUString sLanguage, sCountry;
::com::sun::star::i18n::NativeNumberXmlAttributes aNatNumAttr;
- sal_Bool bAttrBool;
+ bool bAttrBool;
sal_uInt16 nAttrEnum;
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx
b/xmloff/source/text/XMLChangedRegionImportContext.cxx
index 6b34d1a..bce7205 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 93b9021..8a080a2 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 72054bf..9743691 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -116,14 +116,14 @@ void
XMLIndexBibliographyConfigurationContext::ProcessAttribute(
if( IsXMLToken(sLocalName, XML_PREFIX) )
{
sPrefix = sValue;
- }
+ }
else if( IsXMLToken(sLocalName, XML_SUFFIX) )
{
sSuffix = sValue;
}
else if( IsXMLToken(sLocalName, XML_NUMBERED_ENTRIES) )
{
- sal_Bool bTmp;
+ bool bTmp;
if( SvXMLUnitConverter::convertBool(bTmp, sValue) )
{
bNumberedEntries = bTmp;
@@ -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 f492531..e905d38 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 f206f8b..0a07463 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 092af4f..b84ef49 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 0aaefc8..4783404 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 35551f4..620f646 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 03b57a5..021f4dd 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 e84123b..782a887 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 a355373..78fce8d 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 f95557f..f481ea2 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 0ae1541..acc0fc7 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 05e9cd3..9958892 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 8a3bbad..c1721a9 100644
--- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx
+++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx
@@ -77,8 +77,8 @@ void XMLTrackedChangesImportContext::StartElement(
{
if ( IsXMLToken( sLocalName, XML_TRACK_CHANGES ) )
{
- sal_Bool bTmp;
- if( SvXMLUnitConverter::convertBool(
+ bool bTmp;
+ if( SvXMLUnitConverter::convertBool(
bTmp, xAttrList->getValueByIndex(i)) )
{
bTrackChanges = bTmp;
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 7087f7e..09b34c4 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 b6045f5..1b8f10c 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 9277b6a..35be728 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 00aa5cc..16e34cf 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -1373,13 +1373,13 @@ 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;
fValue = (bTmp ? 1.0 : 0.0);
}
- else
+ else
{
double fTmp;
bRet = SvXMLUnitConverter::convertDouble(fTmp,sAttrValue);
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx
b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index 2b28a06..252d078 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -105,7 +105,7 @@ XFormsSubmissionContext::~XFormsSubmissionContext()
Any toBool( const OUString& rValue )
{
Any aValue;
- sal_Bool bValue;
+ bool bValue;
if( SvXMLUnitConverter::convertBool( bValue, rValue ) )
{
aValue <<= ( bValue ? true : false );
diff --git a/unotools/source/config/fltrcfg.cxx
b/unotools/source/config/fltrcfg.cxx
index 35f13c0..e42343f 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -399,106 +399,106 @@ void SvtFilterOptions::Load()
}
// -----------------------------------------------------------------------
-void SvtFilterOptions::SetLoadWordBasicCode( BOOL bFlag )
+void SvtFilterOptions::SetLoadWordBasicCode( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_WORD_CODE, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsLoadWordBasicCode() const
+sal_Bool SvtFilterOptions::IsLoadWordBasicCode() const
{
return pImp->IsFlag( FILTERCFG_WORD_CODE );
}
-void SvtFilterOptions::SetLoadWordBasicStorage( BOOL bFlag )
+void SvtFilterOptions::SetLoadWordBasicStorage( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_WORD_STORAGE, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsLoadWordBasicStorage() const
+sal_Bool SvtFilterOptions::IsLoadWordBasicStorage() const
{
return pImp->IsFlag( FILTERCFG_WORD_STORAGE );
}
// -----------------------------------------------------------------------
-void SvtFilterOptions::SetLoadExcelBasicCode( BOOL bFlag )
+void SvtFilterOptions::SetLoadExcelBasicCode( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_EXCEL_CODE, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsLoadExcelBasicCode() const
+sal_Bool SvtFilterOptions::IsLoadExcelBasicCode() const
{
return pImp->IsFlag( FILTERCFG_EXCEL_CODE );
}
-void SvtFilterOptions::SetLoadExcelBasicExecutable( BOOL bFlag )
+void SvtFilterOptions::SetLoadExcelBasicExecutable( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_EXCEL_EXECTBL, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsLoadExcelBasicExecutable() const
+sal_Bool SvtFilterOptions::IsLoadExcelBasicExecutable() const
{
return pImp->IsFlag( FILTERCFG_EXCEL_EXECTBL );
}
-void SvtFilterOptions::SetLoadExcelBasicStorage( BOOL bFlag )
+void SvtFilterOptions::SetLoadExcelBasicStorage( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_EXCEL_STORAGE, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsLoadExcelBasicStorage() const
+sal_Bool SvtFilterOptions::IsLoadExcelBasicStorage() const
{
return pImp->IsFlag( FILTERCFG_EXCEL_STORAGE );
}
// -----------------------------------------------------------------------
-void SvtFilterOptions::SetLoadPPointBasicCode( BOOL bFlag )
+void SvtFilterOptions::SetLoadPPointBasicCode( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_PPOINT_CODE, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsLoadPPointBasicCode() const
+sal_Bool SvtFilterOptions::IsLoadPPointBasicCode() const
{
return pImp->IsFlag( FILTERCFG_PPOINT_CODE );
}
-void SvtFilterOptions::SetLoadPPointBasicStorage( BOOL bFlag )
+void SvtFilterOptions::SetLoadPPointBasicStorage( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_PPOINT_STORAGE, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsLoadPPointBasicStorage() const
+sal_Bool SvtFilterOptions::IsLoadPPointBasicStorage() const
{
return pImp->IsFlag( FILTERCFG_PPOINT_STORAGE );
}
// -----------------------------------------------------------------------
-BOOL SvtFilterOptions::IsMathType2Math() const
+sal_Bool SvtFilterOptions::IsMathType2Math() const
{
return pImp->IsFlag( FILTERCFG_MATH_LOAD );
}
-void SvtFilterOptions::SetMathType2Math( BOOL bFlag )
+void SvtFilterOptions::SetMathType2Math( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_MATH_LOAD, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsMath2MathType() const
+sal_Bool SvtFilterOptions::IsMath2MathType() const
{
return pImp->IsFlag( FILTERCFG_MATH_SAVE );
}
-void SvtFilterOptions::SetMath2MathType( BOOL bFlag )
+void SvtFilterOptions::SetMath2MathType( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_MATH_SAVE, bFlag );
SetModified();
@@ -506,57 +506,57 @@ void SvtFilterOptions::SetMath2MathType( BOOL bFlag )
// -----------------------------------------------------------------------
-BOOL SvtFilterOptions::IsWinWord2Writer() const
+sal_Bool SvtFilterOptions::IsWinWord2Writer() const
{
return pImp->IsFlag( FILTERCFG_WRITER_LOAD );
}
-void SvtFilterOptions::SetWinWord2Writer( BOOL bFlag )
+void SvtFilterOptions::SetWinWord2Writer( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_WRITER_LOAD, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsWriter2WinWord() const
+sal_Bool SvtFilterOptions::IsWriter2WinWord() const
{
return pImp->IsFlag( FILTERCFG_WRITER_SAVE );
}
-void SvtFilterOptions::SetWriter2WinWord( BOOL bFlag )
+void SvtFilterOptions::SetWriter2WinWord( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_WRITER_SAVE, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsUseEnhancedFields() const
+sal_Bool SvtFilterOptions::IsUseEnhancedFields() const
{
return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS );
}
-void SvtFilterOptions::SetUseEnhancedFields( BOOL bFlag )
+void SvtFilterOptions::SetUseEnhancedFields( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_USE_ENHANCED_FIELDS, bFlag );
SetModified();
}
// -----------------------------------------------------------------------
-BOOL SvtFilterOptions::IsExcel2Calc() const
+sal_Bool SvtFilterOptions::IsExcel2Calc() const
{
return pImp->IsFlag( FILTERCFG_CALC_LOAD );
}
-void SvtFilterOptions::SetExcel2Calc( BOOL bFlag )
+void SvtFilterOptions::SetExcel2Calc( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_CALC_LOAD, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsCalc2Excel() const
+sal_Bool SvtFilterOptions::IsCalc2Excel() const
{
return pImp->IsFlag( FILTERCFG_CALC_SAVE );
}
-void SvtFilterOptions::SetCalc2Excel( BOOL bFlag )
+void SvtFilterOptions::SetCalc2Excel( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_CALC_SAVE, bFlag );
SetModified();
@@ -564,23 +564,23 @@ void SvtFilterOptions::SetCalc2Excel( BOOL bFlag )
// -----------------------------------------------------------------------
-BOOL SvtFilterOptions::IsPowerPoint2Impress() const
+sal_Bool SvtFilterOptions::IsPowerPoint2Impress() const
{
return pImp->IsFlag( FILTERCFG_IMPRESS_LOAD );
}
-void SvtFilterOptions::SetPowerPoint2Impress( BOOL bFlag )
+void SvtFilterOptions::SetPowerPoint2Impress( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_IMPRESS_LOAD, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsImpress2PowerPoint() const
+sal_Bool SvtFilterOptions::IsImpress2PowerPoint() const
{
return pImp->IsFlag( FILTERCFG_IMPRESS_SAVE );
}
-void SvtFilterOptions::SetImpress2PowerPoint( BOOL bFlag )
+void SvtFilterOptions::SetImpress2PowerPoint( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_IMPRESS_SAVE, bFlag );
SetModified();
@@ -595,19 +595,19 @@ SvtFilterOptions* SvtFilterOptions::Get()
// -----------------------------------------------------------------------
-BOOL SvtFilterOptions::IsEnablePPTPreview() const
+sal_Bool SvtFilterOptions::IsEnablePPTPreview() const
{
return pImp->IsFlag( FILTERCFG_ENABLE_PPT_PREVIEW );
}
-BOOL SvtFilterOptions::IsEnableCalcPreview() const
+sal_Bool SvtFilterOptions::IsEnableCalcPreview() const
{
return pImp->IsFlag( FILTERCFG_ENABLE_EXCEL_PREVIEW );
}
-BOOL SvtFilterOptions::IsEnableWordPreview() const
+sal_Bool SvtFilterOptions::IsEnableWordPreview() const
{
return pImp->IsFlag( FILTERCFG_ENABLE_WORD_PREVIEW );
}
diff --git a/sw/source/filter/xml/xmlimpit.cxx
b/sw/source/filter/xml/xmlimpit.cxx
index 00f78ee..0e4617e 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -288,7 +288,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue(
case MID_FIRST_AUTO:
{
- sal_Bool bAutoFirst;
+ bool bAutoFirst;
bOk = rUnitConverter.convertBool( bAutoFirst, rValue );
if( bOk )
pLRSpace->SetAutoFirst( bAutoFirst );
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index c3beb63..93f7f5a 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -535,7 +535,7 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
break;
case XML_TOK_TABLE_BOOLEAN_VALUE:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, rValue))
{
fValue = (bTmp ? 1.0 : 0.0);
@@ -545,7 +545,7 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
break;
case XML_TOK_TABLE_PROTECTED:
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, rValue))
{
bProtect = bTmp;
@@ -1132,7 +1132,7 @@ void SwXMLDDETableContext_Impl::StartElement(
}
else if ( IsXMLToken( aLocalName, XML_AUTOMATIC_UPDATE ) )
{
- sal_Bool bTmp;
+ bool bTmp;
if (SvXMLUnitConverter::convertBool(bTmp, rValue))
{
bIsAutomaticUpdate = bTmp;
--
1.7.1
Context
- [Libreoffice] [PATCH] native bool support in SvXMLUnitConverter and connexe bool-related-issues · Norbert Thiebaud
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.