diff options
Diffstat (limited to 'xmloff')
28 files changed, 123 insertions, 124 deletions
diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx index bf1812fdd6d4..837d85298d43 100644 --- a/xmloff/source/chart/XMLChartStyleContext.cxx +++ b/xmloff/source/chart/XMLChartStyleContext.cxx @@ -79,7 +79,7 @@ void lcl_NumberFormatStyleToProperty( const OUString& rStyleName, const OUString if( !rStyleName.isEmpty()) { SvXMLNumFormatContext* pStyle = (SvXMLNumFormatContext *)rStylesContext.FindStyleChildContext( - XML_STYLE_FAMILY_DATA_STYLE, rStyleName, sal_True ); + XML_STYLE_FAMILY_DATA_STYLE, rStyleName, true ); if( pStyle ) { uno::Any aNumberFormat; diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 7f0491951ec0..9f82ac441980 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -1996,7 +1996,7 @@ bool SvXMLExport::AddEmbeddedObjectAsBase64( const OUString& rEmbeddedObjectURL OUString SvXMLExport::EncodeStyleName( const OUString& rName, - sal_Bool *pEncoded ) const + bool *pEncoded ) const { return GetMM100UnitConverter().encodeStyleName( rName, pEncoded ); } diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 4002ae046aa6..c28b8505e7c2 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -3278,7 +3278,7 @@ namespace xmloff { namespace token { } // does rString represent eToken? - sal_Bool IsXMLToken( + bool IsXMLToken( const OUString& rString, enum XMLTokenEnum eToken ) { diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index c1582be61f92..d271df307810 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -178,7 +178,7 @@ void SvXMLUnitConverter::convertMeasureToXML( OUStringBuffer& rString, /** convert string to enum using given enum map, if the enum is not found in the map, this method will return false */ -sal_Bool SvXMLUnitConverter::convertEnum( sal_uInt16& rEnum, +bool SvXMLUnitConverter::convertEnum( sal_uInt16& rEnum, const OUString& rValue, const SvXMLEnumStringMapEntry *pMap ) { @@ -187,17 +187,17 @@ sal_Bool SvXMLUnitConverter::convertEnum( sal_uInt16& rEnum, if( rValue.equalsAsciiL( pMap->pName, pMap->nNameLength ) ) { rEnum = pMap->nValue; - return sal_True; + return true; } ++pMap; } - return sal_False; + return false; } /** convert string to enum using given token map, if the enum is not found in the map, this method will return false */ -sal_Bool SvXMLUnitConverter::convertEnum( +bool SvXMLUnitConverter::convertEnum( sal_uInt16& rEnum, const OUString& rValue, const SvXMLEnumMapEntry *pMap ) @@ -207,18 +207,18 @@ sal_Bool SvXMLUnitConverter::convertEnum( if( IsXMLToken( rValue, pMap->eToken ) ) { rEnum = pMap->nValue; - return sal_True; + return true; } ++pMap; } - return sal_False; + return false; } /** convert enum to string using given token map with an optional default token. If the enum is not found in the map, this method will either use the given default or return false if no default is set */ -sal_Bool SvXMLUnitConverter::convertEnum( +bool SvXMLUnitConverter::convertEnum( OUStringBuffer& rBuffer, unsigned int nValue, const SvXMLEnumMapEntry *pMap, @@ -263,15 +263,15 @@ static sal_Char aHexTab[] = "0123456789abcdef"; /** convert double number to string (using ::rtl::math) */ void SvXMLUnitConverter::convertDouble(OUStringBuffer& rBuffer, - double fNumber, sal_Bool bWriteUnits) const + double fNumber, bool bWriteUnits) const { ::sax::Converter::convertDouble(rBuffer, fNumber, bWriteUnits, m_pImpl->m_eCoreMeasureUnit, m_pImpl->m_eXMLMeasureUnit); } /** convert string to double number (using ::rtl::math) */ -sal_Bool SvXMLUnitConverter::convertDouble(double& rValue, - const OUString& rString, sal_Bool bLookForUnits) const +bool SvXMLUnitConverter::convertDouble(double& rValue, + const OUString& rString, bool bLookForUnits) const { if(bLookForUnits) { @@ -288,7 +288,7 @@ sal_Bool SvXMLUnitConverter::convertDouble(double& rValue, } /** get the Null Date of the XModel and set it to the UnitConverter */ -sal_Bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference <com::sun::star::frame::XModel>& xModel) +bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference <com::sun::star::frame::XModel>& xModel) { com::sun::star::uno::Reference <com::sun::star::util::XNumberFormatsSupplier> xNumberFormatsSupplier (xModel, com::sun::star::uno::UNO_QUERY); if (xNumberFormatsSupplier.is()) @@ -296,7 +296,7 @@ sal_Bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference <c const com::sun::star::uno::Reference <com::sun::star::beans::XPropertySet> xPropertySet = xNumberFormatsSupplier->getNumberFormatSettings(); return xPropertySet.is() && (xPropertySet->getPropertyValue(OUString(XML_NULLDATE)) >>= m_pImpl->m_aNullDate); } - return sal_False; + return false; } /** convert double to ISO Date Time String */ @@ -317,7 +317,7 @@ bool SvXMLUnitConverter::convertDateTime(double& fDateTime, void SvXMLUnitConverter::convertDateTime( OUStringBuffer& rBuffer, const double& fDateTime, const com::sun::star::util::Date& aTempNullDate, - sal_Bool bAddTimeIf0AM ) + bool bAddTimeIf0AM ) { double fValue = fDateTime; sal_Int32 nValue = static_cast <sal_Int32> (::rtl::math::approxFloor (fValue)); @@ -422,7 +422,7 @@ void SvXMLUnitConverter::convertDateTime( OUStringBuffer& rBuffer, } /** convert ISO Date Time String to double */ -sal_Bool SvXMLUnitConverter::convertDateTime( double& fDateTime, +bool SvXMLUnitConverter::convertDateTime( double& fDateTime, const OUString& rString, const com::sun::star::util::Date& aTempNullDate) { com::sun::star::util::DateTime aDateTime; @@ -453,10 +453,10 @@ SvXMLTokenEnumerator::SvXMLTokenEnumerator( const OUString& rString, sal_Unicode { } -sal_Bool SvXMLTokenEnumerator::getNextToken( OUString& rToken ) +bool SvXMLTokenEnumerator::getNextToken( OUString& rToken ) { if( -1 == mnNextTokenPos ) - return sal_False; + return false; int nTokenEndPos = maTokenString.indexOf( mcSeparator, mnNextTokenPos ); if( nTokenEndPos != -1 ) @@ -476,7 +476,7 @@ sal_Bool SvXMLTokenEnumerator::getNextToken( OUString& rToken ) mnNextTokenPos = -1; } - return sal_True; + return true; } static bool lcl_getPositions(const OUString& _sValue,OUString& _rContentX,OUString& _rContentY,OUString& _rContentZ) @@ -511,11 +511,11 @@ static bool lcl_getPositions(const OUString& _sValue,OUString& _rContentX,OUStri } /** convert string to ::basegfx::B3DVector */ -sal_Bool SvXMLUnitConverter::convertB3DVector( ::basegfx::B3DVector& rVector, const OUString& rValue ) +bool SvXMLUnitConverter::convertB3DVector( ::basegfx::B3DVector& rVector, const OUString& rValue ) { OUString aContentX,aContentY,aContentZ; if ( !lcl_getPositions(rValue,aContentX,aContentY,aContentZ) ) - return sal_False; + return false; rtl_math_ConversionStatus eStatus; @@ -523,13 +523,13 @@ sal_Bool SvXMLUnitConverter::convertB3DVector( ::basegfx::B3DVector& rVector, co ',', &eStatus, NULL)); if( eStatus != rtl_math_ConversionStatus_Ok ) - return sal_False; + return false; rVector.setY(::rtl::math::stringToDouble(aContentY, '.', ',', &eStatus, NULL)); if( eStatus != rtl_math_ConversionStatus_Ok ) - return sal_False; + return false; rVector.setZ(::rtl::math::stringToDouble(aContentZ, '.', ',', &eStatus, NULL)); @@ -551,18 +551,18 @@ void SvXMLUnitConverter::convertB3DVector( OUStringBuffer &rBuffer, const ::base } /** convert string to Position3D */ -sal_Bool SvXMLUnitConverter::convertPosition3D( drawing::Position3D& rPosition, +bool SvXMLUnitConverter::convertPosition3D( drawing::Position3D& rPosition, const OUString& rValue ) { OUString aContentX,aContentY,aContentZ; if ( !lcl_getPositions(rValue,aContentX,aContentY,aContentZ) ) - return sal_False; + return false; - if ( !convertDouble( rPosition.PositionX, aContentX, sal_True ) ) - return sal_False; - if ( !convertDouble( rPosition.PositionY, aContentY, sal_True ) ) - return sal_False; - return convertDouble( rPosition.PositionZ, aContentZ, sal_True ); + if ( !convertDouble( rPosition.PositionX, aContentX, true ) ) + return false; + if ( !convertDouble( rPosition.PositionY, aContentY, true ) ) + return false; + return convertDouble( rPosition.PositionZ, aContentZ, true ); } /** convert Position3D to string */ @@ -570,21 +570,21 @@ void SvXMLUnitConverter::convertPosition3D( OUStringBuffer &rBuffer, const drawing::Position3D& rPosition ) { rBuffer.append( '(' ); - convertDouble( rBuffer, rPosition.PositionX, sal_True ); + convertDouble( rBuffer, rPosition.PositionX, true ); rBuffer.append( ' ' ); - convertDouble( rBuffer, rPosition.PositionY, sal_True ); + convertDouble( rBuffer, rPosition.PositionY, true ); rBuffer.append( ' ' ); - convertDouble( rBuffer, rPosition.PositionZ, sal_True ); + convertDouble( rBuffer, rPosition.PositionZ, true ); rBuffer.append( ')' ); } -sal_Bool SvXMLUnitConverter::convertNumFormat( +bool SvXMLUnitConverter::convertNumFormat( sal_Int16& rType, const OUString& rNumFmt, const OUString& rNumLetterSync, - sal_Bool bNumberNone ) const + bool bNumberNone ) const { - sal_Bool bRet = sal_True; + bool bRet = true; bool bExt = false; sal_Int32 nLen = rNumFmt.getLength(); @@ -593,7 +593,7 @@ sal_Bool SvXMLUnitConverter::convertNumFormat( if( bNumberNone ) rType = NumberingType::NUMBER_NONE; else - bRet = sal_False; + bRet = false; } else if( 1 == nLen ) { @@ -746,10 +746,10 @@ void SvXMLUnitConverter::convertPropertySet(uno::Reference<beans::XPropertySet>& OUString SvXMLUnitConverter::encodeStyleName( const OUString& rName, - sal_Bool *pEncoded ) const + bool *pEncoded ) const { if( pEncoded ) - *pEncoded = sal_False; + *pEncoded = false; sal_Int32 nLen = rName.getLength(); OUStringBuffer aBuffer( nLen ); @@ -832,7 +832,7 @@ OUString SvXMLUnitConverter::encodeStyleName( aHexTab[ c & 0x0f ] ) ); aBuffer.append( '_' ); if( pEncoded ) - *pEncoded = sal_True; + *pEncoded = true; } } @@ -841,7 +841,7 @@ OUString SvXMLUnitConverter::encodeStyleName( { aBuffer = rName; if( pEncoded ) - *pEncoded = sal_False; + *pEncoded = false; } @@ -849,11 +849,11 @@ OUString SvXMLUnitConverter::encodeStyleName( } /** convert string (hex) to number (sal_uInt32) */ -sal_Bool SvXMLUnitConverter::convertHex( sal_uInt32& nVal, +bool SvXMLUnitConverter::convertHex( sal_uInt32& nVal, const OUString& rValue ) { if( rValue.getLength() != 8 ) - return sal_False; + return false; nVal = 0; for ( int i = 0; i < 8; i++ ) @@ -862,7 +862,7 @@ sal_Bool SvXMLUnitConverter::convertHex( sal_uInt32& nVal, | sal::static_int_cast< sal_uInt32 >( lcl_gethex( rValue[i] ) ); } - return sal_True; + return true; } /** convert number (sal_uInt32) to string (hex) */ diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index cd6b4581e246..80f35802ba39 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2426,7 +2426,7 @@ void SdXMLExport::_ExportMasterStyles() Reference < container::XNamed > xNamed(xMasterPage, UNO_QUERY); if(xNamed.is()) { - sal_Bool bEncoded = sal_False; + bool bEncoded = false; sMasterPageName = xNamed->getName(); AddAttribute(XML_NAMESPACE_STYLE, XML_NAME, EncodeStyleName( sMasterPageName, &bEncoded )); diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 78666097ecf1..eaa06d390a7a 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -4137,7 +4137,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean double fDepth = 0; if ( aDepthParaPair.First.Value >>= fDepth ) { - rExport.GetMM100UnitConverter().convertDouble( aStrBuffer, fDepth, sal_True ); + rExport.GetMM100UnitConverter().convertDouble( aStrBuffer, fDepth, true ); ExportParameter( aStrBuffer, aDepthParaPair.Second ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_DEPTH, aStr ); diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index ab5cd243b96a..932b43e9c54b 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -323,7 +323,7 @@ void SdXMLGenericPageContext::EndElement() if( pStyles ) { const SdXMLNumberFormatImportContext* pSdNumStyle = - dynamic_cast< const SdXMLNumberFormatImportContext* >( pStyles->FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE, aDateTimeFormat, sal_True ) ); + dynamic_cast< const SdXMLNumberFormatImportContext* >( pStyles->FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE, aDateTimeFormat, true ) ); if( pSdNumStyle ) { diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 61b5cf83e2ab..47fd843fd62a 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -224,7 +224,7 @@ void SdXMLDrawingPageStyleContext::Finish( bool bOverwrite ) SdXMLNumberFormatImportContext* pSdNumStyle = PTR_CAST( SdXMLNumberFormatImportContext, - GetStyles()->FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE, sStyleName, sal_True ) ); + GetStyles()->FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE, sStyleName, true ) ); if( pSdNumStyle ) nStyle = pSdNumStyle->GetDrawKey(); @@ -1601,9 +1601,9 @@ SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext(SvXMLImport& rImport, } } -sal_Bool SdXMLHeaderFooterDeclContext::IsTransient() const +bool SdXMLHeaderFooterDeclContext::IsTransient() const { - return sal_True; + return true; } void SdXMLHeaderFooterDeclContext::EndElement() diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index 85ea8e19f9a2..7ddd4ec0676c 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -272,7 +272,7 @@ public: const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual sal_Bool IsTransient() const SAL_OVERRIDE; + virtual bool IsTransient() const SAL_OVERRIDE; virtual void EndElement() SAL_OVERRIDE; virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index efd388fb062c..fa0471f6e4da 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -236,7 +236,7 @@ bool XMLDashStyleExport::exportXML( OUStringBuffer aOut; // Name - sal_Bool bEncoded = sal_False; + bool bEncoded = false; rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rExport.EncodeStyleName( rStrName, &bEncoded ) ); diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx index 72df20b90af1..de9fda1e593a 100644 --- a/xmloff/source/style/FillStyleContext.cxx +++ b/xmloff/source/style/FillStyleContext.cxx @@ -72,9 +72,9 @@ void XMLGradientStyleContext::EndElement() {} } -sal_Bool XMLGradientStyleContext::IsTransient() const +bool XMLGradientStyleContext::IsTransient() const { - return sal_True; + return true; } TYPEINIT1( XMLHatchStyleContext, SvXMLStyleContext ); @@ -115,9 +115,9 @@ void XMLHatchStyleContext::EndElement() {} } -sal_Bool XMLHatchStyleContext::IsTransient() const +bool XMLHatchStyleContext::IsTransient() const { - return sal_True; + return true; } TYPEINIT1( XMLBitmapStyleContext, SvXMLStyleContext ); @@ -192,9 +192,9 @@ void XMLBitmapStyleContext::EndElement() {} } -sal_Bool XMLBitmapStyleContext::IsTransient() const +bool XMLBitmapStyleContext::IsTransient() const { - return sal_True; + return true; } TYPEINIT1( XMLTransGradientStyleContext, SvXMLStyleContext ); @@ -235,9 +235,9 @@ void XMLTransGradientStyleContext::EndElement() {} } -sal_Bool XMLTransGradientStyleContext::IsTransient() const +bool XMLTransGradientStyleContext::IsTransient() const { - return sal_True; + return true; } TYPEINIT1( XMLMarkerStyleContext, SvXMLStyleContext ); @@ -278,9 +278,9 @@ void XMLMarkerStyleContext::EndElement() {} } -sal_Bool XMLMarkerStyleContext::IsTransient() const +bool XMLMarkerStyleContext::IsTransient() const { - return sal_True; + return true; } TYPEINIT1( XMLDashStyleContext, SvXMLStyleContext ); @@ -321,9 +321,9 @@ void XMLDashStyleContext::EndElement() {} } -sal_Bool XMLDashStyleContext::IsTransient() const +bool XMLDashStyleContext::IsTransient() const { - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx index fc8489a977f7..388561c13f0d 100644 --- a/xmloff/source/style/FillStyleContext.hxx +++ b/xmloff/source/style/FillStyleContext.hxx @@ -41,7 +41,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - virtual sal_Bool IsTransient() const SAL_OVERRIDE; + virtual bool IsTransient() const SAL_OVERRIDE; }; // draw:hatch context @@ -61,7 +61,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - virtual sal_Bool IsTransient() const SAL_OVERRIDE; + virtual bool IsTransient() const SAL_OVERRIDE; }; // draw:fill-image context @@ -87,7 +87,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - virtual sal_Bool IsTransient() const SAL_OVERRIDE; + virtual bool IsTransient() const SAL_OVERRIDE; }; // draw:transparency context @@ -107,7 +107,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - virtual sal_Bool IsTransient() const SAL_OVERRIDE; + virtual bool IsTransient() const SAL_OVERRIDE; }; // draw:marker context @@ -127,7 +127,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - virtual sal_Bool IsTransient() const SAL_OVERRIDE; + virtual bool IsTransient() const SAL_OVERRIDE; }; // draw:marker context @@ -147,7 +147,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - virtual sal_Bool IsTransient() const SAL_OVERRIDE; + virtual bool IsTransient() const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_FILLSTYLECONTEXT_HXX diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index 111b0dba135a..36f0351cedae 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -242,7 +242,7 @@ bool XMLGradientStyleExport::exportXML( else { // Name - sal_Bool bEncoded = sal_False; + bool bEncoded = false; OUString aStrName( rStrName ); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rExport.EncodeStyleName( aStrName, diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index 589c0e6e8b57..6d1db910ad4e 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -201,7 +201,7 @@ bool XMLHatchStyleExport::exportXML( else { // Name - sal_Bool bEncoded = sal_False; + bool bEncoded = false; rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rExport.EncodeStyleName( rStrName, &bEncoded ) ); diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx index 745dc277a2dc..64958bd0be44 100644 --- a/xmloff/source/style/ImageStyle.cxx +++ b/xmloff/source/style/ImageStyle.cxx @@ -69,7 +69,7 @@ void XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any& rVal if( rValue >>= sImageURL ) { // Name - sal_Bool bEncoded = sal_False; + bool bEncoded = false; rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rExport.EncodeStyleName( rStrName, &bEncoded ) ); diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx index acad58b5eb34..a2c138689009 100644 --- a/xmloff/source/style/MarkerStyle.cxx +++ b/xmloff/source/style/MarkerStyle.cxx @@ -164,7 +164,7 @@ void XMLMarkerStyleExport::exportXML( if(rValue >>= aBezier) { // Name - sal_Bool bEncoded(sal_False); + bool bEncoded(false); OUString aStrName( rStrName ); rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_NAME, rExport.EncodeStyleName( aStrName, &bEncoded ) ); diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index 1c66c25824ac..29695320901c 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -243,7 +243,7 @@ sal_Bool XMLTransGradientStyleExport::exportXML( else { // Name - sal_Bool bEncoded = sal_False; + bool bEncoded = false; rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rExport.EncodeStyleName( rStrName, &bEncoded ) ); diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index e19bb47b9b68..5f7dfa87855d 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -383,7 +383,7 @@ bool XMLFontStylesContext::FillProperties( const OUString& rName, sal_Int32 nPitchIdx, sal_Int32 nCharsetIdx ) const { - const SvXMLStyleContext* pStyle = FindStyleChildContext( XML_STYLE_FAMILY_FONT, rName, sal_True ); + const SvXMLStyleContext* pStyle = FindStyleChildContext( XML_STYLE_FAMILY_FONT, rName, true ); const XMLFontStyleContextFontFace *pFontStyle = PTR_CAST( XMLFontStyleContextFontFace,pStyle);// use temp var, PTR_CAST is a bad macro, FindStyleChildContext will be called twice if( pFontStyle ) pFontStyle->FillProperties( rProps, nFamilyNameIdx, nStyleNameIdx, diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 973d648d9c73..a79f2b6f83a9 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -107,7 +107,7 @@ bool XMLPageExport::exportStyle( else { OUString sName( rStyle->getName() ); - sal_Bool bEncoded = sal_False; + bool bEncoded = false; GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, GetExport().EncodeStyleName( sName, &bEncoded ) ); diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index 3b0538de3421..1549564aec99 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -324,7 +324,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite ) } else { - SetValid( sal_False ); + SetValid( false ); } } } diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index e37ba3288c51..3f94f3d819ee 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -109,7 +109,7 @@ bool XMLStyleExport::exportStyle( sName = *pPrefix; sName += rStyle->getName(); - sal_Bool bEncoded = sal_False; + bool bEncoded = false; const OUString sEncodedStyleName(GetExport().EncodeStyleName( sName, &bEncoded )); GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, sEncodedStyleName ); diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index a5718fd5921a..cf9637be4c46 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -662,7 +662,7 @@ void SvxXMLNumRuleExport::exportNumberingRule( // style:name="..." if( !rName.isEmpty() ) { - sal_Bool bEncoded = sal_False; + bool bEncoded = false; GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, GetExport().EncodeStyleName( rName, &bEncoded ) ); if( bEncoded ) @@ -773,7 +773,7 @@ void SvxXMLNumRuleExport::exportOutline() GetExport().CheckAttrList(); if ( !sOutlineStyleName.isEmpty() ) { - sal_Bool bEncoded = sal_False; + bool bEncoded = false; GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, GetExport().EncodeStyleName( sOutlineStyleName, &bEncoded ) ); diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index bdd57891bdb8..8b8e8e89658b 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -425,7 +425,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties( { eType = NumberingType::ARABIC; GetImport().GetMM100UnitConverter().convertNumFormat( - eType, sNumFormat, sNumLetterSync, sal_True ); + eType, sNumFormat, sNumLetterSync, true ); nCount = 15; } @@ -1027,7 +1027,7 @@ SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList, - sal_Bool bOutl ) + bool bOutl ) : SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, bOutl ? XML_STYLE_FAMILY_TEXT_OUTLINE : XML_STYLE_FAMILY_TEXT_LIST ) , sIsPhysical( "IsPhysical" ) , sNumberingRules( "NumberingRules" ) @@ -1035,7 +1035,7 @@ SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport, , sIsContinuousNumbering( "IsContinuousNumbering" ) , pLevelStyles( 0 ) , nLevels( 0 ) -, bConsecutive( sal_False ) +, bConsecutive( false ) , bOutline( bOutl ) { } @@ -1134,7 +1134,7 @@ void SvxXMLListStyleContext::FillUnoNumRule( } } -void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite ) +void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite ) { if( bOutline ) { @@ -1154,7 +1154,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite ) const OUString& rName = GetDisplayName(); if( rName.isEmpty() ) { - SetValid( sal_False ); + SetValid( false ); return; } @@ -1162,7 +1162,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite ) GetImport().GetTextImport()->GetNumberingStyles(); if( !rNumStyles.is() ) { - SetValid( sal_False ); + SetValid( false ); return; } @@ -1221,7 +1221,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite ) } else { - SetValid( sal_False ); + SetValid( false ); } SetNew( bNew ); @@ -1236,7 +1236,7 @@ void SvxXMLListStyleContext::CreateAndInsertAuto() const const OUString& rName = GetName(); if( bOutline || xNumRules.is() || rName.isEmpty() ) { - ((SvxXMLListStyleContext *)this)->SetValid( sal_False ); + ((SvxXMLListStyleContext *)this)->SetValid( false ); return; } @@ -1270,7 +1270,7 @@ Reference < XIndexReplace > SvxXMLListStyleContext::CreateNumRule( void SvxXMLListStyleContext::SetDefaultStyle( const Reference < XIndexReplace > & rNumRule, sal_Int16 nLevel, - sal_Bool bOrdered ) + bool bOrdered ) { Sequence<beans::PropertyValue> aPropSeq( bOrdered ? 1 : 4 ); beans::PropertyValue *pProps = aPropSeq.getArray(); diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx index b9478b2a9764..bf3f9f0358f2 100644 --- a/xmloff/source/style/xmlprmap.cxx +++ b/xmloff/source/style/xmlprmap.cxx @@ -125,12 +125,12 @@ void XMLPropertySetMapper::AddMapperEntry( } // Export a Property -sal_Bool XMLPropertySetMapper::exportXML( +bool XMLPropertySetMapper::exportXML( OUString& rStrExpValue, const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet = sal_False; + bool bRet = false; const XMLPropertyHandler* pHdl = GetPropertyHandler( rProperty.mnIndex ); @@ -143,12 +143,12 @@ sal_Bool XMLPropertySetMapper::exportXML( } // Import a Property -sal_Bool XMLPropertySetMapper::importXML( +bool XMLPropertySetMapper::importXML( const OUString& rStrImpValue, XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet = sal_False; + bool bRet = false; const XMLPropertyHandler* pHdl = GetPropertyHandler( rProperty.mnIndex ); diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 0ad232b35482..c08e744980f3 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -145,13 +145,13 @@ SvXMLStyleContext::SvXMLStyleContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList >&, - sal_uInt16 nFam, sal_Bool bDefault ) : + sal_uInt16 nFam, bool bDefault ) : SvXMLImportContext( rImp, nPrfx, rLName ), - mbHidden( sal_False ), + mbHidden( false ), mnHelpId( UCHAR_MAX ), mnFamily( nFam ), - mbValid( sal_True ), - mbNew( sal_True ), + mbValid( true ), + mbNew( true ), mbDefaultStyle( bDefault ) { } @@ -189,7 +189,7 @@ void SvXMLStyleContext::CreateAndInsert( bool /*bOverwrite*/ ) { } -void SvXMLStyleContext::CreateAndInsertLate( sal_Bool /*bOverwrite*/ ) +void SvXMLStyleContext::CreateAndInsertLate( bool /*bOverwrite*/ ) { } @@ -197,9 +197,9 @@ void SvXMLStyleContext::Finish( bool /*bOverwrite*/ ) { } -sal_Bool SvXMLStyleContext::IsTransient() const +bool SvXMLStyleContext::IsTransient() const { - return sal_False; + return false; } class SvXMLStyleIndex_Impl @@ -282,8 +282,8 @@ public: const SvXMLStyleContext *FindStyleChildContext( sal_uInt16 nFamily, const OUString& rName, - sal_Bool bCreateIndex ) const; - sal_Bool IsAutomaticStyle() const { return bAutomaticStyle; } + bool bCreateIndex ) const; + bool IsAutomaticStyle() const { return bAutomaticStyle; } }; SvXMLStylesContext_Impl::SvXMLStylesContext_Impl( bool bAuto ) : @@ -328,7 +328,7 @@ void SvXMLStylesContext_Impl::Clear() const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext( sal_uInt16 nFamily, const OUString& rName, - sal_Bool bCreateIndex ) const + bool bCreateIndex ) const { const SvXMLStyleContext *pStyle = 0; @@ -382,7 +382,7 @@ const SvXMLStyleContext *SvXMLStylesContext::GetStyle( sal_uInt32 i ) const return mpImpl->GetStyle( i ); } -sal_Bool SvXMLStylesContext::IsAutomaticStyle() const +bool SvXMLStylesContext::IsAutomaticStyle() const { return mpImpl->IsAutomaticStyle(); } @@ -436,8 +436,7 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext( sal_uInt16 p_nPr case XML_TOK_STYLE_DEFAULT_PAGE_LAYOUT: { //there is not page family in ODF now, so I specify one for it - sal_Bool bDefaultStyle = XML_TOK_STYLE_DEFAULT_PAGE_LAYOUT == nToken - ? sal_True: sal_False; + bool bDefaultStyle = XML_TOK_STYLE_DEFAULT_PAGE_LAYOUT == nToken; pStyle = new PageStyleContext( GetImport(), p_nPrefix, rLocalName, xAttrList, *this, bDefaultStyle ); } @@ -448,7 +447,7 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext( sal_uInt16 p_nPr break; case XML_TOK_TEXT_OUTLINE: pStyle = new SvxXMLListStyleContext( GetImport(), p_nPrefix, - rLocalName, xAttrList, sal_True ); + rLocalName, xAttrList, true ); break; case XML_TOK_TEXT_NOTE_CONFIG: pStyle = new XMLFootnoteConfigurationImportContext(GetImport(), @@ -785,7 +784,7 @@ OUString SvXMLStylesContext::GetServiceName( sal_uInt16 nFamily ) const SvXMLStylesContext::SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const uno::Reference< xml::sax::XAttributeList > &, sal_Bool bAuto ) : + const uno::Reference< xml::sax::XAttributeList > &, bool bAuto ) : SvXMLImportContext( rImport, nPrfx, rLName ), msParaStyleServiceName( "com.sun.star.style.ParagraphStyle" ), msTextStyleServiceName( "com.sun.star.style.CharacterStyle" ), @@ -852,8 +851,8 @@ void SvXMLStylesContext::CopyAutoStylesToDoc() } } -void SvXMLStylesContext::CopyStylesToDoc( sal_Bool bOverwrite, - sal_Bool bFinish ) +void SvXMLStylesContext::CopyStylesToDoc( bool bOverwrite, + bool bFinish ) { // pass 1: create text, paragraph and frame styles sal_uInt32 nCount = GetStyleCount(); @@ -887,7 +886,7 @@ void SvXMLStylesContext::CopyStylesToDoc( sal_Bool bOverwrite, FinishStyles( bOverwrite ); } -void SvXMLStylesContext::FinishStyles( sal_Bool bOverwrite ) +void SvXMLStylesContext::FinishStyles( bool bOverwrite ) { sal_uInt32 nCount = GetStyleCount(); for( sal_uInt32 i=0; i<nCount; i++ ) @@ -904,7 +903,7 @@ void SvXMLStylesContext::FinishStyles( sal_Bool bOverwrite ) const SvXMLStyleContext *SvXMLStylesContext::FindStyleChildContext( sal_uInt16 nFamily, const OUString& rName, - sal_Bool bCreateIndex ) const + bool bCreateIndex ) const { return mpImpl->FindStyleChildContext( nFamily, rName, bCreateIndex ); } diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index 9cdac0dcd256..1f4f65ee52b0 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -677,7 +677,7 @@ void XMLCellImportContext::EndElement() // class XMLTableTemplateContext XMLTableTemplateContext::XMLTableTemplateContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList ) -: SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_TABLE_TEMPLATE_ID, sal_False ) +: SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_TABLE_TEMPLATE_ID, false ) { } diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 5293dbb8154e..f2484a1fdf6f 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -1221,7 +1221,7 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars, const SvXMLStyleContext* pTempStyle = ((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)-> FindStyleChildContext( nFamily, rStyleName, - sal_True ); + true ); pStyle = PTR_CAST( XMLTextStyleContext,pTempStyle); } @@ -1430,7 +1430,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( { const SvXMLStyleContext* pTempStyle = ((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)-> - FindStyleChildContext( nFamily, sStyleName, sal_True ); + FindStyleChildContext( nFamily, sStyleName, true ); pStyle = PTR_CAST( XMLTextStyleContext,pTempStyle); } if( pStyle ) @@ -2117,7 +2117,7 @@ void XMLTextImportHelper::SetRuby( const SvXMLStyleContext* pTempStyle = ((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)-> FindStyleChildContext( XML_STYLE_FAMILY_TEXT_RUBY, - rStyleName, sal_True ); + rStyleName, true ); pStyle = PTR_CAST(XMLPropStyleContext,pTempStyle); if (NULL != pStyle) @@ -2351,7 +2351,7 @@ sal_Int32 XMLTextImportHelper::GetDataStyleKey(const OUString& sStyleName, const SvXMLStyleContext* pStyle = ((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)-> FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE, - sStyleName, sal_True ); + sStyleName, true ); // get appropriate context @@ -2387,7 +2387,7 @@ const SvxXMLListStyleContext *XMLTextImportHelper::FindAutoListStyle( const OUSt const SvXMLStyleContext* pTempStyle = ((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)-> FindStyleChildContext( XML_STYLE_FAMILY_TEXT_LIST, rName, - sal_True ); + true ); pStyle = PTR_CAST( SvxXMLListStyleContext ,pTempStyle); } @@ -2402,7 +2402,7 @@ XMLPropStyleContext *XMLTextImportHelper::FindAutoFrameStyle( const OUString& rN const SvXMLStyleContext* pTempStyle = ((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)-> FindStyleChildContext( XML_STYLE_FAMILY_SD_GRAPHICS_ID, rName, - sal_True ); + true ); pStyle = PTR_CAST( XMLPropStyleContext ,pTempStyle); } @@ -2419,7 +2419,7 @@ XMLPropStyleContext* XMLTextImportHelper::FindSectionStyle( ((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)-> FindStyleChildContext( XML_STYLE_FAMILY_TEXT_SECTION, - rName, sal_True ); + rName, true ); pStyle = PTR_CAST( XMLPropStyleContext,pTempStyle); } @@ -2436,7 +2436,7 @@ XMLPropStyleContext* XMLTextImportHelper::FindPageMaster( ((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)-> FindStyleChildContext( XML_STYLE_FAMILY_PAGE_MASTER, - rName, sal_True ); + rName, true ); pStyle = PTR_CAST( XMLPropStyleContext,pTempStyle); } diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx index f252b1e3a32c..7d10978e04c4 100644 --- a/xmloff/source/text/txtlists.cxx +++ b/xmloff/source/text/txtlists.cxx @@ -512,7 +512,7 @@ XMLTextListsHelper::MakeNumRule( // Because there is no list style sheet for this style, a default // format must be set for any level of this num rule. SvxXMLListStyleContext::SetDefaultStyle( xNumRules, io_rLevel, - sal_False ); + false ); } return xNumRules; |