From da194cb73f022415ce2a198843235f3db9507aad Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Tue, 8 Feb 2011 20:15:33 +0100 Subject: more std:: -> o3tl:: build fixes --- reportdesign/source/core/sdr/PropertyForward.cxx | 5 +++-- .../source/ui/inspection/GeometryHandler.cxx | 8 +++++--- reportdesign/source/ui/report/ViewsWindow.cxx | 21 +++++++++++---------- 3 files changed, 19 insertions(+), 15 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index d03473b5042d..09d9b1037b3b 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -33,6 +33,7 @@ #include #include #include "corestrings.hrc" +#include //........................................................................ namespace rptui @@ -131,9 +132,9 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt aFind = ::std::find_if( m_aNameMap.begin(), m_aNameMap.end(), - ::std::compose1( + ::o3tl::compose1( ::std::bind2nd(::std::equal_to< ::rtl::OUString >(), evt.PropertyName), - ::std::compose1(::std::select1st(),::std::select2nd()) + ::o3tl::compose1(::o3tl::select1st(),::o3tl::select2nd()) ) ); if ( aFind != m_aNameMap.end() ) diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 99f6d76936f6..91c2045a4586 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -116,6 +116,8 @@ #include "helpids.hrc" #include +#include + #define DATA_OR_FORMULA 0 #define FUNCTION 1 #define COUNTER 2 @@ -806,9 +808,9 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const { // add function names ::std::for_each( m_aFunctionNames.begin(), m_aFunctionNames.end(), - ::std::compose1( + ::o3tl::compose1( ::boost::bind( &inspection::XStringListControl::appendListEntry, xListControl,_1 ), - ::std::select1st())); + ::o3tl::select1st())); } else { @@ -1649,7 +1651,7 @@ void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< ::rtl::OUStrin if ( m_nDataFieldType == FUNCTION ) ::std::transform(m_aDefaultFunctions.begin(),m_aDefaultFunctions.end(),::std::back_inserter(_out_rList),::boost::bind( &DefaultFunction::getName, _1 )); else if ( m_nDataFieldType == USER_DEF_FUNCTION ) - ::std::transform(m_aFunctionNames.begin(),m_aFunctionNames.end(),::std::back_inserter(_out_rList),::std::select1st()); + ::std::transform(m_aFunctionNames.begin(),m_aFunctionNames.end(),::std::back_inserter(_out_rList),::o3tl::select1st()); } // ----------------------------------------------------------------------------- ::rtl::OUString GeometryHandler::impl_ConvertUIToMimeType_nothrow(const ::rtl::OUString& _sUIName) const diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 7fa6b1568043..35562e4cefa8 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -57,6 +57,7 @@ #include #include #include +#include namespace rptui { @@ -338,9 +339,9 @@ void OViewsWindow::removeSection(USHORT _nPosition) void OViewsWindow::toggleGrid(BOOL _bVisible) { ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::std::compose1(::boost::bind(&OReportSection::SetGridVisible,_1,_bVisible),TReportPairHelper())); + ::o3tl::compose1(::boost::bind(&OReportSection::SetGridVisible,_1,_bVisible),TReportPairHelper())); ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::std::compose1(::boost::bind(&OReportSection::Window::Invalidate,_1,INVALIDATE_NOERASE),TReportPairHelper())); + ::o3tl::compose1(::boost::bind(&OReportSection::Window::Invalidate,_1,INVALIDATE_NOERASE),TReportPairHelper())); } //------------------------------------------------------------------------------ sal_Int32 OViewsWindow::getTotalHeight() const @@ -379,7 +380,7 @@ rtl::OUString OViewsWindow::GetInsertObjString() const void OViewsWindow::SetMode( DlgEdMode eNewMode ) { ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::std::compose1(::boost::bind(&OReportSection::SetMode,_1,eNewMode),TReportPairHelper())); + ::o3tl::compose1(::boost::bind(&OReportSection::SetMode,_1,eNewMode),TReportPairHelper())); } //---------------------------------------------------------------------------- BOOL OViewsWindow::HasSelection() const @@ -395,7 +396,7 @@ void OViewsWindow::Delete() { m_bInUnmark = sal_True; ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::std::compose1(::boost::mem_fn(&OReportSection::Delete),TReportPairHelper())); + ::o3tl::compose1(::boost::mem_fn(&OReportSection::Delete),TReportPairHelper())); m_bInUnmark = sal_False; } //---------------------------------------------------------------------------- @@ -403,7 +404,7 @@ void OViewsWindow::Copy() { uno::Sequence< beans::NamedValue > aAllreadyCopiedObjects; ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::std::compose1(::boost::bind(&OReportSection::Copy,_1,::boost::ref(aAllreadyCopiedObjects)),TReportPairHelper())); + ::o3tl::compose1(::boost::bind(&OReportSection::Copy,_1,::boost::ref(aAllreadyCopiedObjects)),TReportPairHelper())); OReportExchange* pCopy = new OReportExchange(aAllreadyCopiedObjects); uno::Reference< datatransfer::XTransferable> aEnsureDelete = pCopy; @@ -416,7 +417,7 @@ void OViewsWindow::Paste() OReportExchange::TSectionElements aCopies = OReportExchange::extractCopies(aTransferData); if ( aCopies.getLength() > 1 ) ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::std::compose1(::boost::bind(&OReportSection::Paste,_1,aCopies,false),TReportPairHelper())); + ::o3tl::compose1(::boost::bind(&OReportSection::Paste,_1,aCopies,false),TReportPairHelper())); else { ::boost::shared_ptr pMarkedSection = getMarkedSection(); @@ -518,7 +519,7 @@ void OViewsWindow::SelectAll(const sal_uInt16 _nObjectType) { m_bInUnmark = sal_True; ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::std::compose1(::boost::bind(::boost::mem_fn(&OReportSection::SelectAll),_1,_nObjectType),TReportPairHelper())); + ::o3tl::compose1(::boost::bind(::boost::mem_fn(&OReportSection::SelectAll),_1,_nObjectType),TReportPairHelper())); m_bInUnmark = sal_False; } //----------------------------------------------------------------------------- @@ -561,9 +562,9 @@ void OViewsWindow::MouseButtonDown( const MouseEvent& rMEvt ) void OViewsWindow::showRuler(sal_Bool _bShow) { ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::std::compose1(::boost::bind(&OStartMarker::showRuler,_1,_bShow),TStartMarkerHelper())); + ::o3tl::compose1(::boost::bind(&OStartMarker::showRuler,_1,_bShow),TStartMarkerHelper())); ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::std::compose1(::boost::bind(&OStartMarker::Window::Invalidate,_1,USHORT(INVALIDATE_NOERASE)),TStartMarkerHelper())); + ::o3tl::compose1(::boost::bind(&OStartMarker::Window::Invalidate,_1,USHORT(INVALIDATE_NOERASE)),TStartMarkerHelper())); } //---------------------------------------------------------------------------- void OViewsWindow::MouseButtonUp( const MouseEvent& rMEvt ) @@ -1634,7 +1635,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode) void OViewsWindow::stopScrollTimer() { ::std::for_each(m_aSections.begin(),m_aSections.end(), - ::std::compose1(::boost::mem_fn(&OReportSection::stopScrollTimer),TReportPairHelper())); + ::o3tl::compose1(::boost::mem_fn(&OReportSection::stopScrollTimer),TReportPairHelper())); } // ----------------------------------------------------------------------------- void OViewsWindow::fillCollapsedSections(::std::vector& _rCollapsedPositions) const -- cgit v1.2.3