Kaydet (Commit) da194cb7 authored tarafından Luboš Luňák's avatar Luboš Luňák

more std:: -> o3tl:: build fixes

üst 78836f85
......@@ -33,6 +33,7 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include "corestrings.hrc"
#include <o3tl/compat_functional.hxx>
//........................................................................
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<TPropertyConverter>(),::std::select2nd<TPropertyNamePair::value_type>())
::o3tl::compose1(::o3tl::select1st<TPropertyConverter>(),::o3tl::select2nd<TPropertyNamePair::value_type>())
)
);
if ( aFind != m_aNameMap.end() )
......
......@@ -116,6 +116,8 @@
#include "helpids.hrc"
#include <toolkit/helper/convert.hxx>
#include <o3tl/compat_functional.hxx>
#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<TFunctions::value_type>()));
::o3tl::select1st<TFunctions::value_type>()));
}
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<TFunctions::value_type>());
::std::transform(m_aFunctionNames.begin(),m_aFunctionNames.end(),::std::back_inserter(_out_rList),::o3tl::select1st<TFunctions::value_type>());
}
// -----------------------------------------------------------------------------
::rtl::OUString GeometryHandler::impl_ConvertUIToMimeType_nothrow(const ::rtl::OUString& _sUIName) const
......
......@@ -57,6 +57,7 @@
#include <toolkit/helper/convert.hxx>
#include <algorithm>
#include <numeric>
#include <o3tl/compat_functional.hxx>
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<OSectionWindow> 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<sal_uInt16>& _rCollapsedPositions) const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment