strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build with boost-1.56.0.

Browse source 
Change-Id: I61686bf61ff1e0561c385492c563e4495456ca47
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
This commit is contained in:
Jörg Sonnenberger 2014-08-28 12:18:43 +02:00 committed by Caolán McNamara
parent c6270de939
commit 45dfbdca6a
11 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
canvas/source/cairo/cairo_spritecanvashelper.cxx
View file

@ -402,11 +402,12 @@ namespace cairocanvas
::basegfx::computeSetDifference( aUncoveredAreas,
rUpdateArea.maTotalBounds,
::basegfx::B2DRange( rDestRect ) );
SurfaceSharedPtr surface(mpOwningSpriteCanvas->getBufferSurface());
::std::for_each( aUncoveredAreas.begin(),
aUncoveredAreas.end(),
::boost::bind( &repaintBackground,
boost::cref(pCompositingCairo),
boost::cref(mpOwningSpriteCanvas->getBufferSurface()),
boost::cref(surface),
_1 ) );
cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() );

4
canvas/source/vcl/spritecanvashelper.cxx
View file

@ -573,12 +573,12 @@ namespace vclcanvas
// repaint all affected sprites on top of background into
// VDev.
::basegfx::B2DPoint outPos( ::vcl::unotools::b2DPointFromPoint(aOutputPosition) );
::std::for_each( rSortedUpdateSprites.begin(),
rSortedUpdateSprites.end(),
::boost::bind( &spriteRedrawStub2,
::boost::ref( maVDev.get() ),
::boost::cref(
::vcl::unotools::b2DPointFromPoint(aOutputPosition)),
::boost::cref( outPos ),
_1 ) );
// flush to screen

3
dbaccess/source/ui/tabledesign/TableController.cxx
View file

@ -1396,7 +1396,8 @@ void OTableController::assignTable()
setEditable( xMeta.is() && !xMeta->isReadOnly() && (isAlterAllowed() || isDropAllowed() || isAddAllowed()) );
if(!isEditable())
{
::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( sal_True )));
sal_Bool t( sal_True );
::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( t )));
}
m_bNew = false;
// be notified when the table is in disposing

4
oox/source/drawingml/table/tablecell.cxx
View file

@ -117,9 +117,9 @@ void applyTableStylePart( oox::drawingml::FillProperties& rFillProperties,
if (rTableStylePart.getTextColor().isUsed())
aTextCharProps.maCharColor = rTableStylePart.getTextColor();
if( rTableStylePart.getTextBoldStyle().is_initialized() )
aTextCharProps.moBold = rTableStylePart.getTextBoldStyle();
aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle();
if( rTableStylePart.getTextItalicStyle().is_initialized() )
aTextCharProps.moItalic = rTableStylePart.getTextItalicStyle();
aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle();
}
void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell )

3
reportdesign/source/core/api/ReportDefinition.cxx
View file

@ -1622,8 +1622,9 @@ void SAL_CALL OReportDefinition::switchToStorage( const uno::Reference< embed::X
m_pImpl->m_pObjectContainer->SwitchPersistence(m_pImpl->m_xStorage);
}
// notify our container listeners
OWeakObject *weakObjectThis = static_cast<OWeakObject*>(this);
m_pImpl->m_aStorageChangeListeners.forEach<document::XStorageChangeListener>(
::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(static_cast<OWeakObject*>(this)),boost::cref(_xStorage)));
::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(weakObjectThis),boost::cref(_xStorage)));
}
uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentStorage( ) throw (io::IOException, uno::Exception, uno::RuntimeException, std::exception)

2
slideshow/source/engine/activities/activitybase.hxx
View file

@ -111,7 +111,7 @@ protected:
ShapeAttributeLayerSharedPtr getShapeAttributeLayer() const
{ return mpAttributeLayer; }
bool isRepeatCountValid() const { return maRepeats; }
bool isRepeatCountValid() const { return bool(maRepeats); }
double getRepeatCount() const { return *maRepeats; }
bool isAutoReverse() const { return mbAutoReverse; }

3
slideshow/source/engine/rehearsetimingsactivity.cxx
View file

@ -400,11 +400,12 @@ void RehearseTimingsActivity::viewsChanged()
{
// new sprite pos, transformation might have changed:
maSpriteRectangle = calcSpriteRectangle( maViews.front().first );
::basegfx::B2DPoint rectMin( maSpriteRectangle.getMinimum() );
// reposition sprites
for_each_sprite( boost::bind( &cppcanvas::Sprite::move,
_1,
boost::cref(maSpriteRectangle.getMinimum())) );
boost::cref( rectMin )) );
// sprites changed, need screen update
mrScreenUpdater.notifyUpdate();

6
slideshow/source/engine/shapes/appletshape.cxx
View file

@ -148,12 +148,13 @@ namespace slideshow
void AppletShape::implViewsChanged()
{
// resize all ViewShapes
::basegfx::B2DRectangle bounds( AppletShape::getBounds() );
::std::for_each( maViewAppletShapes.begin(),
maViewAppletShapes.end(),
::boost::bind(
&ViewAppletShape::resize,
_1,
::boost::cref( AppletShape::getBounds())) );
::boost::cref( bounds )) );
}
@ -252,11 +253,12 @@ namespace slideshow
bool AppletShape::implStartIntrinsicAnimation()
{
::basegfx::B2DRectangle bounds( getBounds() );
::std::for_each( maViewAppletShapes.begin(),
maViewAppletShapes.end(),
::boost::bind( &ViewAppletShape::startApplet,
_1,
::boost::cref( getBounds() )));
::boost::cref( bounds )));
mbIsPlaying = true;
return true;

4
slideshow/source/engine/shapes/drawshape.cxx
View file

@ -168,6 +168,7 @@ namespace slideshow
}
// redraw all view shapes, by calling their update() method
ViewShape::RenderArgs renderArgs( getViewRenderArgs() );
if( ::std::count_if( maViewShapes.begin(),
maViewShapes.end(),
::boost::bind<bool>(
@ -178,8 +179,7 @@ namespace slideshow
// the extra mem_fn. WTF.
_1,
::boost::cref( mpCurrMtf ),
::boost::cref(
getViewRenderArgs() ),
::boost::cref( renderArgs ),
nUpdateFlags,
isVisible() ) )
!= static_cast<ViewShapeVector::difference_type>(maViewShapes.size()) )

3
slideshow/source/engine/shapes/mediashape.cxx
View file

@ -125,12 +125,13 @@ namespace slideshow
void MediaShape::implViewsChanged()
{
// resize all ViewShapes
::basegfx::B2DRectangle bounds( getBounds() );
::std::for_each( maViewMediaShapes.begin(),
maViewMediaShapes.end(),
::boost::bind(
&ViewMediaShape::resize,
_1,
::boost::cref( getBounds())) );
::boost::cref( bounds )) );
}

3
slideshow/source/engine/unoviewcontainer.cxx
View file

@ -45,11 +45,12 @@ namespace slideshow
const UnoViewVector::iterator aEnd( maViews.end() );
// already added?
uno::Reference<presentation::XSlideShowView> xView (rView->getUnoView());
if( ::std::find_if( maViews.begin(),
aEnd,
::boost::bind(
::std::equal_to< uno::Reference< presentation::XSlideShowView > >(),
::boost::cref( rView->getUnoView() ),
::boost::cref( xView ),
::boost::bind(
&UnoView::getUnoView,
_1 ) ) ) != aEnd )