diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-07 16:42:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-15 09:02:31 +0200 |
| commit | 8a81f542a6ca566661305c53899b7e422cbaa432 (patch) | |
| tree | b70ce405aab1c29856fa824493a664ba8ba27596 /xmloff/source/draw | |
| parent | 42bfd486a457d327f640263ccc3ee02a380f3566 (diff) | |
xmloff: sal_Bool->bool
Change-Id: I873c80baec8e70e3e8f642644563b92137571a30
Diffstat (limited to 'xmloff/source/draw')
31 files changed, 447 insertions, 447 deletions
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index 88abaa8ca675..afbe5797bf7f 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -99,7 +99,7 @@ void XMLGraphicsDefaultStyle::SetDefaults() if( !xDefaults.is() ) return; // SJ: #i114750# - sal_Bool bWordWrapDefault = sal_True; // initializing with correct ODF fo:wrap-option default + bool bWordWrapDefault = true; // initializing with correct ODF fo:wrap-option default sal_Int32 nUPD( 0 ); sal_Int32 nBuild( 0 ); const bool bBuildIdFound = GetImport().getBuildIds( nUPD, nBuild ); @@ -110,7 +110,7 @@ void XMLGraphicsDefaultStyle::SetDefaults() || ((nUPD > 300) && (nUPD <= 330)) ) ) - bWordWrapDefault = sal_False; + bWordWrapDefault = false; const OUString sTextWordWrap( "TextWordWrap" ); Reference< XPropertySetInfo > xInfo( xDefaults->getPropertySetInfo() ); diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 79628fc8c5da..0562b98d6a16 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -120,9 +120,9 @@ protected: OUStringBuffer sDescriptionBuffer; OUStringBuffer sTitleBuffer; OUString sNam; - sal_Bool bIsActive; + bool bIsActive; - sal_Bool bValid; + bool bValid; public: TYPEINFO_OVERRIDE(); @@ -180,8 +180,8 @@ XMLImageMapObjectContext::XMLImageMapObjectContext( sTarget("Target"), sURL("URL"), xImageMap(xMap), - bIsActive(sal_True), - bValid(sal_False) + bIsActive(true), + bValid(false) { DBG_ASSERT(NULL != pServiceName, "Please supply the image map object service name"); @@ -313,10 +313,10 @@ class XMLImageMapRectangleContext : public XMLImageMapObjectContext { awt::Rectangle aRectangle; - sal_Bool bXOK; - sal_Bool bYOK; - sal_Bool bWidthOK; - sal_Bool bHeightOK; + bool bXOK; + bool bYOK; + bool bWidthOK; + bool bHeightOK; public: TYPEINFO_OVERRIDE(); @@ -351,10 +351,10 @@ XMLImageMapRectangleContext::XMLImageMapRectangleContext( Reference<XIndexContainer> xMap) : XMLImageMapObjectContext(rImport, nPrefix, rLocalName, xMap, "com.sun.star.image.ImageMapRectangleObject"), - bXOK(sal_False), - bYOK(sal_False), - bWidthOK(sal_False), - bHeightOK(sal_False) + bXOK(false), + bYOK(false), + bWidthOK(false), + bHeightOK(false) { } @@ -374,7 +374,7 @@ void XMLImageMapRectangleContext::ProcessAttribute( rValue)) { aRectangle.X = nTmp; - bXOK = sal_True; + bXOK = true; } break; case XML_TOK_IMAP_Y: @@ -382,7 +382,7 @@ void XMLImageMapRectangleContext::ProcessAttribute( rValue)) { aRectangle.Y = nTmp; - bYOK = sal_True; + bYOK = true; } break; case XML_TOK_IMAP_WIDTH: @@ -390,7 +390,7 @@ void XMLImageMapRectangleContext::ProcessAttribute( rValue)) { aRectangle.Width = nTmp; - bWidthOK = sal_True; + bWidthOK = true; } break; case XML_TOK_IMAP_HEIGHT: @@ -398,7 +398,7 @@ void XMLImageMapRectangleContext::ProcessAttribute( rValue)) { aRectangle.Height = nTmp; - bHeightOK = sal_True; + bHeightOK = true; } break; default: @@ -425,8 +425,8 @@ class XMLImageMapPolygonContext : public XMLImageMapObjectContext OUString sViewBoxString; OUString sPointsString; - sal_Bool bViewBoxOK; - sal_Bool bPointsOK; + bool bViewBoxOK; + bool bPointsOK; public: TYPEINFO_OVERRIDE(); @@ -461,8 +461,8 @@ XMLImageMapPolygonContext::XMLImageMapPolygonContext( Reference<XIndexContainer> xMap) : XMLImageMapObjectContext(rImport, nPrefix, rLocalName, xMap, "com.sun.star.image.ImageMapPolygonObject"), - bViewBoxOK(sal_False), - bPointsOK(sal_False) + bViewBoxOK(false), + bPointsOK(false) { } @@ -478,11 +478,11 @@ void XMLImageMapPolygonContext::ProcessAttribute( { case XML_TOK_IMAP_POINTS: sPointsString = rValue; - bPointsOK = sal_True; + bPointsOK = true; break; case XML_TOK_IMAP_VIEWBOX: sViewBoxString = rValue; - bViewBoxOK = sal_True; + bViewBoxOK = true; break; default: XMLImageMapObjectContext::ProcessAttribute(eToken, rValue); @@ -522,9 +522,9 @@ class XMLImageMapCircleContext : public XMLImageMapObjectContext awt::Point aCenter; sal_Int32 nRadius; - sal_Bool bXOK; - sal_Bool bYOK; - sal_Bool bRadiusOK; + bool bXOK; + bool bYOK; + bool bRadiusOK; public: TYPEINFO_OVERRIDE(); @@ -580,7 +580,7 @@ void XMLImageMapCircleContext::ProcessAttribute( rValue)) { aCenter.X = nTmp; - bXOK = sal_True; + bXOK = true; } break; case XML_TOK_IMAP_CENTER_Y: @@ -588,7 +588,7 @@ void XMLImageMapCircleContext::ProcessAttribute( rValue)) { aCenter.Y = nTmp; - bYOK = sal_True; + bYOK = true; } break; case XML_TOK_IMAP_RADIUS: @@ -596,7 +596,7 @@ void XMLImageMapCircleContext::ProcessAttribute( rValue)) { nRadius = nTmp; - bRadiusOK = sal_True; + bRadiusOK = true; } break; default: diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx index 73336d34fca5..b1f33257e350 100644 --- a/xmloff/source/draw/XMLImageMapExport.cxx +++ b/xmloff/source/draw/XMLImageMapExport.cxx @@ -71,7 +71,7 @@ XMLImageMapExport::XMLImageMapExport(SvXMLExport& rExp) : msURL("URL"), msTitle("Title"), mrExport(rExp), - mbWhiteSpace(sal_True) + mbWhiteSpace(true) { } diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index f88d09fa438c..fe039068a481 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -34,33 +34,33 @@ using namespace ::xmloff::token; struct SdXMLDataStyleNumber { enum XMLTokenEnum meNumberStyle; - sal_Bool mbLong; - sal_Bool mbTextual; - sal_Bool mbDecimal02; + bool mbLong; + bool mbTextual; + bool mbDecimal02; const char* mpText; } aSdXMLDataStyleNumbers[] = { - { XML_DAY, sal_False, sal_False, sal_False, NULL }, - { XML_DAY, sal_True, sal_False, sal_False, NULL }, - { XML_MONTH, sal_True, sal_False, sal_False, NULL }, - { XML_MONTH, sal_False, sal_True, sal_False, NULL }, - { XML_MONTH, sal_True, sal_True, sal_False, NULL }, - { XML_YEAR, sal_False, sal_False, sal_False, NULL }, - { XML_YEAR, sal_True, sal_False, sal_False, NULL }, - { XML_DAY_OF_WEEK, sal_False, sal_False, sal_False, NULL }, - { XML_DAY_OF_WEEK, sal_True, sal_False, sal_False, NULL }, - { XML_TEXT, sal_False, sal_False, sal_False, "." }, - { XML_TEXT, sal_False, sal_False, sal_False, " " }, - { XML_TEXT, sal_False, sal_False, sal_False, ", " }, - { XML_TEXT, sal_False, sal_False, sal_False, ". " }, - { XML_HOURS, sal_False, sal_False, sal_False, NULL }, - { XML_MINUTES, sal_False, sal_False, sal_False, NULL }, - { XML_TEXT, sal_False, sal_False, sal_False, ":" }, - { XML_AM_PM, sal_False, sal_False, sal_False, NULL }, - { XML_SECONDS, sal_False, sal_False, sal_False, NULL }, - { XML_SECONDS, sal_False, sal_False, sal_True, NULL }, - { XML_TOKEN_INVALID, 0, 0, 0, NULL } + { XML_DAY, false, false, false, NULL }, + { XML_DAY, true, false, false, NULL }, + { XML_MONTH, true, false, false, NULL }, + { XML_MONTH, false, true, false, NULL }, + { XML_MONTH, true, true, false, NULL }, + { XML_YEAR, false, false, false, NULL }, + { XML_YEAR, true, false, false, NULL }, + { XML_DAY_OF_WEEK, false, false, false, NULL }, + { XML_DAY_OF_WEEK, true, false, false, NULL }, + { XML_TEXT, false, false, false, "." }, + { XML_TEXT, false, false, false, " " }, + { XML_TEXT, false, false, false, ", " }, + { XML_TEXT, false, false, false, ". " }, + { XML_HOURS, false, false, false, NULL }, + { XML_MINUTES, false, false, false, NULL }, + { XML_TEXT, false, false, false, ":" }, + { XML_AM_PM, false, false, false, NULL }, + { XML_SECONDS, false, false, false, NULL }, + { XML_SECONDS, false, false, true, NULL }, + { XML_TOKEN_INVALID, false, false, false, NULL } }; // date @@ -88,14 +88,14 @@ struct SdXMLDataStyleNumber struct SdXMLFixedDataStyle { const char* mpName; - sal_Bool mbAutomatic; - sal_Bool mbDateStyle; + bool mbAutomatic; + bool mbDateStyle; sal_uInt8 mpFormat[8]; }; const SdXMLFixedDataStyle aSdXML_Standard_Short = { - "D1", sal_True, sal_True, + "D1", true, true, { DATA_STYLE_NUMBER_DAY_LONG, DATA_STYLE_NUMBER_TEXT_POINT, @@ -108,7 +108,7 @@ const SdXMLFixedDataStyle aSdXML_Standard_Short = const SdXMLFixedDataStyle aSdXML_Standard_Long = { - "D2", sal_True, sal_True, + "D2", true, true, { DATA_STYLE_NUMBER_DAYOFWEEK_LONG, DATA_STYLE_NUMBER_TEXT_COMMASPACE, @@ -123,7 +123,7 @@ const SdXMLFixedDataStyle aSdXML_Standard_Long = const SdXMLFixedDataStyle aSdXML_DateStyle_1 = { - "D3", sal_False, sal_True, + "D3", false, true, { DATA_STYLE_NUMBER_DAY_LONG, DATA_STYLE_NUMBER_TEXT_POINT, @@ -136,7 +136,7 @@ const SdXMLFixedDataStyle aSdXML_DateStyle_1 = const SdXMLFixedDataStyle aSdXML_DateStyle_2 = { - "D4", sal_False, sal_True, + "D4", false, true, { DATA_STYLE_NUMBER_DAY_LONG, DATA_STYLE_NUMBER_TEXT_POINT, @@ -149,7 +149,7 @@ const SdXMLFixedDataStyle aSdXML_DateStyle_2 = const SdXMLFixedDataStyle aSdXML_DateStyle_3 = { - "D5", sal_False, sal_True, + "D5", false, true, { DATA_STYLE_NUMBER_DAY, DATA_STYLE_NUMBER_TEXT_POINTSPACE, @@ -162,7 +162,7 @@ const SdXMLFixedDataStyle aSdXML_DateStyle_3 = const SdXMLFixedDataStyle aSdXML_DateStyle_4 = { - "D6", sal_False, sal_True, + "D6", false, true, { DATA_STYLE_NUMBER_DAY, DATA_STYLE_NUMBER_TEXT_POINTSPACE, @@ -175,7 +175,7 @@ const SdXMLFixedDataStyle aSdXML_DateStyle_4 = const SdXMLFixedDataStyle aSdXML_DateStyle_5 = { - "D7", sal_False, sal_True, + "D7", false, true, { DATA_STYLE_NUMBER_DAYOFWEEK, DATA_STYLE_NUMBER_TEXT_COMMASPACE, @@ -190,7 +190,7 @@ const SdXMLFixedDataStyle aSdXML_DateStyle_5 = const SdXMLFixedDataStyle aSdXML_DateStyle_6 = { - "D8", sal_False, sal_True, + "D8", false, true, { DATA_STYLE_NUMBER_DAYOFWEEK_LONG, DATA_STYLE_NUMBER_TEXT_COMMASPACE, @@ -204,7 +204,7 @@ const SdXMLFixedDataStyle aSdXML_DateStyle_6 = }; const SdXMLFixedDataStyle aSdXML_TimeStyle_1 = -{ "T1", sal_True, sal_False, +{ "T1", true, false, { DATA_STYLE_NUMBER_HOURS, DATA_STYLE_NUMBER_TEXT_COLON, @@ -217,7 +217,7 @@ const SdXMLFixedDataStyle aSdXML_TimeStyle_1 = }; const SdXMLFixedDataStyle aSdXML_TimeStyle_2 = -{ "T2", sal_False, sal_False, +{ "T2", false, false, { DATA_STYLE_NUMBER_HOURS, DATA_STYLE_NUMBER_TEXT_COLON, @@ -227,7 +227,7 @@ const SdXMLFixedDataStyle aSdXML_TimeStyle_2 = }; const SdXMLFixedDataStyle aSdXML_TimeStyle_3 = -{ "T3", sal_False, sal_False, +{ "T3", false, false, { DATA_STYLE_NUMBER_HOURS, DATA_STYLE_NUMBER_TEXT_COLON, @@ -239,7 +239,7 @@ const SdXMLFixedDataStyle aSdXML_TimeStyle_3 = }; const SdXMLFixedDataStyle aSdXML_TimeStyle_4 = -{ "T4", sal_False, sal_False, +{ "T4", false, false, { DATA_STYLE_NUMBER_HOURS, DATA_STYLE_NUMBER_TEXT_COLON, @@ -251,7 +251,7 @@ const SdXMLFixedDataStyle aSdXML_TimeStyle_4 = }; const SdXMLFixedDataStyle aSdXML_TimeStyle_5 = -{ "T5", sal_False, sal_False, +{ "T5", false, false, { DATA_STYLE_NUMBER_HOURS, DATA_STYLE_NUMBER_TEXT_COLON, @@ -262,7 +262,7 @@ const SdXMLFixedDataStyle aSdXML_TimeStyle_5 = }; const SdXMLFixedDataStyle aSdXML_TimeStyle_6 = -{ "T6", sal_False, sal_False, +{ "T6", false, false, { DATA_STYLE_NUMBER_HOURS, DATA_STYLE_NUMBER_TEXT_COLON, @@ -275,7 +275,7 @@ const SdXMLFixedDataStyle aSdXML_TimeStyle_6 = }; const SdXMLFixedDataStyle aSdXML_TimeStyle_7 = -{ "T7", sal_False, sal_False, +{ "T7", false, false, { DATA_STYLE_NUMBER_HOURS, DATA_STYLE_NUMBER_TEXT_COLON, @@ -482,9 +482,9 @@ private: SdXMLNumberFormatImportContext* mpParent; OUString maNumberStyle; - sal_Bool mbLong; - sal_Bool mbTextual; - sal_Bool mbDecimal02; + bool mbLong; + bool mbTextual; + bool mbDecimal02; OUString maText; boost::shared_ptr< SvXMLImportContext > mpSlaveContext; @@ -518,9 +518,9 @@ SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXM maNumberStyle( rLocalName ), mpSlaveContext( pSlaveContext ) { - mbLong = sal_False; - mbTextual = sal_False; - mbDecimal02 = sal_False; + mbLong = false; + mbTextual = false; + mbDecimal02 = false; const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -583,7 +583,7 @@ TYPEINIT1( SdXMLNumberFormatImportContext, SvXMLImportContext ); SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles) : SvXMLNumFormatContext(rImport, nPrfx, rLocalName, pNewData, nNewType, xAttrList, rStyles), - mbAutomatic( sal_False ), + mbAutomatic( false ), mnIndex(0), mnKey( -1 ) { @@ -611,7 +611,7 @@ SdXMLNumberFormatImportContext::~SdXMLNumberFormatImportContext() { } -void SdXMLNumberFormatImportContext::add( OUString& rNumberStyle, sal_Bool bLong, sal_Bool bTextual, sal_Bool bDecimal02, OUString& rText ) +void SdXMLNumberFormatImportContext::add( OUString& rNumberStyle, bool bLong, bool bTextual, bool bDecimal02, OUString& rText ) { if( mnIndex == -1 || mnIndex == 16 ) { diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx index dd92089234f4..8361fd2a76de 100644 --- a/xmloff/source/draw/XMLReplacementImageContext.cxx +++ b/xmloff/source/draw/XMLReplacementImageContext.cxx @@ -79,7 +79,7 @@ void XMLReplacementImageContext::EndElement() OUString sHRef; if( !m_sHRef.isEmpty() ) { - sal_Bool bForceLoad = xTxtImport->IsInsertMode() || + bool bForceLoad = xTxtImport->IsInsertMode() || xTxtImport->IsBlockMode() || xTxtImport->IsStylesOnlyMode() || xTxtImport->IsOrganizerMode(); diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index 4284637f58f5..60ad11a7355a 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -576,9 +576,9 @@ void AnimationsExporterImpl::exportTransitionNode() Any aSound( mxPageProps->getPropertyValue("Sound") ); OUString sSoundURL; aSound >>= sSoundURL; - sal_Bool bStopSound = sal_False; + bool bStopSound = false; if( !(aSound >>= bStopSound) ) - bStopSound = sal_False; + bStopSound = false; OUStringBuffer sTmp; @@ -598,7 +598,7 @@ void AnimationsExporterImpl::exportTransitionNode() if( nTransition != 0 ) { sal_Int16 nSubtype = 0; - sal_Bool bDirection = sal_False; + bool bDirection = false; sal_Int32 nFadeColor = 0; double fDuration = 0.0; mxPageProps->getPropertyValue("TransitionSubtype") >>= nSubtype; @@ -639,7 +639,7 @@ void AnimationsExporterImpl::exportTransitionNode() { mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, mrExport.GetRelativeReference( sSoundURL ) ); - sal_Bool bLoopSound = sal_False; + bool bLoopSound = false; mxPageProps->getPropertyValue("LoopSound") >>= bLoopSound; if( bLoopSound ) @@ -657,7 +657,7 @@ void AnimationsExporterImpl::prepareTransitionNode() sal_Int16 nTransition = 0; mxPageProps->getPropertyValue("TransitionType") >>= nTransition; - sal_Bool bStopSound = sal_False; + bool bStopSound = false; OUString sSoundURL; if( nTransition == 0 ) @@ -666,7 +666,7 @@ void AnimationsExporterImpl::prepareTransitionNode() aSound >>= sSoundURL; if( !(aSound >>= bStopSound) ) - bStopSound = sal_False; + bStopSound = false; } if( (nTransition != 0) || !sSoundURL.isEmpty() || bStopSound ) @@ -852,7 +852,7 @@ void AnimationsExporterImpl::exportNode( const Reference< XAnimationNode >& xNod mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DECELERATE, sTmp.makeStringAndClear() ); } - sal_Bool bTemp = xNode->getAutoReverse(); + bool bTemp = xNode->getAutoReverse(); if( bTemp ) { ::sax::Converter::convertBool( sTmp, bTemp ); @@ -1102,7 +1102,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat OUStringBuffer sTmp; sal_Int32 nTemp; - sal_Bool bTemp; + bool bTemp; Any aTemp( xAnimate->getTarget() ); if( aTemp.hasValue() ) diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index 14b50ad03b5e..0bc68d3ea400 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -197,7 +197,7 @@ enum XMLActionKind struct XMLEffectHint { XMLActionKind meKind; - sal_Bool mbTextEffect; + bool mbTextEffect; Reference<XShape> mxShape; XMLEffect meEffect; @@ -207,16 +207,16 @@ struct XMLEffectHint AnimationSpeed meSpeed; sal_Int32 maDimColor; OUString maSoundURL; - sal_Bool mbPlayFull; + bool mbPlayFull; sal_Int32 mnPresId; sal_Int32 mnPathShapeId; bool operator<(const XMLEffectHint& rComp) const { return mnPresId < rComp.mnPresId; } XMLEffectHint() - : meKind( XMLE_SHOW ), mbTextEffect( sal_False ), + : meKind( XMLE_SHOW ), mbTextEffect( false ), meEffect( EK_none ), meDirection( ED_none ), mnStartScale( -1 ), - meSpeed( AnimationSpeed_SLOW ), maDimColor(0), mbPlayFull( sal_False ), + meSpeed( AnimationSpeed_SLOW ), maDimColor(0), mbPlayFull( false ), mnPresId( 0 ), mnPathShapeId( -1 ) {} }; @@ -327,7 +327,7 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape, SvXMLExport& rE xProps->getPropertyValue( mpImpl->msSpeed ) >>= aEffect.meSpeed; - sal_Bool bIsAnimation = false; + bool bIsAnimation = false; xProps->getPropertyValue( mpImpl->msIsAnimation ) >>= bIsAnimation; if( bIsAnimation ) { @@ -380,7 +380,7 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape, SvXMLExport& rE bool bIn = true; SdXMLImplSetEffect( eEffect, aEffect.meEffect, aEffect.meDirection, aEffect.mnStartScale, bIn ); aEffect.meKind = bIn ? XMLE_SHOW : XMLE_HIDE; - aEffect.mbTextEffect = sal_True; + aEffect.mbTextEffect = true; if( !aEffect.mxShape.is() ) { @@ -389,12 +389,12 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape, SvXMLExport& rE } mpImpl->maEffects.push_back( aEffect ); - aEffect.mbTextEffect = sal_False; + aEffect.mbTextEffect = false; aEffect.maSoundURL = aEmptyStr; } - sal_Bool bDimPrev = false; - sal_Bool bDimHide = false; + bool bDimPrev = false; + bool bDimHide = false; xProps->getPropertyValue( mpImpl->msDimPrev ) >>= bDimPrev; xProps->getPropertyValue( mpImpl->msDimHide ) >>= bDimHide; if( bDimPrev || bDimHide ) diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 72d27cea1198..00862123e194 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -365,7 +365,7 @@ public: AnimImpImpl* mpImpl; XMLActionKind meKind; - sal_Bool mbTextEffect; + bool mbTextEffect; OUString maShapeId; XMLEffect meEffect; @@ -375,7 +375,7 @@ public: AnimationSpeed meSpeed; sal_Int32 maDimColor; OUString maSoundURL; - sal_Bool mbPlayFull; + bool mbPlayFull; OUString maPathShapeId; public: @@ -447,9 +447,9 @@ TYPEINIT1( XMLAnimationsEffectContext, SvXMLImportContext ); XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, AnimImpImpl* pImpl ) : SvXMLImportContext(rImport, nPrfx, rLocalName), mpImpl( pImpl ), - meKind( XMLE_SHOW ), mbTextEffect( sal_False ), + meKind( XMLE_SHOW ), mbTextEffect( false ), meEffect( EK_none ), meDirection( ED_none ), mnStartScale( 100 ), - meSpeed( AnimationSpeed_MEDIUM ), maDimColor(0), mbPlayFull( sal_False ) + meSpeed( AnimationSpeed_MEDIUM ), maDimColor(0), mbPlayFull( false ) { if( IsXMLToken( rLocalName, XML_SHOW_SHAPE ) ) { @@ -458,7 +458,7 @@ XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, s else if( IsXMLToken( rLocalName, XML_SHOW_TEXT ) ) { meKind = XMLE_SHOW; - mbTextEffect = sal_True; + mbTextEffect = true; } else if( IsXMLToken( rLocalName, XML_HIDE_SHAPE ) ) { @@ -467,7 +467,7 @@ XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, s else if( IsXMLToken( rLocalName, XML_HIDE_TEXT ) ) { meKind = XMLE_HIDE; - mbTextEffect = sal_True; + mbTextEffect = true; } else if( IsXMLToken( rLocalName, XML_DIM ) ) { @@ -585,7 +585,7 @@ void XMLAnimationsEffectContext::EndElement() { if( meKind == XMLE_DIM ) { - aAny <<= (sal_Bool)sal_True; + aAny <<= true; xSet->setPropertyValue( mpImpl->msDimPrev, aAny ); aAny <<= maDimColor; @@ -593,7 +593,7 @@ void XMLAnimationsEffectContext::EndElement() } else if( meKind == XMLE_PLAY ) { - aAny <<= (sal_Bool)sal_True; + aAny <<= true; xSet->setPropertyValue( mpImpl->msIsAnimation, aAny ); // #i42894# speed is not supported for the old group animation fallback, so no need to set it diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index a99995a2eb92..0be658c134e8 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -83,8 +83,8 @@ public: virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList ) SAL_OVERRIDE; virtual void EndElement() SAL_OVERRIDE; - sal_Bool mbValid; - sal_Bool mbScript; + bool mbValid; + bool mbScript; ClickAction meClickAction; XMLEffect meEffect; XMLEffectDirection meDirection; @@ -92,7 +92,7 @@ public: AnimationSpeed meSpeed; sal_Int32 mnVerb; OUString msSoundURL; - sal_Bool mbPlayFull; + bool mbPlayFull; OUString msMacroName; OUString msBookmark; OUString msLanguage; @@ -150,21 +150,21 @@ TYPEINIT1( SdXMLEventContext, SvXMLImportContext ); SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XShape >& rxShape ) : SvXMLImportContext(rImp, nPrfx, rLocalName) - , mxShape(rxShape), mbValid(false), mbScript(sal_False) + , mxShape(rxShape), mbValid(false), mbScript(false) , meClickAction(ClickAction_NONE), meEffect(EK_none) , meDirection(ED_none), mnStartScale(100), meSpeed(AnimationSpeed_MEDIUM) - , mnVerb(0), mbPlayFull(sal_False) + , mnVerb(0), mbPlayFull(false) { static const OUString sXMLClickName( "click" ); if( nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_EVENT_LISTENER ) ) { - mbValid = sal_True; + mbValid = true; } else if( nPrfx == XML_NAMESPACE_SCRIPT && IsXMLToken( rLocalName, XML_EVENT_LISTENER ) ) { - mbScript = sal_True; - mbValid = sal_True; + mbScript = true; + mbValid = true; } else { diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 28fdee7dc4be..99841899651a 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -785,14 +785,14 @@ private: bool XMLMoveSizeProtectHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - const sal_Bool bValue = rStrImpValue.indexOf( GetXMLToken( mnType == XML_SD_TYPE_MOVE_PROTECT ? XML_POSITION : XML_SIZE ) ) != -1; + const bool bValue = rStrImpValue.indexOf( GetXMLToken( mnType == XML_SD_TYPE_MOVE_PROTECT ? XML_POSITION : XML_SIZE ) ) != -1; rValue <<= bValue; return true; } bool XMLMoveSizeProtectHdl::exportXML( OUString& rStrExpValue, const Any& rValue, const SvXMLUnitConverter& ) const { - sal_Bool bValue = sal_Bool(); + bool bValue; if( !(rValue >>= bValue ) ) return false; @@ -828,7 +828,7 @@ bool XMLSdHeaderFooterVisibilityTypeHdl::importXML( // #i38644# // attributes with this type where saved with VISIBLE|HIDDEN prior // to src680m67. So we have to import that correctly - const sal_Bool bBool = IsXMLToken(rStrImpValue, XML_TRUE) || IsXMLToken(rStrImpValue, XML_VISIBLE); + const bool bBool = IsXMLToken(rStrImpValue, XML_TRUE) || IsXMLToken(rStrImpValue, XML_VISIBLE); rValue <<= bBool; return bBool || IsXMLToken(rStrImpValue, XML_FALSE) || IsXMLToken(rStrImpValue, XML_HIDDEN); } @@ -839,8 +839,8 @@ bool XMLSdHeaderFooterVisibilityTypeHdl::exportXML( const SvXMLUnitConverter& ) const { bool bRet = false; - OUStringBuffer aOut; - sal_Bool bValue = sal_Bool(); + OUStringBuffer aOut; + bool bValue; if (rValue >>= bValue) { @@ -1176,7 +1176,7 @@ XMLShapePropertySetMapper::~XMLShapePropertySetMapper() XMLShapeExportPropertyMapper::XMLShapeExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ) : SvXMLExportPropertyMapper( rMapper ) , maNumRuleExp( rExport ) -, mbIsInAutoStyles( sal_True ) +, mbIsInAutoStyles( true ) , msCDATA( GetXMLToken(XML_CDATA)) , msTrue( GetXMLToken(XML_TRUE)) , msFalse( GetXMLToken(XML_FALSE)) @@ -1345,14 +1345,14 @@ void XMLShapeExportPropertyMapper::ContextFilter( case CTF_SD_MOVE_PROTECT: { - sal_Bool bProtected = sal_Bool(); + bool bProtected; if( (property->maValue >>= bProtected) && !bProtected ) property->mnIndex = -1; } break; case CTF_SD_SIZE_PROTECT: { - sal_Bool bProtected = sal_Bool(); + bool bProtected; if( (property->maValue >>= bProtected) && !bProtected ) property->mnIndex = -1; } @@ -1381,7 +1381,7 @@ void XMLShapeExportPropertyMapper::ContextFilter( // do not export visual area for internal ole objects if( pOLEIsInternal ) { - sal_Bool bInternal = sal_Bool(); + bool bInternal; if( (pOLEIsInternal->maValue >>= bInternal) && !bInternal ) { try @@ -1489,7 +1489,7 @@ void XMLShapeExportPropertyMapper::ContextFilter( if( pCaptionIsEscRel ) { - sal_Bool bIsRel = false; + bool bIsRel = false; pCaptionIsEscRel->maValue >>= bIsRel; if( bIsRel ) @@ -1630,7 +1630,7 @@ void XMLPageExportPropertyMapper::ContextFilter( break; case CTF_PAGE_TRANSITION_DIRECTION: { - sal_Bool bDirection = sal_Bool(); + bool bDirection; if( ((mrExport.getExportFlags() & EXPORT_OASIS) == 0) || (((*property).maValue >>= bDirection) && bDirection) ) (*property).mnIndex = -1; @@ -1651,7 +1651,7 @@ void XMLPageExportPropertyMapper::ContextFilter( break; case CTF_PAGE_VISIBLE: { - sal_Bool bVisible = false; + bool bVisible = false; (*property).maValue >>= bVisible; if( bVisible ) (*property).mnIndex = -1; @@ -1686,7 +1686,7 @@ void XMLPageExportPropertyMapper::ContextFilter( if( pDateTimeFormat && pDateTimeUpdate ) { - sal_Bool bIsFixed = false; + bool bIsFixed = false; pDateTimeUpdate->maValue >>= bIsFixed; if( bIsFixed ) pDateTimeFormat->mnIndex = -1; diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index 2fc4dd72ad3b..7f0247f2d508 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -231,7 +231,7 @@ class XMLShapeExportPropertyMapper : public SvXMLExportPropertyMapper { private: SvxXMLNumRuleExport maNumRuleExp; - sal_Bool mbIsInAutoStyles; + bool mbIsInAutoStyles; const OUString msCDATA; const OUString msTrue; @@ -255,7 +255,7 @@ public: sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; - void SetAutoStyles( sal_Bool bIsInAutoStyles ) { mbIsInAutoStyles = bIsInAutoStyles; } + void SetAutoStyles( bool bIsInAutoStyles ) { mbIsInAutoStyles = bIsInAutoStyles; } virtual void handleSpecialItem( SvXMLAttributeList& rAttrList, diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 46b714f621c0..b0351db16ddf 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -103,7 +103,7 @@ class ImpXMLEXPPageMasterInfo public: ImpXMLEXPPageMasterInfo(const SdXMLExport& rExp, const Reference<XDrawPage>& xPage); - sal_Bool operator==(const ImpXMLEXPPageMasterInfo& rInfo) const; + bool operator==(const ImpXMLEXPPageMasterInfo& rInfo) const; void SetName(const OUString& rStr); const OUString& GetName() const { return msName; } @@ -173,7 +173,7 @@ ImpXMLEXPPageMasterInfo::ImpXMLEXPPageMasterInfo( } } -sal_Bool ImpXMLEXPPageMasterInfo::operator==(const ImpXMLEXPPageMasterInfo& rInfo) const +bool ImpXMLEXPPageMasterInfo::operator==(const ImpXMLEXPPageMasterInfo& rInfo) const { return ((mnBorderBottom == rInfo.mnBorderBottom) && (mnBorderLeft == rInfo.mnBorderLeft) @@ -204,7 +204,7 @@ class ImpXMLAutoLayoutInfo public: ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterInfo* pInf); - sal_Bool operator==(const ImpXMLAutoLayoutInfo& rInfo) const; + bool operator==(const ImpXMLAutoLayoutInfo& rInfo) const; sal_uInt16 GetLayoutType() const { return mnType; } sal_Int32 GetGapX() const { return mnGapX; } @@ -216,19 +216,19 @@ public: const Rectangle& GetTitleRectangle() const { return maTitleRect; } const Rectangle& GetPresRectangle() const { return maPresRect; } - static sal_Bool IsCreateNecessary(sal_uInt16 nTyp); + static bool IsCreateNecessary(sal_uInt16 nTyp); }; -sal_Bool ImpXMLAutoLayoutInfo::IsCreateNecessary(sal_uInt16 nTyp) +bool ImpXMLAutoLayoutInfo::IsCreateNecessary(sal_uInt16 nTyp) { if(nTyp == 5 /* AUTOLAYOUT_ORG */ || nTyp == 20 /* AUTOLAYOUT_NONE */ || nTyp >= IMP_AUTOLAYOUT_INFO_MAX) - return sal_False; - return sal_True; + return false; + return true; } -sal_Bool ImpXMLAutoLayoutInfo::operator==(const ImpXMLAutoLayoutInfo& rInfo) const +bool ImpXMLAutoLayoutInfo::operator==(const ImpXMLAutoLayoutInfo& rInfo) const { return ((mnType == rInfo.mnType && mpPageMasterInfo == rInfo.mpPageMasterInfo)); @@ -392,7 +392,7 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI SdXMLExport::SdXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, - sal_Bool bIsDraw, sal_uInt16 nExportFlags ) + bool bIsDraw, sal_uInt16 nExportFlags ) : SvXMLExport( util::MeasureUnit::CM, xContext, implementationName, (bIsDraw) ? XML_GRAPHICS : XML_PRESENTATION, nExportFlags ), mnDocMasterPageCount(0L), @@ -408,8 +408,8 @@ SdXMLExport::SdXMLExport( mpPropertySetMapper(0L), mpPresPagePropsMapper(0L), mbIsDraw(bIsDraw), - mbFamilyGraphicUsed(sal_False), - mbFamilyPresentationUsed(sal_False), + mbFamilyGraphicUsed(false), + mbFamilyPresentationUsed(false), msZIndex( GetXMLToken(XML_ZINDEX) ), msEmptyPres( "IsEmptyPresentationObject" ), msModel( "Model" ), @@ -752,10 +752,10 @@ void SdXMLExport::ImpPrepAutoLayoutInfos() } } -sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUString& rName) +bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUString& rName) { rName = ""; - sal_Bool bRetval(sal_False); + bool bRetval(false); Reference <beans::XPropertySet> xPropSet(xPage, UNO_QUERY); if(xPropSet.is()) @@ -788,7 +788,7 @@ sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, O // create entry and look for existance ImpXMLAutoLayoutInfo* pNew = new ImpXMLAutoLayoutInfo(nType, pInfo); - sal_Bool bDidExist(sal_False); + bool bDidExist(false); for( size_t nCnt = 0; !bDidExist && nCnt < mpAutoLayoutInfoList->size(); nCnt++) { @@ -796,7 +796,7 @@ sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, O { delete pNew; pNew = mpAutoLayoutInfoList->at( nCnt ); - bDidExist = sal_True; + bDidExist = true; } } @@ -811,7 +811,7 @@ sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, O } rName = pNew->GetLayoutName(); - bRetval = sal_True; + bRetval = true; } } } @@ -1458,7 +1458,7 @@ static OUString findOrAppendImpl( std::vector< OUString >& rVector, const OUStri return aStr; } -static OUString findOrAppendImpl( std::vector< DateTimeDeclImpl >& rVector, const OUString& rText, sal_Bool bFixed, sal_Int32 nFormat, const sal_Char* pPrefix ) +static OUString findOrAppendImpl( std::vector< DateTimeDeclImpl >& rVector, const OUString& rText, bool bFixed, sal_Int32 nFormat, const sal_Char* pPrefix ) { // search rVector if there is already a DateTimeDeclImpl with rText,bFixed and nFormat std::vector< DateTimeDeclImpl >::iterator aIter; @@ -1524,7 +1524,7 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons const OUString aStrDateTimeTextProp( "DateTimeText" ); if( xInfo->hasPropertyByName( aStrDateTimeTextProp ) ) { - sal_Bool bFixed = false; + bool bFixed = false; sal_Int32 nFormat = 0; xSet->getPropertyValue( aStrDateTimeTextProp ) >>= aStrText; xSet->getPropertyValue("IsDateTimeFixed") >>= bFixed; @@ -1967,9 +1967,9 @@ void SdXMLExport::exportPresentationSettings() if( !xPresProps.is() ) return; - sal_Bool bHasAttr = sal_False; + bool bHasAttr = false; - sal_Bool bTemp = false; + bool bTemp = false; // export range xPresProps->getPropertyValue("IsShowAll") >>= bTemp; @@ -1980,7 +1980,7 @@ void SdXMLExport::exportPresentationSettings() if( !aFirstPage.isEmpty() ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_START_PAGE, aFirstPage ); - bHasAttr = sal_True; + bHasAttr = true; } else { @@ -1989,7 +1989,7 @@ void SdXMLExport::exportPresentationSettings() if( !aCustomShow.isEmpty() ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_SHOW, aCustomShow ); - bHasAttr = sal_True; + bHasAttr = true; } } } @@ -1998,7 +1998,7 @@ void SdXMLExport::exportPresentationSettings() if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_ENDLESS, XML_TRUE ); - bHasAttr = sal_True; + bHasAttr = true; sal_Int32 nPause = 0; xPresProps->getPropertyValue("Pause") >>= nPause; @@ -2015,63 +2015,63 @@ void SdXMLExport::exportPresentationSettings() if( !bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_ANIMATIONS, XML_DISABLED ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("IsAlwaysOnTop") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_STAY_ON_TOP, XML_TRUE ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("IsAutomatic") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_FORCE_MANUAL, XML_TRUE ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("IsFullScreen") >>= bTemp; if( !bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_FULL_SCREEN, XML_FALSE ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("IsMouseVisible") >>= bTemp; if( !bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_MOUSE_VISIBLE, XML_FALSE ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("StartWithNavigator") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_START_WITH_NAVIGATOR, XML_TRUE ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("UsePen") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_MOUSE_AS_PEN, XML_TRUE ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("IsTransitionOnClick") >>= bTemp; if( !bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_TRANSITION_ON_CLICK, XML_DISABLED ); - bHasAttr = sal_True; + bHasAttr = true; } xPresProps->getPropertyValue("IsShowLogo") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_SHOW_LOGO, XML_TRUE ); - bHasAttr = sal_True; + bHasAttr = true; } Reference< container::XNameContainer > xShows; @@ -2141,7 +2141,7 @@ void SdXMLExport::exportPresentationSettings() void SdXMLExport::_ExportStyles(bool bUsed) { - GetPropertySetMapper()->SetAutoStyles( sal_False ); + GetPropertySetMapper()->SetAutoStyles( false ); // export fill styles SvXMLExport::_ExportStyles( bUsed ); @@ -2190,7 +2190,7 @@ void SdXMLExport::_ExportAutoStyles() } } - GetPropertySetMapper()->SetAutoStyles( sal_True ); + GetPropertySetMapper()->SetAutoStyles( true ); if( getExportFlags() & EXPORT_STYLES ) { @@ -2750,32 +2750,32 @@ uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno: return (cppu::OWeakObject*)new SdXMLExport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags ); \ } -SERVICE( XMLImpressExportOasis, "com.sun.star.comp.Impress.XMLOasisExporter", "XMLImpressExportOasis", sal_False, EXPORT_OASIS|EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); -SERVICE( XMLImpressStylesExportOasis, "com.sun.star.comp.Impress.XMLOasisStylesExporter", "XMLImpressStylesExportOasis", sal_False, EXPORT_OASIS|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); -SERVICE( XMLImpressContentExportOasis, "com.sun.star.comp.Impress.XMLOasisContentExporter", "XMLImpressContentExportOasis", sal_False, EXPORT_OASIS|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); -SERVICE( XMLImpressMetaExportOasis, "com.sun.star.comp.Impress.XMLOasisMetaExporter", "XMLImpressMetaExportOasis", sal_False, EXPORT_OASIS|EXPORT_META ); -SERVICE( XMLImpressSettingsExportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsExporter", "XMLImpressSettingsExportOasis", sal_False, EXPORT_OASIS|EXPORT_SETTINGS ); - -SERVICE( XMLImpressExportOOO, "com.sun.star.comp.Impress.XMLExporter", "XMLImpressExportOOO", sal_False, EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); -SERVICE( XMLImpressStylesExportOOO, "com.sun.star.comp.Impress.XMLStylesExporter", "XMLImpressStylesExportOOO", sal_False, EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); -SERVICE( XMLImpressContentExportOOO, "com.sun.star.comp.Impress.XMLContentExporter", "XMLImpressContentExportOOO", sal_False, EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); -SERVICE( XMLImpressMetaExportOOO, "com.sun.star.comp.Impress.XMLMetaExporter", "XMLImpressMetaExportOOO", sal_False, EXPORT_META ); -SERVICE( XMLImpressSettingsExportOOO, "com.sun.star.comp.Impress.XMLSettingsExporter", "XMLImpressSettingsExportOOO", sal_False, EXPORT_SETTINGS ); - -SERVICE( XMLDrawExportOasis, "com.sun.star.comp.Draw.XMLOasisExporter", "XMLDrawExportOasis", sal_True, EXPORT_OASIS|EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); -SERVICE( XMLDrawStylesExportOasis, "com.sun.star.comp.Draw.XMLOasisStylesExporter", "XMLDrawStylesExportOasis", sal_True, EXPORT_OASIS|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); -SERVICE( XMLDrawContentExportOasis, "com.sun.star.comp.Draw.XMLOasisContentExporter", "XMLDrawContentExportOasis", sal_True, EXPORT_OASIS|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); -SERVICE( XMLDrawMetaExportOasis, "com.sun.star.comp.Draw.XMLOasisMetaExporter", "XMLDrawMetaExportOasis", sal_True, EXPORT_OASIS|EXPORT_META ); -SERVICE( XMLDrawSettingsExportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsExporter", "XMLDrawSettingsExportOasis", sal_True, EXPORT_OASIS|EXPORT_SETTINGS ); - -SERVICE( XMLDrawExportOOO, "com.sun.star.comp.Draw.XMLExporter", "XMLDrawExportOOO", sal_True, EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); -SERVICE( XMLDrawStylesExportOOO, "com.sun.star.comp.Draw.XMLStylesExporter", "XMLDrawStylesExportOOO", sal_True, EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); -SERVICE( XMLDrawContentExportOOO, "com.sun.star.comp.Draw.XMLContentExporter", "XMLDrawContentExportOOO", sal_True, EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); -SERVICE( XMLDrawMetaExportOOO, "com.sun.star.comp.Draw.XMLMetaExporter", "XMLDrawMetaExportOOO", sal_True, EXPORT_META ); -SERVICE( XMLDrawSettingsExportOOO, "com.sun.star.comp.Draw.XMLSettingsExporter", "XMLDrawSettingsExportOOO", sal_True, EXPORT_SETTINGS ); - -SERVICE( XMLDrawingLayerExport, "com.sun.star.comp.DrawingLayer.XMLExporter", "XMLDrawingLayerExport", sal_True, EXPORT_OASIS|EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); -SERVICE( XMLImpressClipboardExport, "com.sun.star.comp.Impress.XMLClipboardExporter", "XMLImpressClipboardExport", sal_False, EXPORT_OASIS|EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); +SERVICE( XMLImpressExportOasis, "com.sun.star.comp.Impress.XMLOasisExporter", "XMLImpressExportOasis", false, EXPORT_OASIS|EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); +SERVICE( XMLImpressStylesExportOasis, "com.sun.star.comp.Impress.XMLOasisStylesExporter", "XMLImpressStylesExportOasis", false, EXPORT_OASIS|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); +SERVICE( XMLImpressContentExportOasis, "com.sun.star.comp.Impress.XMLOasisContentExporter", "XMLImpressContentExportOasis", false, EXPORT_OASIS|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); +SERVICE( XMLImpressMetaExportOasis, "com.sun.star.comp.Impress.XMLOasisMetaExporter", "XMLImpressMetaExportOasis", false, EXPORT_OASIS|EXPORT_META ); +SERVICE( XMLImpressSettingsExportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsExporter", "XMLImpressSettingsExportOasis", false, EXPORT_OASIS|EXPORT_SETTINGS ); + +SERVICE( XMLImpressExportOOO, "com.sun.star.comp.Impress.XMLExporter", "XMLImpressExportOOO", false, EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); +SERVICE( XMLImpressStylesExportOOO, "com.sun.star.comp.Impress.XMLStylesExporter", "XMLImpressStylesExportOOO", false, EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); +SERVICE( XMLImpressContentExportOOO, "com.sun.star.comp.Impress.XMLContentExporter", "XMLImpressContentExportOOO", false, EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); +SERVICE( XMLImpressMetaExportOOO, "com.sun.star.comp.Impress.XMLMetaExporter", "XMLImpressMetaExportOOO", false, EXPORT_META ); +SERVICE( XMLImpressSettingsExportOOO, "com.sun.star.comp.Impress.XMLSettingsExporter", "XMLImpressSettingsExportOOO", false, EXPORT_SETTINGS ); + +SERVICE( XMLDrawExportOasis, "com.sun.star.comp.Draw.XMLOasisExporter", "XMLDrawExportOasis", true, EXPORT_OASIS|EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); +SERVICE( XMLDrawStylesExportOasis, "com.sun.star.comp.Draw.XMLOasisStylesExporter", "XMLDrawStylesExportOasis", true, EXPORT_OASIS|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); +SERVICE( XMLDrawContentExportOasis, "com.sun.star.comp.Draw.XMLOasisContentExporter", "XMLDrawContentExportOasis", true, EXPORT_OASIS|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); +SERVICE( XMLDrawMetaExportOasis, "com.sun.star.comp.Draw.XMLOasisMetaExporter", "XMLDrawMetaExportOasis", true, EXPORT_OASIS|EXPORT_META ); +SERVICE( XMLDrawSettingsExportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsExporter", "XMLDrawSettingsExportOasis", true, EXPORT_OASIS|EXPORT_SETTINGS ); + +SERVICE( XMLDrawExportOOO, "com.sun.star.comp.Draw.XMLExporter", "XMLDrawExportOOO", true, EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); +SERVICE( XMLDrawStylesExportOOO, "com.sun.star.comp.Draw.XMLStylesExporter", "XMLDrawStylesExportOOO", true, EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS ); +SERVICE( XMLDrawContentExportOOO, "com.sun.star.comp.Draw.XMLContentExporter", "XMLDrawContentExportOOO", true, EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_FONTDECLS ); +SERVICE( XMLDrawMetaExportOOO, "com.sun.star.comp.Draw.XMLMetaExporter", "XMLDrawMetaExportOOO", true, EXPORT_META ); +SERVICE( XMLDrawSettingsExportOOO, "com.sun.star.comp.Draw.XMLSettingsExporter", "XMLDrawSettingsExportOOO", true, EXPORT_SETTINGS ); + +SERVICE( XMLDrawingLayerExport, "com.sun.star.comp.DrawingLayer.XMLExporter", "XMLDrawingLayerExport", true, EXPORT_OASIS|EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); +SERVICE( XMLImpressClipboardExport, "com.sun.star.comp.Impress.XMLClipboardExporter", "XMLImpressClipboardExport", false, EXPORT_OASIS|EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_FONTDECLS|EXPORT_EMBEDDED ); XMLFontAutoStylePool* SdXMLExport::CreateFontAutoStylePool() { diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index 581fdcbd93bc..6b7dcd163c96 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -71,7 +71,7 @@ struct HeaderFooterPageSettingsImpl struct DateTimeDeclImpl { OUString maStrText; - sal_Bool mbFixed; + bool mbFixed; sal_Int32 mnFormat; }; @@ -114,9 +114,9 @@ class SdXMLExport : public SvXMLExport SdXMLFormatMap maUsedDateStyles; // this is a vector with the used formatings for date fields SdXMLFormatMap maUsedTimeStyles; // this is a vector with the used formatings for time fields - sal_Bool mbIsDraw; - sal_Bool mbFamilyGraphicUsed; - sal_Bool mbFamilyPresentationUsed; + bool mbIsDraw; + bool mbFamilyGraphicUsed; + bool mbFamilyPresentationUsed; const OUString msZIndex; const OUString msEmptyPres; @@ -146,7 +146,7 @@ class SdXMLExport : public SvXMLExport void ImpWritePresentationStyles(); OUString ImpCreatePresPageStyleName( com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> xDrawPage, bool bExportBackground = true ); - sal_Bool ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, OUString& rName); + bool ImpPrepAutoLayoutInfo(const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >& xPage, OUString& rName); void ImpWriteAutoLayoutInfos(); void ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectangle& rRect); void ImpWriteHeaderFooterDecls(); @@ -172,7 +172,7 @@ public: SdXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, - sal_Bool bIsDraw, sal_uInt16 nExportFlags = EXPORT_ALL ); + bool bIsDraw, sal_uInt16 nExportFlags = EXPORT_ALL ); virtual ~SdXMLExport(); void SetProgress(sal_Int32 nProg); @@ -185,13 +185,13 @@ public: XMLShapeExportPropertyMapper* GetPropertySetMapper() const { return mpPropertySetMapper; } XMLPageExportPropertyMapper* GetPresPagePropsMapper() const { return mpPresPagePropsMapper; } - sal_Bool IsDraw() const { return mbIsDraw; } - sal_Bool IsImpress() const { return !mbIsDraw; } + bool IsDraw() const { return mbIsDraw; } + bool IsImpress() const { return !mbIsDraw; } - sal_Bool IsFamilyGraphicUsed() const { return mbFamilyGraphicUsed; } - void SetFamilyGraphicUsed() { mbFamilyGraphicUsed = sal_True; } - sal_Bool IsFamilyPresentationUsed() const { return mbFamilyPresentationUsed; } - void SetFamilyPresentationUsed() { mbFamilyPresentationUsed = sal_True; } + bool IsFamilyGraphicUsed() const { return mbFamilyGraphicUsed; } + void SetFamilyGraphicUsed() { mbFamilyGraphicUsed = true; } + bool IsFamilyPresentationUsed() const { return mbFamilyPresentationUsed; } + void SetFamilyPresentationUsed() { mbFamilyPresentationUsed = true; } virtual void addDataStyle(const sal_Int32 nNumberFormat, bool bTimeFormat = false ) SAL_OVERRIDE; virtual void exportDataStyles() SAL_OVERRIDE; diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index dbd834787359..8fb0ea1fa586 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -267,26 +267,26 @@ uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno: return (cppu::OWeakObject*)new SdXMLImport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags ); \ } -SERVICE( XMLImpressImportOasis, "com.sun.star.comp.Impress.XMLOasisImporter", "XMLImpressImportOasis", sal_False, IMPORT_ALL ) -SERVICE( XMLDrawImportOasis, "com.sun.star.comp.Draw.XMLOasisImporter", "XMLDrawImportOasis", sal_True, IMPORT_ALL ) +SERVICE( XMLImpressImportOasis, "com.sun.star.comp.Impress.XMLOasisImporter", "XMLImpressImportOasis", false, IMPORT_ALL ) +SERVICE( XMLDrawImportOasis, "com.sun.star.comp.Draw.XMLOasisImporter", "XMLDrawImportOasis", true, IMPORT_ALL ) -SERVICE( XMLImpressStylesImportOasis, "com.sun.star.comp.Impress.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", sal_False, IMPORT_STYLES|IMPORT_AUTOSTYLES|IMPORT_MASTERSTYLES ) -SERVICE( XMLDrawStylesImportOasis, "com.sun.star.comp.Draw.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", sal_True, IMPORT_STYLES|IMPORT_AUTOSTYLES|IMPORT_MASTERSTYLES ) +SERVICE( XMLImpressStylesImportOasis, "com.sun.star.comp.Impress.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", false, IMPORT_STYLES|IMPORT_AUTOSTYLES|IMPORT_MASTERSTYLES ) +SERVICE( XMLDrawStylesImportOasis, "com.sun.star.comp.Draw.XMLOasisStylesImporter", "XMLImpressStylesImportOasis", true, IMPORT_STYLES|IMPORT_AUTOSTYLES|IMPORT_MASTERSTYLES ) -SERVICE( XMLImpressContentImportOasis, "com.sun.star.comp.Impress.XMLOasisContentImporter", "XMLImpressContentImportOasis", sal_False, IMPORT_AUTOSTYLES|IMPORT_CONTENT|IMPORT_SCRIPTS|IMPORT_FONTDECLS ) -SERVICE( XMLDrawContentImportOasis, "com.sun.star.comp.Draw.XMLOasisContentImporter", "XMLImpressContentImportOasis", sal_True, IMPORT_AUTOSTYLES|IMPORT_CONTENT|IMPORT_SCRIPTS|IMPORT_FONTDECLS ) +SERVICE( XMLImpressContentImportOasis, "com.sun.star.comp.Impress.XMLOasisContentImporter", "XMLImpressContentImportOasis", false, IMPORT_AUTOSTYLES|IMPORT_CONTENT|IMPORT_SCRIPTS|IMPORT_FONTDECLS ) +SERVICE( XMLDrawContentImportOasis, "com.sun.star.comp.Draw.XMLOasisContentImporter", "XMLImpressContentImportOasis", true, IMPORT_AUTOSTYLES|IMPORT_CONTENT|IMPORT_SCRIPTS|IMPORT_FONTDECLS ) -SERVICE( XMLImpressMetaImportOasis, "com.sun.star.comp.Impress.XMLOasisMetaImporter", "XMLImpressMetaImportOasis", sal_False, IMPORT_META ) -SERVICE( XMLDrawMetaImportOasis, "com.sun.star.comp.Draw.XMLOasisMetaImporter", "XMLImpressMetaImportOasis", sal_True, IMPORT_META ) +SERVICE( XMLImpressMetaImportOasis, "com.sun.star.comp.Impress.XMLOasisMetaImporter", "XMLImpressMetaImportOasis", false, IMPORT_META ) +SERVICE( XMLDrawMetaImportOasis, "com.sun.star.comp.Draw.XMLOasisMetaImporter", "XMLImpressMetaImportOasis", true, IMPORT_META ) -SERVICE( XMLImpressSettingsImportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", sal_False, IMPORT_SETTINGS ) -SERVICE( XMLDrawSettingsImportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", sal_True, IMPORT_SETTINGS ) +SERVICE( XMLImpressSettingsImportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", false, IMPORT_SETTINGS ) +SERVICE( XMLDrawSettingsImportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", true, IMPORT_SETTINGS ) // #110680# SdXMLImport::SdXMLImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, - sal_Bool bIsDraw, sal_uInt16 nImportFlags ) + bool bIsDraw, sal_uInt16 nImportFlags ) : SvXMLImport( xContext, implementationName, nImportFlags ), mpMasterStylesContext(0L), mpDocElemTokenMap(0L), @@ -303,8 +303,8 @@ SdXMLImport::SdXMLImport( mnNewPageCount(0L), mnNewMasterPageCount(0L), mbIsDraw(bIsDraw), - mbLoadDoc(sal_True), - mbPreview(sal_False), + mbLoadDoc(true), + mbPreview(false), msPageLayouts( "PageLayouts" ), msPreview( "Preview" ) { @@ -405,7 +405,7 @@ void SAL_CALL SdXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen "OrganizerMode"); if (xInfoSetInfo->hasPropertyByName(sOrganizerMode)) { - sal_Bool bStyleOnly(sal_False); + bool bStyleOnly(false); if (xInfoSet->getPropertyValue(sOrganizerMode) >>= bStyleOnly) { mbLoadDoc = !bStyleOnly; @@ -715,7 +715,7 @@ SvXMLStylesContext *SdXMLImport::CreateStylesContext(const OUString& rLocalName, return GetShapeImport()->GetStylesContext(); GetShapeImport()->SetStylesContext(new SdXMLStylesContext( - *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, sal_False)); + *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, false)); return GetShapeImport()->GetStylesContext(); } @@ -727,7 +727,7 @@ SvXMLStylesContext *SdXMLImport::CreateAutoStylesContext(const OUString& rLocalN return GetShapeImport()->GetAutoStylesContext(); GetShapeImport()->SetAutoStylesContext(new SdXMLStylesContext( - *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, sal_True)); + *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, true)); return GetShapeImport()->GetAutoStylesContext(); } @@ -904,7 +904,7 @@ void SdXMLImport::AddFooterDecl( const OUString& rName, const OUString& rText ) maFooterDeclsMap[rName] = rText; } -void SdXMLImport::AddDateTimeDecl( const OUString& rName, const OUString& rText, sal_Bool bFixed, const OUString& rDateTimeFormat ) +void SdXMLImport::AddDateTimeDecl( const OUString& rName, const OUString& rText, bool bFixed, const OUString& rDateTimeFormat ) { if( !rName.isEmpty() && (!rText.isEmpty() || !bFixed) ) { @@ -936,7 +936,7 @@ OUString SdXMLImport::GetFooterDecl( const OUString& rName ) const return aRet; } -OUString SdXMLImport::GetDateTimeDecl( const OUString& rName, sal_Bool& rbFixed, OUString& rDateTimeFormat ) +OUString SdXMLImport::GetDateTimeDecl( const OUString& rName, bool& rbFixed, OUString& rDateTimeFormat ) { DateTimeDeclContextImpl aDecl; diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 9870a48b2039..2f15ee467953 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -160,10 +160,10 @@ class SdXMLMasterStylesContext; struct DateTimeDeclContextImpl { OUString maStrText; - sal_Bool mbFixed; + bool mbFixed; OUString maStrDateTimeFormat; - DateTimeDeclContextImpl() : mbFixed(sal_True) {} + DateTimeDeclContextImpl() : mbFixed(true) {} }; typedef std::map<OUString, OUString> HeaderFooterDeclMap; @@ -196,9 +196,9 @@ class SdXMLImport: public SvXMLImport sal_Int32 mnNewPageCount; sal_Int32 mnNewMasterPageCount; - sal_Bool mbIsDraw; - sal_Bool mbLoadDoc; - sal_Bool mbPreview; + bool mbIsDraw; + bool mbLoadDoc; + bool mbPreview; DrawPageIdMap maDrawPageIds; @@ -221,7 +221,7 @@ public: SdXMLImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, OUString const & implementationName, - sal_Bool bIsDraw, sal_uInt16 nImportFlags ); + bool bIsDraw, sal_uInt16 nImportFlags ); virtual ~SdXMLImport() throw (); // XImporter @@ -254,7 +254,7 @@ public: const SdXMLMasterStylesContext* GetMasterStylesContext() const { return mpMasterStylesContext; } sal_uInt16 GetStyleFamilyMask() const { return mnStyleFamilyMask; } - sal_Bool IsStylesOnlyMode() const { return !mbLoadDoc; } + bool IsStylesOnlyMode() const { return !mbLoadDoc; } const SvXMLTokenMap& GetDocElemTokenMap(); const SvXMLTokenMap& GetBodyElemTokenMap(); @@ -282,22 +282,22 @@ public: com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getPageLayouts() const { return mxPageLayouts; } - sal_Bool IsDraw() const { return mbIsDraw; } - sal_Bool IsImpress() const { return !mbIsDraw; } + bool IsDraw() const { return mbIsDraw; } + bool IsImpress() const { return !mbIsDraw; } // #80365# virtual void SetStatistics( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) SAL_OVERRIDE; - sal_Bool IsPreview() const { return mbPreview; } + bool IsPreview() const { return mbPreview; } void AddHeaderDecl( const OUString& rName, const OUString& rText ); void AddFooterDecl( const OUString& rName, const OUString& rText ); - void AddDateTimeDecl( const OUString& rName, const OUString& rText, sal_Bool bFixed, const OUString& rDateTimeFormat ); + void AddDateTimeDecl( const OUString& rName, const OUString& rText, bool bFixed, const OUString& rDateTimeFormat ); OUString GetHeaderDecl( const OUString& rName ) const; OUString GetFooterDecl( const OUString& rName ) const; - OUString GetDateTimeDecl( const OUString& rName, sal_Bool& rbFixed, OUString& rDateTimeFormat ); + OUString GetDateTimeDecl( const OUString& rName, bool& rbFixed, OUString& rDateTimeFormat ); virtual void NotifyEmbeddedFontRead() SAL_OVERRIDE; }; diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 5b58920b8b49..e6492f25ca7c 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -211,7 +211,7 @@ uno::Reference< drawing::XShape > XMLShapeExport::checkForCustomShapeReplacement uno::Sequence< beans::PropertyValue > aPropValues( 2 ); aPropValues[ 0 ].Name = "CustomShape"; aPropValues[ 0 ].Value <<= xShape; - sal_Bool bForceGroupWithText = sal_True; + bool bForceGroupWithText = true; aPropValues[ 1 ].Name = "ForceGroupWithText"; aPropValues[ 1 ].Value <<= bForceGroupWithText; aArgument[ 0 ] <<= aPropValues; @@ -280,7 +280,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap const bool bObjSupportsStyle = aShapeInfo.meShapeType != XmlShapeTypeDrawGroupShape; - sal_Bool bIsEmptyPresObj = sal_False; + bool bIsEmptyPresObj = false; uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if ( aShapeInfo.xCustomShapeReplacement.is() ) @@ -709,8 +709,8 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape try { - sal_Bool bVisible = sal_True; - sal_Bool bPrintable = sal_True; + bool bVisible = true; + bool bPrintable = true; xSet->getPropertyValue(msVisible) >>= bVisible; xSet->getPropertyValue(msPrintable) >>= bPrintable; @@ -1228,7 +1228,7 @@ void XMLShapeExport::ExportGraphicDefaults() // construct PropertySetMapper UniReference< SvXMLExportPropertyMapper > xPropertySetMapper( CreateShapePropMapper( mrExport ) ); - ((XMLShapeExportPropertyMapper*)xPropertySetMapper.get())->SetAutoStyles( sal_False ); + ((XMLShapeExportPropertyMapper*)xPropertySetMapper.get())->SetAutoStyles( false ); // chain text attributes xPropertySetMapper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(mrExport)); @@ -1391,7 +1391,7 @@ void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTR mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_HEIGHT, aStr); // decide if transformation is necessary - sal_Bool bTransformationIsNecessary(fTRShear != 0.0 || fTRRotate != 0.0); + bool bTransformationIsNecessary(fTRShear != 0.0 || fTRRotate != 0.0); if(bTransformationIsNecessary) { @@ -1448,7 +1448,7 @@ bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< bean { uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() ); - sal_Bool bTemp = false; + bool bTemp = false; // is empty pes shape? if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName("IsEmptyPresentationObject")) @@ -1515,7 +1515,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x presentation::AnimationEffect eEffect = presentation::AnimationEffect_NONE; presentation::AnimationSpeed eSpeed = presentation::AnimationSpeed_SLOW; OUString aStrSoundURL; - sal_Bool bPlayFull = false; + bool bPlayFull = false; sal_Int32 nVerb = 0; OUString aStrMacro; OUString aStrLibrary; @@ -1818,8 +1818,8 @@ void XMLShapeExport::ImpExportTextBoxShape( uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() ); // presentation attribute (if presentation) - sal_Bool bIsPresShape(sal_False); - sal_Bool bIsEmptyPresObj(sal_False); + bool bIsPresShape(false); + bool bIsEmptyPresObj(false); OUString aStr; switch(eShapeType) @@ -1827,49 +1827,49 @@ void XMLShapeExport::ImpExportTextBoxShape( case XmlShapeTypePresSubtitleShape: { aStr = GetXMLToken(XML_PRESENTATION_SUBTITLE); - bIsPresShape = sal_True; + bIsPresShape = true; break; } case XmlShapeTypePresTitleTextShape: { aStr = GetXMLToken(XML_PRESENTATION_TITLE); - bIsPresShape = sal_True; + bIsPresShape = true; break; } case XmlShapeTypePresOutlinerShape: { aStr = GetXMLToken(XML_PRESENTATION_OUTLINE); - bIsPresShape = sal_True; + bIsPresShape = true; break; } case XmlShapeTypePresNotesShape: { aStr = GetXMLToken(XML_PRESENTATION_NOTES); - bIsPresShape = sal_True; + bIsPresShape = true; break; } case XmlShapeTypePresHeaderShape: { aStr = GetXMLToken(XML_HEADER); - bIsPresShape = sal_True; + bIsPresShape = true; break; } case XmlShapeTypePresFooterShape: { aStr = GetXMLToken(XML_FOOTER); - bIsPresShape = sal_True; + bIsPresShape = true; break; } case XmlShapeTypePresSlideNumberShape: { aStr = GetXMLToken(XML_PAGE_NUMBER); - bIsPresShape = sal_True; + bIsPresShape = true; break; } case XmlShapeTypePresDateTimeShape: { aStr = GetXMLToken(XML_DATE_TIME); - bIsPresShape = sal_True; + bIsPresShape = true; break; } default: @@ -2065,7 +2065,7 @@ void XMLShapeExport::ImpExportEllipseShape( awt::Size aSize = xShape->getSize(); sal_Int32 nRx((aSize.Width + 1) / 2); sal_Int32 nRy((aSize.Height + 1) / 2); - sal_Bool bCircle(nRx == nRy); + bool bCircle(nRx == nRy); // Transformation ImpExportNewTrans(xPropSet, nFeatures, pRefPoint); @@ -2118,7 +2118,7 @@ void XMLShapeExport::ImpExportPolygonShape( const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if(xPropSet.is()) { - sal_Bool bBezier(eShapeType == XmlShapeTypeDrawClosedBezierShape + bool bBezier(eShapeType == XmlShapeTypeDrawClosedBezierShape || eShapeType == XmlShapeTypeDrawOpenBezierShape); // get matrix @@ -2141,7 +2141,7 @@ void XMLShapeExport::ImpExportPolygonShape( SdXMLImExViewBox aViewBox(0, 0, aSize.Width, aSize.Height); mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString()); - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# // prepare name (with most used) enum ::xmloff::token::XMLTokenEnum eName(XML_PATH); @@ -2225,7 +2225,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY); if(xPropSet.is()) { - sal_Bool bIsEmptyPresObj = sal_False; + bool bIsEmptyPresObj = false; uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() ); // Transformation @@ -2718,7 +2718,7 @@ void XMLShapeExport::ImpExportOLE2Shape( // Transformation ImpExportNewTrans(xPropSet, nFeatures, pRefPoint); - sal_Bool bIsEmptyPresObj = sal_False; + bool bIsEmptyPresObj = false; // presentation settings if(eShapeType == XmlShapeTypePresOLE2Shape) @@ -2729,7 +2729,7 @@ void XMLShapeExport::ImpExportOLE2Shape( bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_TABLE) ); bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# - sal_Bool bExportEmbedded(0 != (mrExport.getExportFlags() & EXPORT_EMBEDDED)); + bool bExportEmbedded(0 != (mrExport.getExportFlags() & EXPORT_EMBEDDED)); OUString sPersistName; SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW, XML_FRAME, bCreateNewline, true ); @@ -2745,7 +2745,7 @@ void XMLShapeExport::ImpExportOLE2Shape( OUString sClassId; OUString sURL; - sal_Bool bInternal = false; + bool bInternal = false; xPropSet->getPropertyValue("IsInternal") >>= bInternal; if( !bIsEmptyPresObj ) @@ -2930,7 +2930,7 @@ void XMLShapeExport::ImpExportCaptionShape( // write Caption shape. Add export later. bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# - sal_Bool bAnnotation( (nFeatures & SEF_EXPORT_ANNOTATION) == SEF_EXPORT_ANNOTATION ); + bool bAnnotation( (nFeatures & SEF_EXPORT_ANNOTATION) == SEF_EXPORT_ANNOTATION ); SvXMLElementExport aObj( mrExport, (bAnnotation ? XML_NAMESPACE_OFFICE @@ -3013,7 +3013,7 @@ void XMLShapeExport::ImpExportAppletShape( mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CODE, aStr ); // export draw:may-script - sal_Bool bIsScript = false; + bool bIsScript = false; xPropSet->getPropertyValue("AppletIsScript") >>= bIsScript; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MAY_SCRIPT, bIsScript ? XML_TRUE : XML_FALSE ); @@ -3245,14 +3245,14 @@ void XMLShapeExport::ImpExportMediaShape( // export parameters const OUString aFalseStr( "false" ), aTrueStr( "true" ); - sal_Bool bLoop = false; + bool bLoop = false; const OUString aLoopStr( "Loop" ); xPropSet->getPropertyValue( aLoopStr ) >>= bLoop; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aLoopStr ); mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, bLoop ? aTrueStr : aFalseStr ); delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ) ); - sal_Bool bMute = false; + bool bMute = false; const OUString aMuteStr( "Mute" ); xPropSet->getPropertyValue( aMuteStr ) >>= bMute; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aMuteStr ); @@ -3310,7 +3310,7 @@ void XMLShapeExport::ImpExport3DSceneShape( const uno::Reference< drawing::XShap export3DSceneAttributes( xPropSet ); // write 3DScene shape - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# + bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# SvXMLElementExport aOBJ( mrExport, XML_NAMESPACE_DR3D, XML_SCENE, bCreateNewline, true); ImpExportDescription( xShape ); // #i68101# @@ -3607,7 +3607,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen // lightingMode aAny = xPropSet->getPropertyValue("D3DSceneTwoSidedLighting"); - sal_Bool bTwoSidedLighting = false; + bool bTwoSidedLighting = false; aAny >>= bTwoSidedLighting; ::sax::Converter::convertBool(sStringBuffer, bTwoSidedLighting); aStr = sStringBuffer.makeStringAndClear(); @@ -3629,7 +3629,7 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s OUString aIndexStr; ::basegfx::B3DVector aLightDirection; drawing::Direction3D xLightDir; - sal_Bool bLightOnOff = false; + bool bLightOnOff = false; for(sal_Int32 nLamp = 1; nLamp <= 8; nLamp++) { aIndexStr = OUString::number( nLamp ); @@ -3772,7 +3772,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert for ( i = 0; i < nElements; i++ ) { - sal_Bool bPosition = sal_False; + bool bPosition = false; const uno::Sequence< beans::PropertyValue >& rPropSeq = rHandles[ i ]; for ( j = 0; j < (sal_uInt32)rPropSeq.getLength(); j++ ) { @@ -3788,13 +3788,13 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert ExportParameter( aStrBuffer, aPosition.Second ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_HANDLE_POSITION, aStr ); - bPosition = sal_True; + bPosition = true; } } break; case EAS_MirroredX : { - sal_Bool bMirroredX = sal_Bool(); + bool bMirroredX; if ( rPropVal.Value >>= bMirroredX ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_HANDLE_MIRROR_HORIZONTAL, bMirroredX ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -3802,7 +3802,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_MirroredY : { - sal_Bool bMirroredY = sal_Bool(); + bool bMirroredY; if ( rPropVal.Value >>= bMirroredY ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_HANDLE_MIRROR_VERTICAL, bMirroredY ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -3810,7 +3810,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert break; case EAS_Switched : { - sal_Bool bSwitched = sal_Bool(); + bool bSwitched; if ( rPropVal.Value >>= bSwitched ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_HANDLE_SWITCHED, bSwitched ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -3920,7 +3920,7 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, sal_Int32 nCoords = rCoordinates.getLength(); sal_Int32 nSegments = rSegments.getLength(); - sal_Bool bSimpleSegments = nSegments == 0; + bool bSimpleSegments = nSegments == 0; if ( bSimpleSegments ) nSegments = 4; for ( j = i = 0; j < nSegments; j++ ) @@ -4068,13 +4068,13 @@ void ImpExportEnhancedPath( SvXMLExport& rExport, void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< beans::XPropertySet >& xPropSet ) { - sal_Bool bEquations = sal_False; + bool bEquations = false; uno::Sequence< OUString > aEquations; - sal_Bool bHandles = sal_False; + bool bHandles = false; uno::Sequence< beans::PropertyValues > aHandles; - sal_Bool bCoordinates = sal_False; + bool bCoordinates = false; uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > aSegments; uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > aCoordinates; @@ -4111,7 +4111,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_MirroredX : { - sal_Bool bMirroredX = sal_Bool(); + bool bMirroredX; if ( rGeoProp.Value >>= bMirroredX ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIRROR_HORIZONTAL, bMirroredX ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4119,7 +4119,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_MirroredY : { - sal_Bool bMirroredY = sal_Bool(); + bool bMirroredY; if ( rGeoProp.Value >>= bMirroredY ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIRROR_VERTICAL, bMirroredY ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4160,7 +4160,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean { case EAS_Extrusion : { - sal_Bool bExtrusionOn = sal_Bool(); + bool bExtrusionOn; if ( rProp.Value >>= bExtrusionOn ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION, bExtrusionOn ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4225,7 +4225,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_LightFace : { - sal_Bool bExtrusionLightFace = sal_Bool(); + bool bExtrusionLightFace; if ( rProp.Value >>= bExtrusionLightFace ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_LIGHT_FACE, bExtrusionLightFace ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4233,7 +4233,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_FirstLightHarsh : { - sal_Bool bExtrusionFirstLightHarsh = sal_Bool(); + bool bExtrusionFirstLightHarsh; if ( rProp.Value >>= bExtrusionFirstLightHarsh ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_FIRST_LIGHT_HARSH, bExtrusionFirstLightHarsh ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4241,7 +4241,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_SecondLightHarsh : { - sal_Bool bExtrusionSecondLightHarsh = sal_Bool(); + bool bExtrusionSecondLightHarsh; if ( rProp.Value >>= bExtrusionSecondLightHarsh ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_SECOND_LIGHT_HARSH, bExtrusionSecondLightHarsh ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4309,7 +4309,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_Metal : { - sal_Bool bExtrusionMetal = sal_Bool(); + bool bExtrusionMetal; if ( rProp.Value >>= bExtrusionMetal ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_METAL, bExtrusionMetal ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4442,7 +4442,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_Color : { - sal_Bool bExtrusionColor = sal_Bool(); + bool bExtrusionColor; if ( rProp.Value >>= bExtrusionColor ) { rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_COLOR, @@ -4470,7 +4470,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean { case EAS_TextPath : { - sal_Bool bTextPathOn = sal_Bool(); + bool bTextPathOn; if ( rProp.Value >>= bTextPathOn ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_TEXT_PATH, bTextPathOn ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4496,7 +4496,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_ScaleX : { - sal_Bool bScaleX = sal_Bool(); + bool bScaleX; if ( rProp.Value >>= bScaleX ) { aStr = bScaleX ? GetXMLToken( XML_SHAPE ) : GetXMLToken( XML_PATH ); @@ -4506,7 +4506,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_SameLetterHeights : { - sal_Bool bSameLetterHeights = sal_Bool(); + bool bSameLetterHeights; if ( rProp.Value >>= bSameLetterHeights ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_TEXT_PATH_SAME_LETTER_HEIGHTS, bSameLetterHeights ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4550,7 +4550,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_ExtrusionAllowed : { - sal_Bool bExtrusionAllowed = sal_Bool(); + bool bExtrusionAllowed; if ( rProp.Value >>= bExtrusionAllowed ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_ALLOWED, bExtrusionAllowed ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4558,7 +4558,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_ConcentricGradientFillAllowed : { - sal_Bool bConcentricGradientFillAllowed = sal_Bool(); + bool bConcentricGradientFillAllowed; if ( rProp.Value >>= bConcentricGradientFillAllowed ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CONCENTRIC_GRADIENT_FILL_ALLOWED, bConcentricGradientFillAllowed ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4566,7 +4566,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean break; case EAS_TextPathAllowed : { - sal_Bool bTextPathAllowed = sal_Bool(); + bool bTextPathAllowed; if ( rProp.Value >>= bTextPathAllowed ) rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_TEXT_PATH_ALLOWED, bTextPathAllowed ? GetXMLToken( XML_TRUE ) : GetXMLToken( XML_FALSE ) ); @@ -4776,7 +4776,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape // Transformation ImpExportNewTrans(xPropSet, nFeatures, pRefPoint); - sal_Bool bIsEmptyPresObj = sal_False; + bool bIsEmptyPresObj = false; // presentation settings if(eShapeType == XmlShapeTypePresTableShape) @@ -4804,7 +4804,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape { try { - sal_Bool bBool = sal_False; + bool bBool = false; const OUString sAPIPropertyName( pEntry->msApiName, pEntry->nApiNameLength, RTL_TEXTENCODING_ASCII_US ); xPropSet->getPropertyValue( sAPIPropertyName ) >>= bBool; diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 5d5521c8a325..e31f8c33c2d2 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -418,31 +418,31 @@ SvXMLShapeContext* XMLShapeImportHelper::Create3DSceneChildContext( case XML_TOK_3DSCENE_3DSCENE: { // dr3d:3dscene inside dr3d:3dscene context - pContext = new SdXML3DSceneShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False); + pContext = new SdXML3DSceneShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false); break; } case XML_TOK_3DSCENE_3DCUBE: { // dr3d:3dcube inside dr3d:3dscene context - pContext = new SdXML3DCubeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False); + pContext = new SdXML3DCubeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false); break; } case XML_TOK_3DSCENE_3DSPHERE: { // dr3d:3dsphere inside dr3d:3dscene context - pContext = new SdXML3DSphereObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False); + pContext = new SdXML3DSphereObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false); break; } case XML_TOK_3DSCENE_3DLATHE: { // dr3d:3dlathe inside dr3d:3dscene context - pContext = new SdXML3DLatheObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False); + pContext = new SdXML3DLatheObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false); break; } case XML_TOK_3DSCENE_3DEXTRUDE: { // dr3d:3dextrude inside dr3d:3dscene context - pContext = new SdXML3DExtrudeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False); + pContext = new SdXML3DExtrudeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false); break; } } @@ -583,7 +583,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext( case XML_TOK_GROUP_CUSTOM_SHAPE: { // draw:customshape - pContext = new SdXMLCustomShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False ); + pContext = new SdXMLCustomShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false ); break; } case XML_TOK_GROUP_A: @@ -632,20 +632,20 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext( case XML_TOK_FRAME_TEXT_BOX: { // text:text-box inside group context - pContext = new SdXMLTextBoxShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False ); + pContext = new SdXMLTextBoxShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false ); break; } case XML_TOK_FRAME_IMAGE: { // office:image inside group context - pContext = new SdXMLGraphicObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False ); + pContext = new SdXMLGraphicObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false ); break; } case XML_TOK_FRAME_OBJECT: case XML_TOK_FRAME_OBJECT_OLE: { // draw:object or draw:object_ole - pContext = new SdXMLObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False ); + pContext = new SdXMLObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false ); break; } case XML_TOK_FRAME_TABLE: @@ -659,19 +659,19 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext( case XML_TOK_FRAME_PLUGIN: { // draw:plugin - pContext = new SdXMLPluginShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False ); + pContext = new SdXMLPluginShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false ); break; } case XML_TOK_FRAME_FLOATING_FRAME: { // draw:floating-frame - pContext = new SdXMLFloatingFrameShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False ); + pContext = new SdXMLFloatingFrameShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false ); break; } case XML_TOK_FRAME_APPLET: { // draw:applet - pContext = new SdXMLAppletShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, sal_False ); + pContext = new SdXMLAppletShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false ); break; } // add other shapes here... diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 4d7f7a1b35bb..e5d5d9ec4d6b 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -45,9 +45,9 @@ SdXML3DObjectContext::SdXML3DObjectContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), - mbSetTransform( sal_False ) + mbSetTransform( false ) { sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -112,12 +112,12 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), maMinEdge(-2500.0, -2500.0, -2500.0), maMaxEdge(2500.0, 2500.0, 2500.0), - mbMinEdgeUsed(sal_False), - mbMaxEdgeUsed(sal_False) + mbMinEdgeUsed(false), + mbMaxEdgeUsed(false) { sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -138,7 +138,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext( if(aNewVec != maMinEdge) { maMinEdge = aNewVec; - mbMinEdgeUsed = sal_True; + mbMinEdgeUsed = true; } break; } @@ -150,7 +150,7 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext( if(aNewVec != maMaxEdge) { maMaxEdge = aNewVec; - mbMaxEdgeUsed = sal_True; + mbMaxEdgeUsed = true; } break; } @@ -214,12 +214,12 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), maCenter(0.0, 0.0, 0.0), maSize(5000.0, 5000.0, 5000.0), - mbCenterUsed(sal_False), - mbSizeUsed(sal_False) + mbCenterUsed(false), + mbSizeUsed(false) { sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -240,7 +240,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext( if(aNewVec != maCenter) { maCenter = aNewVec; - mbCenterUsed = sal_True; + mbCenterUsed = true; } break; } @@ -252,7 +252,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext( if(aNewVec != maSize) { maSize = aNewVec; - mbSizeUsed = sal_True; + mbSizeUsed = true; } break; } @@ -313,7 +313,7 @@ SdXML3DPolygonBasedShapeContext::SdXML3DPolygonBasedShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; @@ -400,7 +400,7 @@ SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } @@ -435,7 +435,7 @@ SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx index 6a25e553cb9c..b7cafd9602fa 100644 --- a/xmloff/source/draw/ximp3dobject.hxx +++ b/xmloff/source/draw/ximp3dobject.hxx @@ -38,7 +38,7 @@ protected: // the shape group this object should be created inside com::sun::star::drawing::HomogenMatrix mxHomMat; - sal_Bool mbSetTransform; + bool mbSetTransform; public: TYPEINFO_OVERRIDE(); @@ -48,7 +48,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXML3DObjectContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -61,8 +61,8 @@ class SdXML3DCubeObjectShapeContext : public SdXML3DObjectContext { ::basegfx::B3DVector maMinEdge; ::basegfx::B3DVector maMaxEdge; - sal_Bool mbMinEdgeUsed; - sal_Bool mbMaxEdgeUsed; + bool mbMinEdgeUsed; + bool mbMaxEdgeUsed; public: TYPEINFO_OVERRIDE(); @@ -71,7 +71,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXML3DCubeObjectShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -84,8 +84,8 @@ class SdXML3DSphereObjectShapeContext : public SdXML3DObjectContext { ::basegfx::B3DVector maCenter; ::basegfx::B3DVector maSize; - sal_Bool mbCenterUsed; - sal_Bool mbSizeUsed; + bool mbCenterUsed; + bool mbSizeUsed; public: TYPEINFO_OVERRIDE(); @@ -94,7 +94,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXML3DSphereObjectShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -115,7 +115,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXML3DPolygonBasedShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -133,7 +133,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXML3DLatheObjectShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -151,7 +151,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXML3DExtrudeObjectShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 7465fa308056..b3e5953a0cb8 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -93,7 +93,7 @@ SdXML3DSceneShapeContext::SdXML3DSceneShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShapes) + bool bTemporaryShapes) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShapes ), SdXML3DSceneAttributesHelper( rImport ) { } diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index aa5d3d1e36dd..bbdfac75c363 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -51,7 +51,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXML3DSceneShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index 825020050723..530fa8758203 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -150,7 +150,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, if(xDrawPage.is() && xMasterPages.is()) { - sal_Bool bDone(sal_False); + bool bDone(false); OUString sDisplayName( rImport.GetStyleDisplayName( XML_STYLE_FAMILY_MASTER_PAGE, maMasterPageName ) ); @@ -169,7 +169,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, if(!sMasterPageName.isEmpty() && sMasterPageName.equals(sDisplayName)) { xDrawPage->setMasterPage(xMasterPage); - bDone = sal_True; + bDone = true; } } } diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index dc4e2f7ca0db..c3938c0de476 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -171,7 +171,7 @@ void GetB3DVector( std::vector< com::sun::star::beans::PropertyValue >& rDest, } } -sal_Bool GetEquationName( const OUString& rEquation, const sal_Int32 nStart, OUString& rEquationName ) +bool GetEquationName( const OUString& rEquation, const sal_Int32 nStart, OUString& rEquationName ) { sal_Int32 nIndex = nStart; while( nIndex < rEquation.getLength() ) @@ -188,32 +188,32 @@ sal_Bool GetEquationName( const OUString& rEquation, const sal_Int32 nStart, OUS else break; } - sal_Bool bValid = ( nIndex - nStart ) != 0; + bool bValid = ( nIndex - nStart ) != 0; if ( bValid ) rEquationName = rEquation.copy( nStart, nIndex - nStart ); return bValid; } -sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32& nIndex, const OUString& rParaString ) +bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32& nIndex, const OUString& rParaString ) { if ( nIndex >= rParaString.getLength() ) - return sal_False; + return false; - sal_Bool bValid = sal_True; - sal_Bool bNumberRequired = sal_True; - sal_Bool bMustBePositiveWholeNumbered = sal_False; + bool bValid = true; + bool bNumberRequired = true; + bool bMustBePositiveWholeNumbered = false; rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL; if ( rParaString[ nIndex ] == '$' ) { rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT; - bMustBePositiveWholeNumbered = sal_True; + bMustBePositiveWholeNumbered = true; nIndex++; } else if ( rParaString[ nIndex ] == '?' ) { nIndex++; - bNumberRequired = sal_False; + bNumberRequired = false; OUString aEquationName; bValid = GetEquationName( rParaString, nIndex, aEquationName ); if ( bValid ) @@ -225,7 +225,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter } else if ( rParaString[ nIndex ] > '9' ) { - bNumberRequired = sal_False; + bNumberRequired = false; if ( rParaString.matchIgnoreAsciiCaseAsciiL( "left", 4, nIndex ) ) { rParameter.Type = com::sun::star::drawing::EnhancedCustomShapeParameterType::LEFT; @@ -287,7 +287,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter nIndex += 9; } else - bValid = sal_False; + bValid = false; } if ( bValid ) { @@ -296,10 +296,10 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter sal_Int32 nStartIndex = nIndex; sal_Int32 nEIndex = 0; // index of "E" in double - sal_Bool bE = sal_False; // set if a double is including a "E" statement - sal_Bool bENum = sal_False; // there is at least one number after "E" - sal_Bool bDot = sal_False; // set if there is a dot included - sal_Bool bEnd = sal_False; // set for each value that can not be part of a double/integer + bool bE = false; // set if a double is including a "E" statement + bool bENum = false; // there is at least one number after "E" + bool bDot = false; // set if there is a dot included + bool bEnd = false; // set for each value that can not be part of a double/integer while( ( nIndex < rParaString.getLength() ) && bValid ) { @@ -308,32 +308,32 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter case '.' : { if ( bMustBePositiveWholeNumbered ) - bValid = sal_False; + bValid = false; else { if ( bDot ) - bValid = sal_False; + bValid = false; else - bDot = sal_True; + bDot = true; } } break; case '-' : { if ( bMustBePositiveWholeNumbered ) - bValid = sal_False; + bValid = false; else { if ( nStartIndex == nIndex ) - bValid = sal_True; + bValid = true; else if ( bE ) { if ( nEIndex + 1 == nIndex ) - bValid = sal_True; + bValid = true; else if ( bENum ) - bEnd = sal_True; + bEnd = true; else - bValid = sal_False; + bValid = false; } } } @@ -343,16 +343,16 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter case 'E' : { if ( bMustBePositiveWholeNumbered ) - bEnd = sal_True; + bEnd = true; else { if ( !bE ) { - bE = sal_True; + bE = true; nEIndex = nIndex; } else - bEnd = sal_True; + bEnd = true; } } break; @@ -368,11 +368,11 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter case '9' : { if ( bE && ! bENum ) - bENum = sal_True; + bENum = true; } break; default: - bEnd = sal_True; + bEnd = true; } if ( !bEnd ) nIndex++; @@ -380,7 +380,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter break; } if ( nIndex == nStartIndex ) - bValid = sal_False; + bValid = false; if ( bValid ) { OUString aNumber( rParaString.copy( nStartIndex, nIndex - nStartIndex ) ); @@ -390,7 +390,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter if (::sax::Converter::convertDouble(fAttrDouble, aNumber)) rParameter.Value <<= fAttrDouble; else - bValid = sal_False; + bValid = false; } else { @@ -398,7 +398,7 @@ sal_Bool GetNextParameter( com::sun::star::drawing::EnhancedCustomShapeParameter if (::sax::Converter::convertNumber(nValue, aNumber)) rParameter.Value <<= nValue; else - bValid = sal_False; + bValid = false; } } } @@ -613,7 +613,7 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest sal_Int32 nParametersNeeded = 1; sal_Int16 nLatestSegmentCommand = com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::MOVETO; - sal_Bool bValid = sal_True; + bool bValid = true; while( bValid && ( nIndex < rValue.getLength() ) ) { @@ -795,7 +795,7 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest nParameterCount++; } else - bValid = sal_False; + bValid = false; } break; default: @@ -1171,7 +1171,7 @@ void XMLEnhancedCustomShapeContext::StartElement( const uno::Reference< xml::sax break; case EAS_text_path_scale : { - sal_Bool bScaleX = IsXMLToken( rValue, XML_SHAPE ); + bool bScaleX = IsXMLToken( rValue, XML_SHAPE ); beans::PropertyValue aProp; aProp.Name = EASGet( EAS_ScaleX ); aProp.Value <<= bScaleX; diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx index 895a35d7abb5..d97d3499eed6 100644 --- a/xmloff/source/draw/ximpgrp.cxx +++ b/xmloff/source/draw/ximpgrp.cxx @@ -34,7 +34,7 @@ SdXMLGroupShapeContext::SdXMLGroupShapeContext( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx index 4456122eaa45..bf69293fec7f 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -44,7 +44,7 @@ public: SdXMLGroupShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLGroupShapeContext(); virtual SvXMLImportContext *CreateChildContext( diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 932b43e9c54b..c680f7aded6c 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -303,7 +303,7 @@ void SdXMLGenericPageContext::EndElement() const OUString aStrDateTimeTextProp( "DateTimeText" ); if( xInfo->hasPropertyByName( aStrDateTimeTextProp ) ) { - sal_Bool bFixed; + bool bFixed; OUString aDateTimeFormat; const OUString aText( GetSdImport().GetDateTimeDecl( maUseDateTimeDeclName, bFixed, aDateTimeFormat ) ); diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 902c1799ed43..ce27251c3429 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -139,16 +139,16 @@ SdXMLShapeContext::SdXMLShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SvXMLShapeContext( rImport, nPrfx, rLocalName, bTemporaryShape ) , mxShapes( rShapes ) , mxAttrList(xAttrList) , mbListContextPushed( false ) , mnStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_ID) , mnClass(0) - , mbIsPlaceholder(sal_False) + , mbIsPlaceholder(false) , mbClearDefaultAttributes( true ) - , mbIsUserTransformed(sal_False) + , mbIsUserTransformed(false) , mnZOrder(-1) , maSize(1, 1) , mnRelWidth(0) @@ -616,13 +616,13 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) break; const SvXMLStyleContext* pStyle = 0L; - sal_Bool bAutoStyle(sal_False); + bool bAutoStyle(false); if(GetImport().GetShapeImport()->GetAutoStylesContext()) pStyle = GetImport().GetShapeImport()->GetAutoStylesContext()->FindStyleChildContext(mnStyleFamily, maDrawStyleName); if(pStyle) - bAutoStyle = sal_True; + bAutoStyle = true; if(!pStyle && GetImport().GetShapeImport()->GetStylesContext()) pStyle = GetImport().GetShapeImport()->GetStylesContext()->FindStyleChildContext(mnStyleFamily, maDrawStyleName); @@ -924,23 +924,23 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rL } } -sal_Bool SdXMLShapeContext::isPresentationShape() const +bool SdXMLShapeContext::isPresentationShape() const { if( !maPresentationClass.isEmpty() && (const_cast<SdXMLShapeContext*>(this))->GetImport().GetShapeImport()->IsPresentationShapesSupported() ) { if(XML_STYLE_FAMILY_SD_PRESENTATION_ID == mnStyleFamily) { - return sal_True; + return true; } if( IsXMLToken( maPresentationClass, XML_HEADER ) || IsXMLToken( maPresentationClass, XML_FOOTER ) || IsXMLToken( maPresentationClass, XML_PAGE_NUMBER ) || IsXMLToken( maPresentationClass, XML_DATE_TIME ) ) { - return sal_True; + return true; } } - return sal_False; + return false; } void SdXMLShapeContext::onDemandRescueUsefulDataFromTemporary( const SvXMLImportContext& rCandidate ) @@ -1018,7 +1018,7 @@ SdXMLRectShapeContext::SdXMLRectShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mnRadius( 0L ) { @@ -1084,7 +1084,7 @@ SdXMLLineShapeContext::SdXMLLineShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mnX1( 0L ), mnY1( 0L ), @@ -1201,7 +1201,7 @@ SdXMLEllipseShapeContext::SdXMLEllipseShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mnCX( 0L ), mnCY( 0L ), @@ -1335,7 +1335,7 @@ SdXMLPolygonShapeContext::SdXMLPolygonShapeContext( sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - uno::Reference< drawing::XShapes >& rShapes, sal_Bool bClosed, sal_Bool bTemporaryShape) + uno::Reference< drawing::XShapes >& rShapes, bool bClosed, bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mbClosed( bClosed ) { @@ -1445,7 +1445,7 @@ SdXMLPathShapeContext::SdXMLPathShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } @@ -1595,7 +1595,7 @@ SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mnRadius(0) { @@ -1624,7 +1624,7 @@ void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>&) { // create textbox shape - sal_Bool bIsPresShape = sal_False; + bool bIsPresShape = false; bool bClearText = false; OUString service; @@ -1678,7 +1678,7 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt // XmlShapeTypePresTitleTextShape service = "com.sun.star.presentation.TitleTextShape"; } - bIsPresShape = sal_True; + bIsPresShape = true; } } @@ -1761,7 +1761,7 @@ SdXMLControlShapeContext::SdXMLControlShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } @@ -1826,7 +1826,7 @@ SdXMLConnectorShapeContext::SdXMLConnectorShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), maStart(0,0), maEnd(1,1), @@ -1975,7 +1975,7 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA // For security reasons, do not add empty connectors. There may have been an error in EA2 // that created empty, far set off connectors (e.g. 63 meters below top of document). This // is not guaranteed, but it's definitely safe to not add empty connectors. - sal_Bool bDoAdd(sal_True); + bool bDoAdd(true); if( maStartShapeId.isEmpty() && maEndShapeId.isEmpty() @@ -1986,7 +1986,7 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA && 0 == mnDelta3 ) { - bDoAdd = sal_False; + bDoAdd = false; } if(bDoAdd) @@ -2094,7 +2094,7 @@ SdXMLMeasureShapeContext::SdXMLMeasureShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), maStart(0,0), maEnd(1,1) @@ -2206,7 +2206,7 @@ SdXMLPageShapeContext::SdXMLPageShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mnPageNumber(0) { mbClearDefaultAttributes = false; @@ -2238,11 +2238,11 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib // #86163# take into account which type of PageShape needs to // be constructed. It's an pres shape if presentation:XML_CLASS == XML_PRESENTATION_PAGE. - sal_Bool bIsPresentation = !maPresentationClass.isEmpty() && + bool bIsPresentation = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported(); uno::Reference< lang::XServiceInfo > xInfo( mxShapes, uno::UNO_QUERY ); - const sal_Bool bIsOnHandoutPage = xInfo.is() && xInfo->supportsService("com.sun.star.presentation.HandoutMasterPage"); + const bool bIsOnHandoutPage = xInfo.is() && xInfo->supportsService("com.sun.star.presentation.HandoutMasterPage"); if( bIsOnHandoutPage ) { @@ -2252,7 +2252,7 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib { if(bIsPresentation && !IsXMLToken( maPresentationClass, XML_PRESENTATION_PAGE ) ) { - bIsPresentation = sal_False; + bIsPresentation = false; } if(bIsPresentation) @@ -2294,7 +2294,7 @@ SdXMLCaptionShapeContext::SdXMLCaptionShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), // #86616# for correct edge rounding import mnRadius needs to be initialized mnRadius( 0L ) @@ -2322,7 +2322,7 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt // is the default setting, so the top left reference point that is used by the caption point is // no longer correct) There are two ways to solve this problem, temporarily disabling the // autogrowwith as we are doing here or to apply the CaptionPoint after setting text - sal_Bool bIsAutoGrowWidth = sal_False; + bool bIsAutoGrowWidth = false; if ( xProps.is() ) { uno::Any aAny( xProps->getPropertyValue("TextAutoGrowWidth") ); @@ -2395,7 +2395,7 @@ SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), maURL() { @@ -2561,7 +2561,7 @@ SdXMLChartShapeContext::SdXMLChartShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mpChartContext( NULL ) { @@ -2575,7 +2575,7 @@ SdXMLChartShapeContext::~SdXMLChartShapeContext() void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { - const sal_Bool bIsPresentation = isPresentationShape(); + const bool bIsPresentation = isPresentationShape(); AddShape( bIsPresentation @@ -2665,7 +2665,7 @@ SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } @@ -2692,7 +2692,7 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen OUString service("com.sun.star.drawing.OLE2Shape"); - sal_Bool bIsPresShape = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported(); + bool bIsPresShape = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported(); if( bIsPresShape ) { @@ -2880,9 +2880,9 @@ SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), - mbIsScript( sal_False ) + mbIsScript( false ) { } @@ -3042,7 +3042,7 @@ SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) : + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), mbMedia( false ) { @@ -3073,7 +3073,7 @@ void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Referen OUString service; - sal_Bool bIsPresShape = sal_False; + bool bIsPresShape = false; if( mbMedia ) { @@ -3217,14 +3217,14 @@ void SdXMLPluginShapeContext::EndElement() OUString aValueStr; maParams[ nParam ].Value >>= aValueStr; xProps->setPropertyValue("Loop", - uno::makeAny( static_cast< sal_Bool >( aValueStr.equalsAscii( "true" ) ) ) ); + uno::makeAny( aValueStr.equalsAscii( "true" ) ) ); } else if( rName.equalsAscii( "Mute" ) ) { OUString aValueStr; maParams[ nParam ].Value >>= aValueStr; xProps->setPropertyValue("Mute", - uno::makeAny( static_cast< sal_Bool >( aValueStr.equalsAscii( "true" ) ) ) ); + uno::makeAny( aValueStr.equalsAscii( "true" ) ) ); } else if( rName.equalsAscii( "VolumeDB" ) ) { @@ -3319,7 +3319,7 @@ SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rIm const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } @@ -3413,10 +3413,10 @@ SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), MultiImageImportHelper(), - mbSupportsReplacement( sal_False ), + mbSupportsReplacement( false ), mxImplContext(), mxReplImplContext() { @@ -3697,7 +3697,7 @@ SdXMLCustomShapeContext::SdXMLCustomShapeContext( const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape) + bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ) { } @@ -3877,7 +3877,7 @@ SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext( TYPEINIT1( SdXMLTableShapeContext, SdXMLShapeContext ); SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) -: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, sal_False ) +: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false ) { memset( &maTemplateStylesUsed, 0, sizeof( maTemplateStylesUsed ) ); } @@ -3890,7 +3890,7 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc { OUString service("com.sun.star.drawing.TableShape"); - sal_Bool bIsPresShape = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported(); + bool bIsPresShape = !maPresentationClass.isEmpty() && GetImport().GetShapeImport()->IsPresentationShapesSupported(); if( bIsPresShape ) { if( IsXMLToken( maPresentationClass, XML_PRESENTATION_TABLE ) ) diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 37ab20703fda..f3d4f90e38b3 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -60,9 +60,9 @@ protected: sal_uInt16 mnStyleFamily; sal_uInt16 mnClass; - sal_Bool mbIsPlaceholder; + bool mbIsPlaceholder; bool mbClearDefaultAttributes; - sal_Bool mbIsUserTransformed; + bool mbIsUserTransformed; sal_Int32 mnZOrder; OUString maShapeId; OUString maLayerName; @@ -96,7 +96,7 @@ protected: void addGluePoint( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); - sal_Bool isPresentationShape() const; + bool isPresentationShape() const; public: TYPEINFO_OVERRIDE(); @@ -106,7 +106,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -136,7 +136,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLRectShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -160,7 +160,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLLineShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -187,7 +187,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLEllipseShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -201,7 +201,7 @@ class SdXMLPolygonShapeContext : public SdXMLShapeContext { OUString maPoints; OUString maViewBox; - sal_Bool mbClosed; + bool mbClosed; public: TYPEINFO_OVERRIDE(); @@ -209,7 +209,7 @@ public: SdXMLPolygonShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bClosed, sal_Bool bTemporaryShape); + com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, bool bClosed, bool bTemporaryShape); virtual ~SdXMLPolygonShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -231,7 +231,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLPathShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -252,7 +252,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLTextBoxShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -274,7 +274,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLControlShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -310,7 +310,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLConnectorShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -333,7 +333,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLMeasureShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; virtual void EndElement() SAL_OVERRIDE; @@ -355,7 +355,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLPageShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -378,7 +378,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLCaptionShapeContext(); virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; @@ -401,7 +401,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLGraphicObjectShapeContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; @@ -426,7 +426,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLChartShapeContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; @@ -454,7 +454,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLObjectShapeContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; @@ -476,7 +476,7 @@ private: OUString maAppletName; OUString maAppletCode; OUString maHref; - sal_Bool mbIsScript; + bool mbIsScript; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; @@ -487,7 +487,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLAppletShapeContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; @@ -518,7 +518,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLPluginShapeContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; @@ -546,7 +546,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLFloatingFrameShapeContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE; @@ -561,7 +561,7 @@ public: class SdXMLFrameShapeContext : public SdXMLShapeContext, public MultiImageImportHelper { private: - sal_Bool mbSupportsReplacement; + bool mbSupportsReplacement; SvXMLImportContextRef mxImplContext; SvXMLImportContextRef mxReplImplContext; @@ -577,7 +577,7 @@ public: const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLFrameShapeContext(); virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -606,7 +606,7 @@ public: SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - sal_Bool bTemporaryShape); + bool bTemporaryShape); virtual ~SdXMLCustomShapeContext(); virtual void StartElement( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx index 055ccf3ef3f6..2cc993478da0 100644 --- a/xmloff/source/draw/ximpshow.cxx +++ b/xmloff/source/draw/ximpshow.cxx @@ -85,7 +85,7 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, c if( mpImpl->mxPresProps.is() ) { - sal_Bool bAll = sal_True; + bool bAll = true; uno::Any aAny; // read attributes @@ -104,12 +104,12 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, c { aAny <<= sValue; mpImpl->mxPresProps->setPropertyValue("FirstPage", aAny ); - bAll = sal_False; + bAll = false; } else if( IsXMLToken( aLocalName, XML_SHOW ) ) { mpImpl->maCustomShowName = sValue; - bAll = sal_False; + bAll = false; } else if( IsXMLToken( aLocalName, XML_PAUSE ) ) { diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 47fd843fd62a..5bb4e1dc27d3 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -790,7 +790,7 @@ SdXMLMasterPageContext::SdXMLMasterPageContext( uno::Reference< drawing::XShapes >& rShapes) : SdXMLGenericPageContext( rImport, nPrfx, rLName, xAttrList, rShapes ) { - const sal_Bool bHandoutMaster = IsXMLToken( rLName, XML_HANDOUT_MASTER ); + const bool bHandoutMaster = IsXMLToken( rLName, XML_HANDOUT_MASTER ); const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -959,7 +959,7 @@ SdXMLStylesContext::SdXMLStylesContext( sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList >& xAttrList, - sal_Bool bIsAutoStyle) + bool bIsAutoStyle) : SvXMLStylesContext(rImport, nPrfx, rLName, xAttrList), mbIsAutoStyle(bIsAutoStyle) { @@ -1273,7 +1273,7 @@ static bool canSkipReset(const OUString &rName, const XMLPropStyleContext* pProp bool bCanSkipReset = false; if (pPropStyle && rName == "TextAutoGrowHeight") { - sal_Bool bOldStyleTextAutoGrowHeight(sal_False); + bool bOldStyleTextAutoGrowHeight(false); rPropSet->getPropertyValue("TextAutoGrowHeight") >>= bOldStyleTextAutoGrowHeight; sal_Int32 nIndexStyle = rPrMap->GetEntryIndex(XML_NAMESPACE_DRAW, "auto-grow-height", 0); @@ -1286,7 +1286,7 @@ static bool canSkipReset(const OUString &rName, const XMLPropStyleContext* pProp sal_Int32 nIdx = property->mnIndex; if (nIdx == nIndexStyle) { - sal_Bool bNewStyleTextAutoGrowHeight(sal_False); + bool bNewStyleTextAutoGrowHeight(false); property->maValue >>= bNewStyleTextAutoGrowHeight; if (bNewStyleTextAutoGrowHeight == bOldStyleTextAutoGrowHeight) bCanSkipReset = true;; diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index 7ddd4ec0676c..2fcea98f1c64 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -188,7 +188,7 @@ public: class SdXMLStylesContext : public SvXMLStylesContext { UniReference< SvXMLImportPropertyMapper > xPresImpPropMapper; - sal_Bool mbIsAutoStyle; + bool mbIsAutoStyle; SvXMLNumFmtHelper* mpNumFmtHelper; SvNumberFormatter* mpNumFormatter; @@ -225,7 +225,7 @@ public: sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, - sal_Bool bIsAutoStyle); + bool bIsAutoStyle); virtual ~SdXMLStylesContext(); virtual sal_uInt16 GetFamily( const OUString& rFamily ) const SAL_OVERRIDE; @@ -280,7 +280,7 @@ private: OUString maStrName; OUString maStrText; OUString maStrDateTimeFormat; - sal_Bool mbFixed; + bool mbFixed; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSTYL_HXX |