Attachment #385160 for bug #522178




        ::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(surface),
                                        _1 ) );

        cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() );





        // 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( outPos ),
                                            ::vcl::unotools::b2DPointFromPoint(aOutputPosition)),
                                        _1 ) );

        // flush to screen

Lines 1392-1398 Link Here

(-)libreoffice-4.3.1.2-orig/dbaccess/source/ui/tabledesign/TableController.cxx (-1 / +2 lines)
1392	setEditable( xMeta.is() && !xMeta->isReadOnly() && (isAlterAllowed() \|\| isDropAllowed() \|\| isAddAllowed()) );	1392	setEditable( xMeta.is() && !xMeta->isReadOnly() && (isAlterAllowed() \|\| isDropAllowed() \|\| isAddAllowed()) );
1393	if(!isEditable())	1393	if(!isEditable())
1394	{	1394	{
1395	::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( sal_True )));	1395	sal_Bool t( sal_True );
		1396	::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( t )));
1396	}	1397	}
1397	m_bNew = false;	1398	m_bNew = false;
1398	// be notified when the table is in disposing	1399	// be notified when the table is in disposing

Lines 117-125 Link Here

(-)libreoffice-4.3.1.2-orig/oox/source/drawingml/table/tablecell.cxx (-2 / +2 lines)
117	if (rTableStylePart.getTextColor().isUsed())	117	if (rTableStylePart.getTextColor().isUsed())
118	aTextCharProps.maCharColor = rTableStylePart.getTextColor();	118	aTextCharProps.maCharColor = rTableStylePart.getTextColor();
119	if( rTableStylePart.getTextBoldStyle().is_initialized() )	119	if( rTableStylePart.getTextBoldStyle().is_initialized() )
120	aTextCharProps.moBold = rTableStylePart.getTextBoldStyle();	120	aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle();
121	if( rTableStylePart.getTextItalicStyle().is_initialized() )	121	if( rTableStylePart.getTextItalicStyle().is_initialized() )
122	aTextCharProps.moItalic = rTableStylePart.getTextItalicStyle();	122	aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle();
123	}	123	}
124		124
125	void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell )	125	void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell )

Lines 1612-1619 Link Here

(-)libreoffice-4.3.1.2-orig/reportdesign/source/core/api/ReportDefinition.cxx (-1 / +2 lines)
1612	m_pImpl->m_pObjectContainer->SwitchPersistence(m_pImpl->m_xStorage);	1612	m_pImpl->m_pObjectContainer->SwitchPersistence(m_pImpl->m_xStorage);
1613	}	1613	}
1614	// notify our container listeners	1614	// notify our container listeners
		1615	OWeakObject weakObjectThis = static_cast<OWeakObject>(this);
1615	m_pImpl->m_aStorageChangeListeners.forEach<document::XStorageChangeListener>(	1616	m_pImpl->m_aStorageChangeListeners.forEach<document::XStorageChangeListener>(
1616	::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(static_cast<OWeakObject*>(this)),boost::cref(_xStorage)));	1617	::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(weakObjectThis),boost::cref(_xStorage)));
1617	}	1618	}
1618		1619
1619	uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentStorage( ) throw (io::IOException, uno::Exception, uno::RuntimeException, std::exception)	1620	uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentStorage( ) throw (io::IOException, uno::Exception, uno::RuntimeException, std::exception)

Lines 111-117 Link Here

(-)libreoffice-4.3.1.2-orig/slideshow/source/engine/activities/activitybase.hxx (-1 / +1 lines)
111	ShapeAttributeLayerSharedPtr getShapeAttributeLayer() const	111	ShapeAttributeLayerSharedPtr getShapeAttributeLayer() const
112	{ return mpAttributeLayer; }	112	{ return mpAttributeLayer; }
113		113
114	bool isRepeatCountValid() const { return maRepeats; }	114	bool isRepeatCountValid() const { return bool(maRepeats); }
115	double getRepeatCount() const { return *maRepeats; }	115	double getRepeatCount() const { return *maRepeats; }
116	bool isAutoReverse() const { return mbAutoReverse; }	116	bool isAutoReverse() const { return mbAutoReverse; }
117		117




    {
        // 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( rectMin )) );

        // sprites changed, need screen update
        mrScreenUpdater.notifyUpdate();




        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( bounds )) );
        }




        bool AppletShape::implStartIntrinsicAnimation()
        {
            ::basegfx::B2DRectangle bounds( getBounds() );
            ::std::for_each( maViewAppletShapes.begin(),
                             maViewAppletShapes.end(),
                             ::boost::bind( &ViewAppletShape::startApplet,
                                            _1,
                                            ::boost::cref( bounds )));
            mbIsPlaying = true;

            return true;

Lines 168-173 Link Here

(-)libreoffice-4.3.1.2-orig/slideshow/source/engine/shapes/drawshape.cxx (-2 / +2 lines)
168	}	168	}
169		169
170	// redraw all view shapes, by calling their update() method	170	// redraw all view shapes, by calling their update() method
		171	ViewShape::RenderArgs renderArgs( getViewRenderArgs() );
171	if( ::std::count_if( maViewShapes.begin(),	172	if( ::std::count_if( maViewShapes.begin(),
172	maViewShapes.end(),	173	maViewShapes.end(),
173	::boost::bind<bool>(	174	::boost::bind<bool>(
Lines 178-185 Link Here
178	// the extra mem_fn. WTF.	179	// the extra mem_fn. WTF.
179	_1,	180	_1,
180	::boost::cref( mpCurrMtf ),	181	::boost::cref( mpCurrMtf ),
181	::boost::cref(	182	::boost::cref( renderArgs ),
182	getViewRenderArgs() ),
183	nUpdateFlags,	183	nUpdateFlags,
184	isVisible() ) )	184	isVisible() ) )
185	!= static_cast<ViewShapeVector::difference_type>(maViewShapes.size()) )	185	!= static_cast<ViewShapeVector::difference_type>(maViewShapes.size()) )




        void MediaShape::implViewsChanged()
        {
            // resize all ViewShapes
            ::basegfx::B2DRectangle bounds( getBounds() );
            ::std::for_each( maViewMediaShapes.begin(),
                             maViewMediaShapes.end(),
                             ::boost::bind(
                                 &ViewMediaShape::resize,
                                 _1,
                                 ::boost::cref( bounds )) );
        }






            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( xView ),
                                    ::boost::bind(
                                        &UnoView::getUnoView,
                                        _1 ) ) ) != aEnd )

Return to bug 522178

Lines 402-412 Link Here

(-)libreoffice-4.3.1.2-orig/canvas/source/cairo/cairo_spritecanvashelper.cxx (-1 / +2 lines)
402	::basegfx::computeSetDifference( aUncoveredAreas,	402	::basegfx::computeSetDifference( aUncoveredAreas,
403	rUpdateArea.maTotalBounds,	403	rUpdateArea.maTotalBounds,
404	::basegfx::B2DRange( rDestRect ) );	404	::basegfx::B2DRange( rDestRect ) );
		405	SurfaceSharedPtr surface(mpOwningSpriteCanvas->getBufferSurface());
405	::std::for_each( aUncoveredAreas.begin(),	406	::std::for_each( aUncoveredAreas.begin(),
406	aUncoveredAreas.end(),	407	aUncoveredAreas.end(),
407	::boost::bind( &repaintBackground,	408	::boost::bind( &repaintBackground,
408	boost::cref(pCompositingCairo),	409	boost::cref(pCompositingCairo),
409	boost::cref(mpOwningSpriteCanvas->getBufferSurface()),	410	boost::cref(surface),
410	_1 ) );	411	_1 ) );
411		412
412	cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() );	413	cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() );

Lines 573-584 Link Here

(-)libreoffice-4.3.1.2-orig/canvas/source/vcl/spritecanvashelper.cxx (-2 / +2 lines)
573		573
574	// repaint all affected sprites on top of background into	574	// repaint all affected sprites on top of background into
575	// VDev.	575	// VDev.
		576	::basegfx::B2DPoint outPos( ::vcl::unotools::b2DPointFromPoint(aOutputPosition) );
576	::std::for_each( rSortedUpdateSprites.begin(),	577	::std::for_each( rSortedUpdateSprites.begin(),
577	rSortedUpdateSprites.end(),	578	rSortedUpdateSprites.end(),
578	::boost::bind( &spriteRedrawStub2,	579	::boost::bind( &spriteRedrawStub2,
579	::boost::ref( maVDev.get() ),	580	::boost::ref( maVDev.get() ),
580	::boost::cref(	581	::boost::cref( outPos ),
581	::vcl::unotools::b2DPointFromPoint(aOutputPosition)),
582	_1 ) );	582	_1 ) );
583		583
584	// flush to screen	584	// flush to screen

Lines 400-410 Link Here

(-)libreoffice-4.3.1.2-orig/slideshow/source/engine/rehearsetimingsactivity.cxx (-1 / +2 lines)
400	{	400	{
401	// new sprite pos, transformation might have changed:	401	// new sprite pos, transformation might have changed:
402	maSpriteRectangle = calcSpriteRectangle( maViews.front().first );	402	maSpriteRectangle = calcSpriteRectangle( maViews.front().first );
		403	::basegfx::B2DPoint rectMin( maSpriteRectangle.getMinimum() );
403		404
404	// reposition sprites	405	// reposition sprites
405	for_each_sprite( boost::bind( &cppcanvas::Sprite::move,	406	for_each_sprite( boost::bind( &cppcanvas::Sprite::move,
406	_1,	407	_1,
407	boost::cref(maSpriteRectangle.getMinimum())) );	408	boost::cref( rectMin )) );
408		409
409	// sprites changed, need screen update	410	// sprites changed, need screen update
410	mrScreenUpdater.notifyUpdate();	411	mrScreenUpdater.notifyUpdate();

Lines 148-159 Link Here

(-)libreoffice-4.3.1.2-orig/slideshow/source/engine/shapes/appletshape.cxx (-2 / +4 lines)
148	void AppletShape::implViewsChanged()	148	void AppletShape::implViewsChanged()
149	{	149	{
150	// resize all ViewShapes	150	// resize all ViewShapes
		151	::basegfx::B2DRectangle bounds( AppletShape::getBounds() );
151	::std::for_each( maViewAppletShapes.begin(),	152	::std::for_each( maViewAppletShapes.begin(),
152	maViewAppletShapes.end(),	153	maViewAppletShapes.end(),
153	::boost::bind(	154	::boost::bind(
154	&ViewAppletShape::resize,	155	&ViewAppletShape::resize,
155	_1,	156	_1,
156	::boost::cref( AppletShape::getBounds())) );	157	::boost::cref( bounds )) );
157	}	158	}
158		159
159		160
Lines 252-262 Link Here
252		253
253	bool AppletShape::implStartIntrinsicAnimation()	254	bool AppletShape::implStartIntrinsicAnimation()
254	{	255	{
		256	::basegfx::B2DRectangle bounds( getBounds() );
255	::std::for_each( maViewAppletShapes.begin(),	257	::std::for_each( maViewAppletShapes.begin(),
256	maViewAppletShapes.end(),	258	maViewAppletShapes.end(),
257	::boost::bind( &ViewAppletShape::startApplet,	259	::boost::bind( &ViewAppletShape::startApplet,
258	_1,	260	_1,
259	::boost::cref( getBounds() )));	261	::boost::cref( bounds )));
260	mbIsPlaying = true;	262	mbIsPlaying = true;
261		263
262	return true;	264	return true;

Lines 125-136 Link Here

(-)libreoffice-4.3.1.2-orig/slideshow/source/engine/shapes/mediashape.cxx (-1 / +2 lines)
125	void MediaShape::implViewsChanged()	125	void MediaShape::implViewsChanged()
126	{	126	{
127	// resize all ViewShapes	127	// resize all ViewShapes
		128	::basegfx::B2DRectangle bounds( getBounds() );
128	::std::for_each( maViewMediaShapes.begin(),	129	::std::for_each( maViewMediaShapes.begin(),
129	maViewMediaShapes.end(),	130	maViewMediaShapes.end(),
130	::boost::bind(	131	::boost::bind(
131	&ViewMediaShape::resize,	132	&ViewMediaShape::resize,
132	_1,	133	_1,
133	::boost::cref( getBounds())) );	134	::boost::cref( bounds )) );
134	}	135	}
135		136
136		137

Lines 45-55 Link Here

(-)libreoffice-4.3.1.2-orig/slideshow/source/engine/unoviewcontainer.cxx (-1 / +2 lines)
45	const UnoViewVector::iterator aEnd( maViews.end() );	45	const UnoViewVector::iterator aEnd( maViews.end() );
46		46
47	// already added?	47	// already added?
		48	uno::Reference<presentation::XSlideShowView> xView (rView->getUnoView());
48	if( ::std::find_if( maViews.begin(),	49	if( ::std::find_if( maViews.begin(),
49	aEnd,	50	aEnd,
50	::boost::bind(	51	::boost::bind(
51	::std::equal_to< uno::Reference< presentation::XSlideShowView > >(),	52	::std::equal_to< uno::Reference< presentation::XSlideShowView > >(),
52	::boost::cref( rView->getUnoView() ),	53	::boost::cref( xView ),
53	::boost::bind(	54	::boost::bind(
54	&UnoView::getUnoView,	55	&UnoView::getUnoView,
55	_1 ) ) ) != aEnd )	56	_1 ) ) ) != aEnd )