diff options
22 files changed, 51 insertions, 51 deletions
diff --git a/include/xmloff/PropertySetInfoHash.hxx b/include/xmloff/PropertySetInfoHash.hxx index 4ed9c3dc7f29..4f987ca8e424 100644 --- a/include/xmloff/PropertySetInfoHash.hxx +++ b/include/xmloff/PropertySetInfoHash.hxx @@ -48,7 +48,7 @@ inline bool PropertySetInfoHash::operator()( const PropertySetInfoKey& r2 ) const { if( r1.xPropInfo != r2.xPropInfo ) - return sal_False; + return false; const sal_Int8* pId1 = r1.aImplementationId.getConstArray(); const sal_Int8* pId2 = r2.aImplementationId.getConstArray(); diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index f92bbbc9f9ba..ebe54824fca7 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -115,10 +115,10 @@ const XMLPropertyHandler* XMLChartPropHdlFactory::GetPropertyHandler( sal_Int32 break; case XML_SCH_TYPE_ERROR_INDICATOR_LOWER: - pHdl = new XMLErrorIndicatorPropertyHdl( sal_False ); + pHdl = new XMLErrorIndicatorPropertyHdl( false ); break; case XML_SCH_TYPE_ERROR_INDICATOR_UPPER: - pHdl = new XMLErrorIndicatorPropertyHdl( sal_True ); + pHdl = new XMLErrorIndicatorPropertyHdl( true ); break; case XML_SCH_TYPE_SOLID_TYPE: diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx index 7f6881eb2f97..ff956bc59f2f 100644 --- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx +++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx @@ -93,11 +93,11 @@ bool lcl_convertEnum( if( IsXMLToken( rValue, pMap->eToken ) ) { rEnum = pMap->nValue; - return sal_True; + return true; } pMap++; } - return sal_False; + return false; } } // anonymous namespace diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index b68cafe28a76..8e3b8baf304b 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -197,7 +197,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey, { case XML_NAMESPACE_UNKNOWN: // ...if it's a completely unknown namespace, assert and return the local name - DBG_ASSERT( sal_False, "SvXMLNamespaceMap::GetQNameByKey: invalid namespace key" ); + DBG_ASSERT( false, "SvXMLNamespaceMap::GetQNameByKey: invalid namespace key" ); case XML_NAMESPACE_NONE: // ...if there isn't one, return the local name return rLocalName; @@ -260,7 +260,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey, else { // ... if it isn't, this is a Bad Thing, assert and return the local name - DBG_ASSERT( sal_False, "SvXMLNamespaceMap::GetQNameByKey: invalid namespace key" ); + DBG_ASSERT( false, "SvXMLNamespaceMap::GetQNameByKey: invalid namespace key" ); return rLocalName; } } diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 8f9f9210153a..c1582be61f92 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -411,7 +411,7 @@ void SvXMLUnitConverter::convertDateTime( OUStringBuffer& rBuffer, { OUString a100th( ::rtl::math::doubleToUString( fValue, rtl_math_StringFormat_F, - XML_MAXDIGITSCOUNT_TIME - nCount, '.', sal_True)); + XML_MAXDIGITSCOUNT_TIME - nCount, '.', true)); if ( a100th.getLength() > 2 ) { rBuffer.append( '.'); diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index 8a85e2b2f146..7553458b9fb6 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -638,16 +638,16 @@ void SdXMLNumberFormatImportContext::add( OUString& rNumberStyle, sal_Bool bLong bool SdXMLNumberFormatImportContext::compareStyle( const SdXMLFixedDataStyle* pStyle, sal_Int16& nIndex ) const { if( (pStyle->mbAutomatic != mbAutomatic) && (nIndex == 0)) - return sal_False; + return false; sal_Int16 nCompareIndex; for( nCompareIndex = 0; nCompareIndex < 8; nIndex++, nCompareIndex++ ) { if( pStyle->mpFormat[nCompareIndex] != mnElements[nIndex] ) - return sal_False; + return false; } - return sal_True; + return true; } void SdXMLNumberFormatImportContext::EndElement() diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 3411dabf0864..9e82d81f59d0 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -480,7 +480,7 @@ void SdXMLEventContext::EndElement() } xEvents->replaceByName( sAPIEventName, uno::Any( aProperties ) ); - } while(0); + } while(false); } TYPEINIT1( SdXMLEventsContext, SvXMLImportContext ); diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 7ee4ecc19103..b3bb7201ce84 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -1074,10 +1074,10 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } break; case XML_TYPE_TEXT_CLIP11: - pHdl = new XMLClipPropertyHandler( sal_True ); + pHdl = new XMLClipPropertyHandler( true ); break; case XML_TYPE_TEXT_CLIP: - pHdl = new XMLClipPropertyHandler( sal_False ); + pHdl = new XMLClipPropertyHandler( false ); break; // #FontWork# @@ -1119,7 +1119,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy pHdl = new XMLCaptionEscapeRelative(); break; case XML_SD_TYPE_CAPTION_ESC_ABS: - pHdl = new XMLPercentOrMeasurePropertyHandler( sal_False ); + pHdl = new XMLPercentOrMeasurePropertyHandler( false ); break; case XML_SD_TYPE_CAPTION_ESC_DIR: pHdl = new XMLEnumPropertyHdl( pXML_Caption_Esc_Dir_Enum , ::getCppuType((const sal_Int32*)0)); diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index a8316c9d144a..53c8e33b4129 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -3646,7 +3646,7 @@ void ExportParameter( OUStringBuffer& rStrBuffer, const com::sun::star::drawing: { double fNumber = 0.0; rParameter.Value >>= fNumber; - ::rtl::math::doubleToUStringBuffer( rStrBuffer, fNumber, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', sal_True ); + ::rtl::math::doubleToUStringBuffer( rStrBuffer, fNumber, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', true ); } else { diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index bff4bd509a43..3e51b1287a3d 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -703,7 +703,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) pDocStyle->FillPropertySet(xPropSet); } - } while(0); + } while(false); // try to set text auto style do @@ -723,7 +723,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) // set PropertySet on object pStyle->FillPropertySet(xPropSet); - } while(0); + } while(false); } catch(const uno::Exception&) { @@ -2098,7 +2098,7 @@ void SdXMLMeasureShapeContext::EndElement() xCursor->goRight( 1, sal_True ); xCursor->setString( aEmpty ); } - while(0); + while(false); SdXMLShapeContext::EndElement(); } diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index ed6c47155b52..d92f037fdbad 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -171,7 +171,7 @@ namespace xmloff else if (sServiceName.equals(SERVICE_PERSISTENT_COMPONENT_##name)) \ sToWriteServiceName = SERVICE_##name - if (sal_False) + if (false) ; CHECK_N_TRANSLATE( FORM ); CHECK_N_TRANSLATE( FORM ); diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index b75cf0f6fcb3..a1c18567f221 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -286,7 +286,7 @@ void SvXMLMetaExport::_MExport() XML_NAMESPACE_META, XML_CELL_COUNT, aValue ); else { - DBG_ASSERT( sal_False, "Unknown statistic value!\n" ); + DBG_ASSERT( false, "Unknown statistic value!\n" ); } } } diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index 3224e0515eae..b7bd42c83ad2 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -141,7 +141,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp { OUString sValue( ::rtl::math::doubleToUString( rValue, rtl_math_StringFormat_Automatic, - rtl_math_DecimalPlaces_Max, '.', sal_True)); + rtl_math_DecimalPlaces_Max, '.', true)); rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE, sValue); } } @@ -206,7 +206,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp fTempValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', - sal_True)); + true)); rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_BOOLEAN_VALUE, sValue); } } @@ -223,7 +223,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp { OUString sValue( ::rtl::math::doubleToUString( rValue, rtl_math_StringFormat_Automatic, - rtl_math_DecimalPlaces_Max, '.', sal_True)); + rtl_math_DecimalPlaces_Max, '.', true)); rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE, sValue); } } @@ -425,7 +425,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( { OUString sValue( ::rtl::math::doubleToUString( rValue, rtl_math_StringFormat_Automatic, - rtl_math_DecimalPlaces_Max, '.', sal_True)); + rtl_math_DecimalPlaces_Max, '.', true)); pExport->AddAttribute(sAttrValue, sValue); } } @@ -490,7 +490,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( fTempValue, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', - sal_True)); + true)); pExport->AddAttribute(sAttrBooleanValue, sValue); } } @@ -507,7 +507,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( { OUString sValue( ::rtl::math::doubleToUString( rValue, rtl_math_StringFormat_Automatic, - rtl_math_DecimalPlaces_Max, '.', sal_True)); + rtl_math_DecimalPlaces_Max, '.', true)); pExport->AddAttribute(sAttrValue, sValue); } } diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx index 1851dc0e038a..e211bc60ce74 100644 --- a/xmloff/source/style/prhdlfac.cxx +++ b/xmloff/source/style/prhdlfac.cxx @@ -307,7 +307,7 @@ const XMLPropertyHandler* XMLPropertyHandlerFactory::CreatePropertyHandler( sal_ break; case XML_TYPE_TEXT_UNDERLINE_HASCOLOR: pPropHdl = new XMLIsTransparentPropHdl( XML_FONT_COLOR, - sal_False ); + false ); break; case XML_TYPE_TEXT_OVERLINE_TYPE: pPropHdl = new XMLUnderlineTypePropHdl; @@ -323,7 +323,7 @@ const XMLPropertyHandler* XMLPropertyHandlerFactory::CreatePropertyHandler( sal_ break; case XML_TYPE_TEXT_OVERLINE_HASCOLOR: pPropHdl = new XMLIsTransparentPropHdl( XML_FONT_COLOR, - sal_False ); + false ); break; case XML_TYPE_TEXT_WEIGHT: pPropHdl = new XMLFontWeightPropHdl; diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 7173fb0847ed..017392170413 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -331,7 +331,7 @@ bool SvXMLImportPropertyMapper::handleSpecialItem( return mxNextMapper->handleSpecialItem( rProperty, rProperties, rValue, rUnitConverter, rNamespaceMap ); else - return sal_False; + return false; } void SvXMLImportPropertyMapper::FillPropertySequence( diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index e6084ac02c61..318d93bd8d05 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -869,7 +869,7 @@ static sal_Bool lcl_IsDefaultDateFormat( const SvNumberformat& rFormat, sal_Bool short nLastType = 0; while (!bEnd) { - short nElemType = rFormat.GetNumForType( 0, nPos, sal_False ); + short nElemType = rFormat.GetNumForType( 0, nPos, false ); switch ( nElemType ) { case 0: @@ -951,7 +951,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt // #101606# An empty subformat is a valid number-style resulting in an // empty display string for the condition of the subformat. if ( nFmtType == NUMBERFORMAT_UNDEFINED && rFormat.GetNumForType( nPart, - 0, sal_False ) == 0 ) + 0, false ) == 0 ) nFmtType = 0; XMLTokenEnum eType = XML_TOKEN_INVALID; @@ -1135,8 +1135,8 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt sal_Bool bEnd = sal_False; while (!bEnd) { - short nElemType = rFormat.GetNumForType( nPart, nPos, sal_False ); - const OUString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False ); + short nElemType = rFormat.GetNumForType( nPart, nPos, false ); + const OUString* pElemStr = rFormat.GetNumForString( nPart, nPos, false ); switch ( nElemType ) { @@ -1202,8 +1202,8 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt bEnd = sal_False; while (!bEnd) { - short nElemType = rFormat.GetNumForType( nPart, nPos, sal_False ); - const OUString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False ); + short nElemType = rFormat.GetNumForType( nPart, nPos, false ); + const OUString* pElemStr = rFormat.GetNumForString( nPart, nPos, false ); switch ( nElemType ) { @@ -1250,8 +1250,8 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt bEnd = sal_False; while (!bEnd) { - short nElemType = rFormat.GetNumForType( nPart, nPos, sal_False ); - const OUString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False ); + short nElemType = rFormat.GetNumForType( nPart, nPos, false ); + const OUString* pElemStr = rFormat.GetNumForString( nPart, nPos, false ); switch ( nElemType ) { @@ -1620,7 +1620,7 @@ void SvXMLNumFmtExport::ExportFormat_Impl( const SvNumberformat& rFormat, sal_uI sal_uInt16 nUsedParts = 0; sal_uInt16 nPart; for (nPart=0; nPart<XMLNUM_MAX_PARTS; nPart++) - if (rFormat.GetNumForType( nPart, 0, sal_False ) != 0) + if (rFormat.GetNumForType( nPart, 0, false ) != 0) nUsedParts = nPart+1; SvNumberformatLimitOps eOp1, eOp2; diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 20500afcc1a8..5224b3084542 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -1781,7 +1781,7 @@ void SvXMLNumFormatContext::AddNumber( const SvXMLNumberInfo& rInfo ) sal_uInt32 nStdIndex = pFormatter->GetStandardIndex( nFormatLang ); OUStringBuffer aNumStr = pFormatter->GenerateFormat( nStdIndex, nFormatLang, - bGrouping, sal_False, nGenPrec, nLeading ); + bGrouping, false, nGenPrec, nLeading ); if ( rInfo.nExpDigits >= 0 && nLeading == 0 && !bGrouping && nEmbeddedCount == 0 ) { diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx index 7caee502ebfc..3a72c0688143 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.cxx +++ b/xmloff/source/text/XMLChangeElementImportContext.cxx @@ -87,7 +87,7 @@ void XMLChangeElementImportContext::StartElement( const Reference< XAttributeLis { if(bAcceptContent) { - GetImport().GetTextImport()->SetInsideDeleteContext(sal_True); + GetImport().GetTextImport()->SetInsideDeleteContext(true); } } @@ -96,7 +96,7 @@ void XMLChangeElementImportContext::EndElement() { if(bAcceptContent) { - GetImport().GetTextImport()->SetInsideDeleteContext(sal_False); + GetImport().GetTextImport()->SetInsideDeleteContext(false); } } diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index d5e1b8ea0c75..dc6c262df585 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -3989,7 +3989,7 @@ SvXMLImportContext* XMLDropDownFieldImportContext::CreateChildContext( IsXMLToken( rLocalName, XML_LABEL ) ) { OUString sLabel; - bool bIsSelected = sal_False; + bool bIsSelected = false; if( lcl_ProcessLabel( GetImport(), xAttrList, sLabel, bIsSelected ) ) { if( bIsSelected ) diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index b122e6604578..8226f14260c5 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -2330,7 +2330,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( if( XML_TEXT_TYPE_BODY == eType && bContent ) { - m_pImpl->m_bBodyContentStarted = sal_False; + m_pImpl->m_bBodyContentStarted = false; } return pContext; diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index eb6575d3f7cf..951fa1f6fd01 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -322,7 +322,7 @@ bool XMLOpaquePropHdl_Impl::importXML( if( IsXMLToken( rStrImpValue, XML_FOREGROUND ) ) bVal = sal_True; else if( !IsXMLToken( rStrImpValue, XML_BACKGROUND ) ) - bRet = sal_False; + bRet = false; if( bRet ) rValue.setValue( &bVal, ::getBooleanCppuType() ); @@ -372,7 +372,7 @@ bool XMLContourModePropHdl_Impl::importXML( if( IsXMLToken( rStrImpValue, XML_OUTSIDE ) ) bVal = sal_True; else if( ! IsXMLToken( rStrImpValue, XML_FULL ) ) - bRet = sal_False; + bRet = false; if( bRet ) rValue.setValue( &bVal, ::getBooleanCppuType() ); diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index bdc0677fac51..9c2007f7bb93 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -136,7 +136,7 @@ bool ParseURLAsString( sal_Int32 params = rAttrValue.indexOf( '?' ); if ( rAttrValue.indexOf( SCHEME ) != 0 || params < 0 ) { - return sal_False; + return false; } sal_Int32 start = SCHEME.getLength(); @@ -170,9 +170,9 @@ bool ParseURLAsString( if ( aLanguage.equalsIgnoreAsciiCase("basic") ) { - return sal_True; + return true; } - return sal_False; + return false; } bool ParseURL( @@ -212,11 +212,11 @@ bool ParseURL( { *pLocation = GetXMLToken( XML_APPLICATION ); } - return sal_True; + return true; } } } - return sal_False; + return false; } void XMLEventOASISTransformerContext::StartElement( |