Hi!
Jörg Sonnenberger made a patch fixing the compilation of
libreoffice-4.2.5.2 against boost-1.56.0. I've applied the patches to
git head (only one patch needed slight modifications). The result is
attached.
Usually, I would just push this, but since libreoffice distributes
matching boost versions for libreoffice releases, I'll let someone who
knows how this works in detail take over.
Please integrate this.
Thanks,
Thomas
(please cc me, not currently subscribed to the mailing list)
>From 6a2ef051cfdd0b4e61bd083a7f1965a69e5bd534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sonnenberger?=
Date: Thu, 28 Aug 2014 12:18:43 +0200
Subject: [PATCH] Fix build with boost-1.56.0.
Change-Id: I61686bf61ff1e0561c385492c563e4495456ca47
Signed-off-by: Thomas Klausner
---
canvas/source/cairo/cairo_spritecanvashelper.cxx| 3 ++-
canvas/source/vcl/spritecanvashelper.cxx| 4 ++--
dbaccess/source/ui/tabledesign/TableController.cxx | 3 ++-
oox/source/drawingml/table/tablecell.cxx| 4 ++--
reportdesign/source/core/api/ReportDefinition.cxx | 3 ++-
slideshow/source/engine/activities/activitybase.hxx | 2 +-
slideshow/source/engine/rehearsetimingsactivity.cxx | 3 ++-
slideshow/source/engine/shapes/appletshape.cxx | 6 --
slideshow/source/engine/shapes/drawshape.cxx| 4 ++--
slideshow/source/engine/shapes/mediashape.cxx | 3 ++-
slideshow/source/engine/unoviewcontainer.cxx| 3 ++-
11 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx
b/canvas/source/cairo/cairo_spritecanvashelper.cxx
index eb33f8f..741dbb3 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx
@@ -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()
);
diff --git a/canvas/source/vcl/spritecanvashelper.cxx
b/canvas/source/vcl/spritecanvashelper.cxx
index 13ae629..e2ded77 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -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
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx
b/dbaccess/source/ui/tabledesign/TableController.cxx
index d51d1bc..14f24e6 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -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
diff --git a/oox/source/drawingml/table/tablecell.cxx
b/oox/source/drawingml/table/tablecell.cxx
index e91f5b8..033434a 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -117,9 +117,9 @@ void applyTableStylePart( oox::drawingml::FillProperties&
rFillProperties,
if (rTableStylePart.getTextColor().isUsed())
aTextCharProps.maCharColor = rT
