diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-01 14:13:50 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-03 09:17:51 +0200 |
commit | f3802139ac6d21edbd1b30df9675eac1aae50360 (patch) | |
tree | 11fc28b6ead8a634989f3ecaa0769829083f8d5d /include/oox | |
parent | e8f4a2541bf5e38b953f04cee0e447a40d25950f (diff) |
oox: sal_Bool->bool
Change-Id: Ia05b3210314c39db5110eded731f2be4b7405e87
Diffstat (limited to 'include/oox')
-rw-r--r-- | include/oox/ppt/headerfooter.hxx | 16 | ||||
-rw-r--r-- | include/oox/ppt/pptshape.hxx | 6 | ||||
-rw-r--r-- | include/oox/ppt/presentationfragmenthandler.hxx | 2 | ||||
-rw-r--r-- | include/oox/ppt/slidepersist.hxx | 10 | ||||
-rw-r--r-- | include/oox/ppt/slidetransition.hxx | 12 | ||||
-rw-r--r-- | include/oox/ppt/slidetransitioncontext.hxx | 2 | ||||
-rw-r--r-- | include/oox/vml/vmlshape.hxx | 4 |
7 files changed, 26 insertions, 26 deletions
diff --git a/include/oox/ppt/headerfooter.hxx b/include/oox/ppt/headerfooter.hxx index 54720915f9cc..30a07195e0d7 100644 --- a/include/oox/ppt/headerfooter.hxx +++ b/include/oox/ppt/headerfooter.hxx @@ -26,16 +26,16 @@ namespace oox { namespace ppt { struct HeaderFooter { - sal_Bool mbSlideNumber; - sal_Bool mbHeader; - sal_Bool mbFooter; - sal_Bool mbDateTime; + bool mbSlideNumber; + bool mbHeader; + bool mbFooter; + bool mbDateTime; HeaderFooter() - : mbSlideNumber( sal_True ) - , mbHeader( sal_True ) - , mbFooter( sal_True ) - , mbDateTime( sal_True ) {}; + : mbSlideNumber( true ) + , mbHeader( true ) + , mbFooter( true ) + , mbDateTime( true ) {}; }; } } diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx index f9c1136ed5ff..41941fdec708 100644 --- a/include/oox/ppt/pptshape.hxx +++ b/include/oox/ppt/pptshape.hxx @@ -29,7 +29,7 @@ class PPTShape : public oox::drawingml::Shape { OUString msModelId; // fallback dgs smartart shape reference ShapeLocation meShapeLocation; // placeholdershapes (mnSubType != 0) on Master are never displayed - sal_Bool mbReferenced; // placeholdershapes on Layout are displayed only, if they are not referenced + bool mbReferenced; // placeholdershapes on Layout are displayed only, if they are not referenced // placeholdershapes on Slide are displayed always public: @@ -53,8 +53,8 @@ public: void setShapeLocation( const oox::ppt::ShapeLocation eShapeLocation ) { meShapeLocation = eShapeLocation; }; ShapeLocation getShapeLocation() const { return meShapeLocation; }; - sal_Bool isReferenced() const { return mbReferenced; }; - void setReferenced( sal_Bool bReferenced ){ mbReferenced = bReferenced; }; + bool isReferenced() const { return mbReferenced; }; + void setReferenced( bool bReferenced ){ mbReferenced = bReferenced; }; void setPlaceholder( oox::drawingml::ShapePtr pPlaceholder ) { mpPlaceholder = pPlaceholder; } void setModelId( const OUString& rId ) { msModelId = rId; } diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx index 362b90e09a9c..6158d27c67c2 100644 --- a/include/oox/ppt/presentationfragmenthandler.hxx +++ b/include/oox/ppt/presentationfragmenthandler.hxx @@ -49,7 +49,7 @@ protected: private: - void importSlide(sal_uInt32 nSlide, sal_Bool bFirstSlide, sal_Bool bImportNotes); + void importSlide(sal_uInt32 nSlide, bool bFirstSlide, bool bImportNotes); std::vector< OUString > maSlideMasterVector; std::vector< OUString > maSlidesVector; diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx index ed6e343ce92e..7eb4706e4684 100644 --- a/include/oox/ppt/slidepersist.hxx +++ b/include/oox/ppt/slidepersist.hxx @@ -56,7 +56,7 @@ class SlidePersist : public boost::enable_shared_from_this< SlidePersist > { public: - SlidePersist( oox::core::XmlFilterBase& rFilter, sal_Bool bMaster, sal_Bool bNotes, + SlidePersist( oox::core::XmlFilterBase& rFilter, bool bMaster, bool bNotes, const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >&, oox::drawingml::ShapePtr pShapesPtr, const ::oox::drawingml::TextListStylePtr & ); ~SlidePersist(); @@ -89,8 +89,8 @@ public: oox::drawingml::FillPropertiesPtr getBackgroundProperties() const { return mpBackgroundPropertiesPtr; } oox::drawingml::Color& getBackgroundColor() { return maBackgroundColor; } - sal_Bool isMasterPage() const { return mbMaster; } - sal_Bool isNotesPage() const { return mbNotes; } + bool isMasterPage() const { return mbMaster; } + bool isNotesPage() const { return mbNotes; } void setLayoutValueToken( sal_Int32 nLayoutValueToken ) { mnLayoutValueToken = nLayoutValueToken; } short getLayoutFromValueToken(); @@ -137,8 +137,8 @@ private: oox::ppt::HeaderFooter maHeaderFooter; sal_Int32 mnLayoutValueToken; - sal_Bool mbMaster; - sal_Bool mbNotes; + bool mbMaster; + bool mbNotes; oox::drawingml::TextListStylePtr maDefaultTextStylePtr; oox::drawingml::TextListStylePtr maTitleTextStylePtr; diff --git a/include/oox/ppt/slidetransition.hxx b/include/oox/ppt/slidetransition.hxx index 01f701d63dfe..1469ec30024a 100644 --- a/include/oox/ppt/slidetransition.hxx +++ b/include/oox/ppt/slidetransition.hxx @@ -41,27 +41,27 @@ namespace oox { namespace ppt { void setOoxTransitionSpeed( sal_Int32 nToken ); void setFadeColor( sal_Int32 nColor ) { mnFadeColor = nColor; } - void setMode( sal_Bool bMode ) + void setMode( bool bMode ) { mbMode = bMode; } - void setOoxAdvanceTime( sal_Int32 nAdvanceTime ) - { mnAdvanceTime = nAdvanceTime; } + void setOoxAdvanceTime( sal_Int32 nAdvanceTime ) + { mnAdvanceTime = nAdvanceTime; } static sal_Int16 ooxToOdpDirection( ::sal_Int32 nOoxType ); static sal_Int16 ooxToOdpEightDirections( ::sal_Int32 nOoxType ); static sal_Int16 ooxToOdpCornerDirections( ::sal_Int32 nOoxType ); static sal_Int16 ooxToOdpBorderDirections( ::sal_Int32 nOoxType ); static sal_Int16 ooxToOdpSideDirections( ::sal_Int32 nOoxType ); - static sal_Bool ooxToOdpSideDirectionsDirectionNormal( ::sal_Int32 nOoxType ); + static bool ooxToOdpSideDirectionsDirectionNormal( ::sal_Int32 nOoxType ); void setOoxTransitionType( ::sal_Int32 OoxType, ::sal_Int32 param1, ::sal_Int32 param2 ); private: ::sal_Int16 mnTransitionType; ::sal_Int16 mnTransitionSubType; - ::sal_Bool mbTransitionDirectionNormal; + bool mbTransitionDirectionNormal; ::sal_Int16 mnAnimationSpeed; ::sal_Int32 mnFadeColor; - ::sal_Bool mbMode; /**< http://api.libreoffice.org/docs/common/ref/com/sun/star/animations/XTransitionFilter.html Mode property */ + bool mbMode; /**< http://api.libreoffice.org/docs/common/ref/com/sun/star/animations/XTransitionFilter.html Mode property */ ::sal_Int32 mnAdvanceTime; }; diff --git a/include/oox/ppt/slidetransitioncontext.hxx b/include/oox/ppt/slidetransitioncontext.hxx index 9c5d840ab050..70749c928189 100644 --- a/include/oox/ppt/slidetransitioncontext.hxx +++ b/include/oox/ppt/slidetransitioncontext.hxx @@ -41,7 +41,7 @@ namespace oox { namespace ppt { private: PropertyMap& maSlideProperties; - ::sal_Bool mbHasTransition; + bool mbHasTransition; SlideTransition maTransition; }; diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index ac3df2f400f1..d38c58f25246 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -80,8 +80,8 @@ struct OOX_DLLPUBLIC ShapeTypeModel OUString maHeightRelative; ///< To what the height is relative OUString maRotation; ///< Rotation of the shape, in degrees. OUString maFlip; ///< Flip type of the shape (can be "x" or "y"). - sal_Bool mbAutoHeight; ///< If true, the height value is a minimum value (mostly used for textboxes) - sal_Bool mbVisible; ///< Visible or Hidden + bool mbAutoHeight; ///< If true, the height value is a minimum value (mostly used for textboxes) + bool mbVisible; ///< Visible or Hidden OUString maWrapStyle; ///< Wrapping mode for text. OUString maArcsize; ///< round rectangles arc size OUString maEditAs; ///< Edit As type (e.g. "canvas" etc) |