From 53984191169232c3ff097a4661e19532faa6bf67 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 22 Jan 2014 01:05:52 +0100 Subject: bool improvements Change-Id: I21f806d7a9ebe5b4de4cbedfc9879019cdbba22b --- reportdesign/source/core/api/Group.cxx | 4 ++-- reportdesign/source/core/api/ReportDefinition.cxx | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index b5d3ba72deab..ee640a09400f 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -134,7 +134,7 @@ void SAL_CALL OGroup::setSortAscending( ::sal_Bool _sortascending ) throw (uno:: // ----------------------------------------------------------------------------- void SAL_CALL OGroup::setHeaderOn( ::sal_Bool _headeron ) throw (uno::RuntimeException) { - if ( _headeron != m_xHeader.is() ) + if ( bool(_headeron) != m_xHeader.is() ) { OUString sName(RPT_RESSTRING(RID_STR_GROUP_HEADER,m_xContext->getServiceManager())); setSection(PROPERTY_HEADERON,_headeron,sName,m_xHeader); @@ -149,7 +149,7 @@ void SAL_CALL OGroup::setHeaderOn( ::sal_Bool _headeron ) throw (uno::RuntimeExc // ----------------------------------------------------------------------------- void SAL_CALL OGroup::setFooterOn( ::sal_Bool _footeron ) throw (uno::RuntimeException) { - if ( _footeron != m_xFooter.is() ) + if ( bool(_footeron) != m_xFooter.is() ) { OUString sName(RPT_RESSTRING(RID_STR_GROUP_FOOTER,m_xContext->getServiceManager())); setSection(PROPERTY_FOOTERON,_footeron,sName,m_xFooter); diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 9dd7ca6ba915..eee33f6c504a 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1007,7 +1007,7 @@ void SAL_CALL OReportDefinition::setEscapeProcessing( ::sal_Bool _escapeprocessi // ----------------------------------------------------------------------------- void SAL_CALL OReportDefinition::setReportHeaderOn( ::sal_Bool _reportheaderon ) throw (uno::RuntimeException) { - if ( _reportheaderon != m_pImpl->m_xReportHeader.is() ) + if ( bool(_reportheaderon) != m_pImpl->m_xReportHeader.is() ) { setSection(PROPERTY_REPORTHEADERON,_reportheaderon,RPT_RESSTRING(RID_STR_REPORT_HEADER,m_aProps->m_xContext->getServiceManager()),m_pImpl->m_xReportHeader); } @@ -1021,7 +1021,7 @@ void SAL_CALL OReportDefinition::setReportHeaderOn( ::sal_Bool _reportheaderon ) // ----------------------------------------------------------------------------- void SAL_CALL OReportDefinition::setReportFooterOn( ::sal_Bool _reportfooteron ) throw (uno::RuntimeException) { - if ( _reportfooteron != m_pImpl->m_xReportFooter.is() ) + if ( bool(_reportfooteron) != m_pImpl->m_xReportFooter.is() ) { setSection(PROPERTY_REPORTFOOTERON,_reportfooteron,RPT_RESSTRING(RID_STR_REPORT_FOOTER,m_aProps->m_xContext->getServiceManager()),m_pImpl->m_xReportFooter); } @@ -1035,7 +1035,7 @@ void SAL_CALL OReportDefinition::setReportFooterOn( ::sal_Bool _reportfooteron ) // ----------------------------------------------------------------------------- void SAL_CALL OReportDefinition::setPageHeaderOn( ::sal_Bool _pageheaderon ) throw (uno::RuntimeException) { - if ( _pageheaderon != m_pImpl->m_xPageHeader.is() ) + if ( bool(_pageheaderon) != m_pImpl->m_xPageHeader.is() ) { setSection(PROPERTY_PAGEHEADERON,_pageheaderon,RPT_RESSTRING(RID_STR_PAGE_HEADER,m_aProps->m_xContext->getServiceManager()),m_pImpl->m_xPageHeader); } @@ -1049,7 +1049,7 @@ void SAL_CALL OReportDefinition::setPageHeaderOn( ::sal_Bool _pageheaderon ) thr // ----------------------------------------------------------------------------- void SAL_CALL OReportDefinition::setPageFooterOn( ::sal_Bool _pagefooteron ) throw (uno::RuntimeException) { - if ( _pagefooteron != m_pImpl->m_xPageFooter.is() ) + if ( bool(_pagefooteron) != m_pImpl->m_xPageFooter.is() ) { setSection(PROPERTY_PAGEFOOTERON,_pagefooteron,RPT_RESSTRING(RID_STR_PAGE_FOOTER,m_aProps->m_xContext->getServiceManager()),m_pImpl->m_xPageFooter); } -- cgit v1.2.3