diff options
author | Noel Grandin <noel@peralex.com> | 2014-05-02 08:38:50 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-05-02 08:49:23 +0200 |
commit | e23c98d713ababb72de0616831a2abe0e48387f5 (patch) | |
tree | faf799c4dad34949c7ac50f4ddad5b1d94bb2375 /reportdesign/inc | |
parent | 17dcf76ef87c15b8b83465a7c29b96dc2d05cde9 (diff) |
reportdesign: sal_Bool->bool
Change-Id: I7a269dbf163f4c839b6c553c7b096185fe2f8a01
Diffstat (limited to 'reportdesign/inc')
-rw-r--r-- | reportdesign/inc/PropertyForward.hxx | 4 | ||||
-rw-r--r-- | reportdesign/inc/ReportDefinition.hxx | 6 | ||||
-rw-r--r-- | reportdesign/inc/RptModel.hxx | 2 | ||||
-rw-r--r-- | reportdesign/inc/RptObject.hxx | 10 | ||||
-rw-r--r-- | reportdesign/inc/UndoActions.hxx | 14 | ||||
-rw-r--r-- | reportdesign/inc/UndoEnv.hxx | 10 |
6 files changed, 23 insertions, 23 deletions
diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx index 6ff443b74bc3..2cac870294a8 100644 --- a/reportdesign/inc/PropertyForward.hxx +++ b/reportdesign/inc/PropertyForward.hxx @@ -48,7 +48,7 @@ namespace rptui ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xSourceInfo; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDest; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xDestInfo; - sal_Bool m_bInChange; + bool m_bInChange; OPropertyMediator(OPropertyMediator&); void operator =(OPropertyMediator&); protected: @@ -61,7 +61,7 @@ namespace rptui OPropertyMediator(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSource ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDest ,const TPropertyNamePair& _aNameMap - ,sal_Bool _bReverse = sal_False); + ,bool _bReverse = false); // ::com::sun::star::beans::XPropertyChangeListener virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index 236d5c91457f..e7848d16f1a0 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -100,7 +100,7 @@ namespace reportdesign OReportDefinition& operator=(const OReportDefinition&); void setSection( const OUString& _sProperty - ,const sal_Bool& _bOn + ,const bool& _bOn ,const OUString& _sName ,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member); @@ -118,7 +118,7 @@ namespace reportdesign } /// write a single XML stream into the package - sal_Bool WriteThroughComponent( + bool WriteThroughComponent( /// the component we export const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> & xComponent, @@ -134,7 +134,7 @@ namespace reportdesign /// write a single output stream /// (to be called either directly or by WriteThroughComponent(...)) - sal_Bool WriteThroughComponent( + bool WriteThroughComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream> & xOutputStream, const ::com::sun::star::uno::Reference< diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index 40c48c06de9b..005f36a7fe4f 100644 --- a/reportdesign/inc/RptModel.hxx +++ b/reportdesign/inc/RptModel.hxx @@ -65,7 +65,7 @@ public: virtual SvxNumType GetPageNumType() const SAL_OVERRIDE; OXUndoEnvironment& GetUndoEnv(); - void SetModified(sal_Bool _bModified); + void SetModified(bool _bModified); inline dbaui::DBSubComponentController* getController() const { return m_pController; } inline void attachController( dbaui::DBSubComponentController& _rController ) { m_pController = &_rController; } diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 057dfb76d102..76a544f1a72d 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -83,14 +83,14 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xSection; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xKeepShapeAlive; OUString m_sComponentName; - sal_Bool m_bIsListening; + bool m_bIsListening; OObjectBase(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent); OObjectBase(const OUString& _sComponentName); virtual ~OObjectBase(); - inline sal_Bool isListening() const { return m_bIsListening; } + inline bool isListening() const { return m_bIsListening; } void SetPropsFromRect(const Rectangle& _rRect); @@ -109,12 +109,12 @@ private: public: void StartListening(); - void EndListening(sal_Bool bRemoveListener = sal_True); + void EndListening(bool bRemoveListener = true); // PropertyChangeListener virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException); virtual void initializeOle() {} - sal_Bool supportsService( const OUString& _sServiceName ) const; + bool supportsService( const OUString& _sServiceName ) const; ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> getReportComponent() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent(); @@ -261,7 +261,7 @@ public: /** creates the m_xMediator when it doesn't already exist. @param _bReverse when set to <TRUE/> then the properties from the uno control will be copied into report control */ - void CreateMediator(sal_Bool _bReverse = sal_False); + void CreateMediator(bool _bReverse = false); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent() SAL_OVERRIDE; diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index a2cf40252017..421442b0446d 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -73,8 +73,8 @@ namespace rptui inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getFooter() { return m_xGroup->getFooter(); } inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > getGroup() { return m_xGroup; } - inline sal_Bool getHeaderOn() { return m_xGroup->getHeaderOn(); } - inline sal_Bool getFooterOn() { return m_xGroup->getFooterOn(); } + inline bool getHeaderOn() { return m_xGroup->getHeaderOn(); } + inline bool getFooterOn() { return m_xGroup->getFooterOn(); } static ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OGroupHelper> getMemberFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); @@ -97,10 +97,10 @@ namespace rptui inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageFooter() { return m_xReport->getPageFooter(); } inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getDetail() { return m_xReport->getDetail(); } - inline sal_Bool getReportHeaderOn() { return m_xReport->getReportHeaderOn(); } - inline sal_Bool getReportFooterOn() { return m_xReport->getReportFooterOn(); } - inline sal_Bool getPageHeaderOn() { return m_xReport->getPageHeaderOn(); } - inline sal_Bool getPageFooterOn() { return m_xReport->getPageFooterOn(); } + inline bool getReportHeaderOn() { return m_xReport->getReportHeaderOn(); } + inline bool getReportFooterOn() { return m_xReport->getReportFooterOn(); } + inline bool getPageHeaderOn() { return m_xReport->getPageHeaderOn(); } + inline bool getPageFooterOn() { return m_xReport->getPageFooterOn(); } static ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> getMemberFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); }; @@ -255,7 +255,7 @@ namespace rptui * * \param _bOld If set to <TRUE/> than the old value will be set otherwise the new value will be set. */ - void setProperty(sal_Bool _bOld); + void setProperty(bool _bOld); protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getObject(); diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx index d087b303899f..4c0985053c83 100644 --- a/reportdesign/inc/UndoEnv.hxx +++ b/reportdesign/inc/UndoEnv.hxx @@ -48,7 +48,7 @@ namespace rptui protected: virtual ~OXUndoEnvironment(); - void SetUndoMode(sal_Bool _bUndo); + void SetUndoMode(bool _bUndo); public: OXUndoEnvironment(OReportModel& _rModel); @@ -77,21 +77,21 @@ namespace rptui :m_rUndoEnv(_rUndoEnv) { m_rUndoEnv.Lock(); - m_rUndoEnv.SetUndoMode(sal_True); + m_rUndoEnv.SetUndoMode(true); } ~OUndoMode() { - m_rUndoEnv.SetUndoMode(sal_False); + m_rUndoEnv.SetUndoMode(false); m_rUndoEnv.UnLock(); } }; void Lock(); void UnLock(); - sal_Bool IsLocked() const; + bool IsLocked() const; // returns sal_True is we are in UNDO - sal_Bool IsUndoMode() const; + bool IsUndoMode() const; // access control struct Accessor { friend class OReportModel; private: Accessor() { } }; |