From b5e11641a7cec634c603213869a3475b1e01084e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 25 Mar 2014 11:01:20 +0200 Subject: svtools: sal_Bool->bool Change-Id: I90320997ed79be2556eafa4c35af6b968b378454 --- reportdesign/source/ui/dlg/GroupExchange.cxx | 4 ++-- reportdesign/source/ui/dlg/GroupExchange.hxx | 2 +- reportdesign/source/ui/inc/dlgedclip.hxx | 2 +- reportdesign/source/ui/report/dlgedclip.cxx | 6 ++---- 4 files changed, 6 insertions(+), 8 deletions(-) (limited to 'reportdesign/source/ui') diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index 4b6dd5fa7b88..979dd5c65cde 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.cxx +++ b/reportdesign/source/ui/dlg/GroupExchange.cxx @@ -49,14 +49,14 @@ namespace rptui } } - sal_Bool OGroupExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) + bool OGroupExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { sal_uLong nFormat = SotExchange::GetFormat(rFlavor); if(nFormat == OGroupExchange::getReportGroupId() ) { return SetAny(uno::makeAny(m_aGroupRow),rFlavor); } - return sal_False; + return false; } void OGroupExchange::ObjectReleased() diff --git a/reportdesign/source/ui/dlg/GroupExchange.hxx b/reportdesign/source/ui/dlg/GroupExchange.hxx index 01eb4373718e..5499f8012f34 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.hxx +++ b/reportdesign/source/ui/dlg/GroupExchange.hxx @@ -37,7 +37,7 @@ namespace rptui static sal_uInt32 getReportGroupId(); protected: virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); virtual void ObjectReleased(); }; } diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx b/reportdesign/source/ui/inc/dlgedclip.hxx index c3ba51c00174..b439cd41e7ac 100644 --- a/reportdesign/source/ui/inc/dlgedclip.hxx +++ b/reportdesign/source/ui/inc/dlgedclip.hxx @@ -70,7 +70,7 @@ public: protected: // TransferableHelper overridables virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); private: TSectionElements m_aCopyElements; }; diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index a48c2c0c529d..cd217f9d0440 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -52,12 +52,10 @@ void OReportExchange::AddSupportedFormats() AddFormat(getDescriptorFormatId()); } -sal_Bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor ) +bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor); - return (nFormatId == getDescriptorFormatId()) ? - SetAny( uno::Any(m_aCopyElements), _rFlavor ) - : sal_False; + return (nFormatId == getDescriptorFormatId()) && SetAny( uno::Any(m_aCopyElements), _rFlavor ); } sal_Bool OReportExchange::canExtract(const DataFlavorExVector& _rFlavor) -- cgit