1 commit 45dfbdca6a9afba1a6aef21623ec025ded635a4d
2 Author: Jörg Sonnenberger <joerg@NetBSD.org>
3 Date: Thu Aug 28 12:18:43 2014 +0200
5 Fix build with boost-1.56.0.
7 Change-Id: I61686bf61ff1e0561c385492c563e4495456ca47
8 Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
10 diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx
11 index eb33f8f..741dbb3 100644
12 --- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
13 +++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx
14 @@ -402,11 +402,12 @@ namespace cairocanvas
15 ::basegfx::computeSetDifference( aUncoveredAreas,
16 rUpdateArea.maTotalBounds,
17 ::basegfx::B2DRange( rDestRect ) );
18 + SurfaceSharedPtr surface(mpOwningSpriteCanvas->getBufferSurface());
19 ::std::for_each( aUncoveredAreas.begin(),
20 aUncoveredAreas.end(),
21 ::boost::bind( &repaintBackground,
22 boost::cref(pCompositingCairo),
23 - boost::cref(mpOwningSpriteCanvas->getBufferSurface()),
24 + boost::cref(surface),
27 cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() );
28 diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
29 index 13ae629..e2ded77 100644
30 --- a/canvas/source/vcl/spritecanvashelper.cxx
31 +++ b/canvas/source/vcl/spritecanvashelper.cxx
32 @@ -573,12 +573,12 @@ namespace vclcanvas
34 // repaint all affected sprites on top of background into
36 + ::basegfx::B2DPoint outPos( ::vcl::unotools::b2DPointFromPoint(aOutputPosition) );
37 ::std::for_each( rSortedUpdateSprites.begin(),
38 rSortedUpdateSprites.end(),
39 ::boost::bind( &spriteRedrawStub2,
40 ::boost::ref( maVDev.get() ),
42 - ::vcl::unotools::b2DPointFromPoint(aOutputPosition)),
43 + ::boost::cref( outPos ),
47 diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
48 index d51d1bc..14f24e6 100644
49 --- a/dbaccess/source/ui/tabledesign/TableController.cxx
50 +++ b/dbaccess/source/ui/tabledesign/TableController.cxx
51 @@ -1396,7 +1396,8 @@ void OTableController::assignTable()
52 setEditable( xMeta.is() && !xMeta->isReadOnly() && (isAlterAllowed() || isDropAllowed() || isAddAllowed()) );
55 - ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( sal_True )));
56 + sal_Bool t( sal_True );
57 + ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( t )));
60 // be notified when the table is in disposing
61 diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
62 index e91f5b8..033434a 100644
63 --- a/oox/source/drawingml/table/tablecell.cxx
64 +++ b/oox/source/drawingml/table/tablecell.cxx
65 @@ -117,9 +117,9 @@ void applyTableStylePart( oox::drawingml::FillProperties& rFillProperties,
66 if (rTableStylePart.getTextColor().isUsed())
67 aTextCharProps.maCharColor = rTableStylePart.getTextColor();
68 if( rTableStylePart.getTextBoldStyle().is_initialized() )
69 - aTextCharProps.moBold = rTableStylePart.getTextBoldStyle();
70 + aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle();
71 if( rTableStylePart.getTextItalicStyle().is_initialized() )
72 - aTextCharProps.moItalic = rTableStylePart.getTextItalicStyle();
73 + aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle();
76 void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell )
77 diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
78 index db5eb0b..571095a 100644
79 --- a/reportdesign/source/core/api/ReportDefinition.cxx
80 +++ b/reportdesign/source/core/api/ReportDefinition.cxx
81 @@ -1622,8 +1622,9 @@ void SAL_CALL OReportDefinition::switchToStorage( const uno::Reference< embed::X
82 m_pImpl->m_pObjectContainer->SwitchPersistence(m_pImpl->m_xStorage);
84 // notify our container listeners
85 + OWeakObject *weakObjectThis = static_cast<OWeakObject*>(this);
86 m_pImpl->m_aStorageChangeListeners.forEach<document::XStorageChangeListener>(
87 - ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(static_cast<OWeakObject*>(this)),boost::cref(_xStorage)));
88 + ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(weakObjectThis),boost::cref(_xStorage)));
91 uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentStorage( ) throw (io::IOException, uno::Exception, uno::RuntimeException, std::exception)
92 diff --git a/slideshow/source/engine/activities/activitybase.hxx b/slideshow/source/engine/activities/activitybase.hxx
93 index ec0d72b..52ac966 100644
94 --- a/slideshow/source/engine/activities/activitybase.hxx
95 +++ b/slideshow/source/engine/activities/activitybase.hxx
96 @@ -111,7 +111,7 @@ protected:
97 ShapeAttributeLayerSharedPtr getShapeAttributeLayer() const
98 { return mpAttributeLayer; }
100 - bool isRepeatCountValid() const { return maRepeats; }
101 + bool isRepeatCountValid() const { return bool(maRepeats); }
102 double getRepeatCount() const { return *maRepeats; }
103 bool isAutoReverse() const { return mbAutoReverse; }
105 diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
106 index c1513eb..3add12f 100644
107 --- a/slideshow/source/engine/rehearsetimingsactivity.cxx
108 +++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
109 @@ -400,11 +400,12 @@ void RehearseTimingsActivity::viewsChanged()
111 // new sprite pos, transformation might have changed:
112 maSpriteRectangle = calcSpriteRectangle( maViews.front().first );
113 + ::basegfx::B2DPoint rectMin( maSpriteRectangle.getMinimum() );
115 // reposition sprites
116 for_each_sprite( boost::bind( &cppcanvas::Sprite::move,
118 - boost::cref(maSpriteRectangle.getMinimum())) );
119 + boost::cref( rectMin )) );
121 // sprites changed, need screen update
122 mrScreenUpdater.notifyUpdate();
123 diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx
124 index f5de6d8..3d784d0 100644
125 --- a/slideshow/source/engine/shapes/appletshape.cxx
126 +++ b/slideshow/source/engine/shapes/appletshape.cxx
127 @@ -148,12 +148,13 @@ namespace slideshow
128 void AppletShape::implViewsChanged()
130 // resize all ViewShapes
131 + ::basegfx::B2DRectangle bounds( AppletShape::getBounds() );
132 ::std::for_each( maViewAppletShapes.begin(),
133 maViewAppletShapes.end(),
135 &ViewAppletShape::resize,
137 - ::boost::cref( AppletShape::getBounds())) );
138 + ::boost::cref( bounds )) );
142 @@ -252,11 +253,12 @@ namespace slideshow
144 bool AppletShape::implStartIntrinsicAnimation()
146 + ::basegfx::B2DRectangle bounds( getBounds() );
147 ::std::for_each( maViewAppletShapes.begin(),
148 maViewAppletShapes.end(),
149 ::boost::bind( &ViewAppletShape::startApplet,
151 - ::boost::cref( getBounds() )));
152 + ::boost::cref( bounds )));
156 diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
157 index b0f12fd..a3b89b7 100644
158 --- a/slideshow/source/engine/shapes/drawshape.cxx
159 +++ b/slideshow/source/engine/shapes/drawshape.cxx
160 @@ -168,6 +168,7 @@ namespace slideshow
163 // redraw all view shapes, by calling their update() method
164 + ViewShape::RenderArgs renderArgs( getViewRenderArgs() );
165 if( ::std::count_if( maViewShapes.begin(),
168 @@ -178,8 +179,7 @@ namespace slideshow
169 // the extra mem_fn. WTF.
171 ::boost::cref( mpCurrMtf ),
173 - getViewRenderArgs() ),
174 + ::boost::cref( renderArgs ),
177 != static_cast<ViewShapeVector::difference_type>(maViewShapes.size()) )
178 diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx
179 index f50e84b..071fe60 100644
180 --- a/slideshow/source/engine/shapes/mediashape.cxx
181 +++ b/slideshow/source/engine/shapes/mediashape.cxx
182 @@ -125,12 +125,13 @@ namespace slideshow
183 void MediaShape::implViewsChanged()
185 // resize all ViewShapes
186 + ::basegfx::B2DRectangle bounds( getBounds() );
187 ::std::for_each( maViewMediaShapes.begin(),
188 maViewMediaShapes.end(),
190 &ViewMediaShape::resize,
192 - ::boost::cref( getBounds())) );
193 + ::boost::cref( bounds )) );
197 diff --git a/slideshow/source/engine/unoviewcontainer.cxx b/slideshow/source/engine/unoviewcontainer.cxx
198 index a547997..0f27c8f 100644
199 --- a/slideshow/source/engine/unoviewcontainer.cxx
200 +++ b/slideshow/source/engine/unoviewcontainer.cxx
201 @@ -45,11 +45,12 @@ namespace slideshow
202 const UnoViewVector::iterator aEnd( maViews.end() );
205 + uno::Reference<presentation::XSlideShowView> xView (rView->getUnoView());
206 if( ::std::find_if( maViews.begin(),
209 ::std::equal_to< uno::Reference< presentation::XSlideShowView > >(),
210 - ::boost::cref( rView->getUnoView() ),
211 + ::boost::cref( xView ),
213 &UnoView::getUnoView,