Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-4.2.8.2-boost-1.56.0.patch
Date: Sun, 28 Dec 2014 20:53:29
Message-Id: 20141228205323.17F28E5FC@oystercatcher.gentoo.org
1 dilfridge 14/12/28 20:53:23
2
3 Added: libreoffice-4.2.8.2-boost-1.56.0.patch
4 Log:
5 Version bump
6
7 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)
8
9 Revision Changes Path
10 1.1 app-office/libreoffice/files/libreoffice-4.2.8.2-boost-1.56.0.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.2.8.2-boost-1.56.0.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-4.2.8.2-boost-1.56.0.patch?rev=1.1&content-type=text/plain
14
15 Index: libreoffice-4.2.8.2-boost-1.56.0.patch
16 ===================================================================
17 Backport of 45dfbdca6a9afba1a6aef21623ec025ded635a4d from LO master
18 by Mark Wright, gienah@g.o
19
20
21 --- libreoffice-4.2.6.3-orig/canvas/source/cairo/cairo_spritecanvashelper.cxx 2014-08-23 00:22:41.000000000 +1000
22 +++ libreoffice-4.2.6.3/canvas/source/cairo/cairo_spritecanvashelper.cxx 2014-09-14 22:25:51.323259895 +1000
23 @@ -402,11 +402,12 @@
24 ::basegfx::computeSetDifference( aUncoveredAreas,
25 rUpdateArea.maTotalBounds,
26 ::basegfx::B2DRange( rDestRect ) );
27 + SurfaceSharedPtr surface(mpOwningSpriteCanvas->getBufferSurface());
28 ::std::for_each( aUncoveredAreas.begin(),
29 aUncoveredAreas.end(),
30 ::boost::bind( &repaintBackground,
31 boost::cref(pCompositingCairo),
32 - boost::cref(mpOwningSpriteCanvas->getBufferSurface()),
33 + boost::cref(surface),
34 _1 ) );
35
36 cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() );
37 --- libreoffice-4.2.6.3-orig/canvas/source/vcl/spritecanvashelper.cxx 2014-08-23 00:22:41.000000000 +1000
38 +++ libreoffice-4.2.6.3/canvas/source/vcl/spritecanvashelper.cxx 2014-09-14 22:25:51.323721613 +1000
39 @@ -573,12 +573,12 @@
40
41 // repaint all affected sprites on top of background into
42 // VDev.
43 + ::basegfx::B2DPoint outPos( ::vcl::unotools::b2DPointFromPoint(aOutputPosition) );
44 ::std::for_each( rSortedUpdateSprites.begin(),
45 rSortedUpdateSprites.end(),
46 ::boost::bind( &spriteRedrawStub2,
47 ::boost::ref( maVDev.get() ),
48 - ::boost::cref(
49 - ::vcl::unotools::b2DPointFromPoint(aOutputPosition)),
50 + ::boost::cref( outPos ),
51 _1 ) );
52
53 // flush to screen
54 --- libreoffice-4.2.6.3-orig/dbaccess/source/ui/tabledesign/TableController.cxx 2014-08-23 00:22:41.000000000 +1000
55 +++ libreoffice-4.2.6.3/dbaccess/source/ui/tabledesign/TableController.cxx 2014-09-14 22:28:42.327186979 +1000
56 @@ -1393,7 +1393,8 @@
57 setEditable( xMeta.is() && !xMeta->isReadOnly() && (isAlterAllowed() || isDropAllowed() || isAddAllowed()) );
58 if(!isEditable())
59 {
60 - ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( sal_True )));
61 + sal_Bool t( sal_True );
62 + ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( t )));
63 }
64 m_bNew = sal_False;
65 // be notified when the table is in disposing
66 --- libreoffice-4.2.6.3-orig/oox/source/drawingml/table/tablecell.cxx 2014-08-23 00:22:41.000000000 +1000
67 +++ libreoffice-4.2.6.3/oox/source/drawingml/table/tablecell.cxx 2014-09-14 22:25:51.325066244 +1000
68 @@ -117,9 +117,9 @@
69 if (rTableStylePart.getTextColor().isUsed())
70 aTextCharProps.maCharColor = rTableStylePart.getTextColor();
71 if( rTableStylePart.getTextBoldStyle().is_initialized() )
72 - aTextCharProps.moBold = rTableStylePart.getTextBoldStyle();
73 + aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle();
74 if( rTableStylePart.getTextItalicStyle().is_initialized() )
75 - aTextCharProps.moItalic = rTableStylePart.getTextItalicStyle();
76 + aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle();
77 }
78
79 void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell )
80 --- libreoffice-4.2.6.3-orig/reportdesign/source/core/api/ReportDefinition.cxx 2014-08-23 00:22:41.000000000 +1000
81 +++ libreoffice-4.2.6.3/reportdesign/source/core/api/ReportDefinition.cxx 2014-09-14 22:25:51.326473733 +1000
82 @@ -1623,8 +1623,9 @@
83 m_pImpl->m_pObjectContainer->SwitchPersistence(m_pImpl->m_xStorage);
84 }
85 // notify our container listeners
86 + OWeakObject *weakObjectThis = static_cast<OWeakObject*>(this);
87 m_pImpl->m_aStorageChangeListeners.forEach<document::XStorageChangeListener>(
88 - ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(static_cast<OWeakObject*>(this)),boost::cref(_xStorage)));
89 + ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(weakObjectThis),boost::cref(_xStorage)));
90 }
91 // -----------------------------------------------------------------------------
92 uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentStorage( ) throw (io::IOException, uno::Exception, uno::RuntimeException)
93 --- libreoffice-4.2.6.3-orig/slideshow/source/engine/activities/activitybase.hxx 2014-08-23 00:22:41.000000000 +1000
94 +++ libreoffice-4.2.6.3/slideshow/source/engine/activities/activitybase.hxx 2014-09-14 22:25:51.326839852 +1000
95 @@ -111,7 +111,7 @@
96 ShapeAttributeLayerSharedPtr getShapeAttributeLayer() const
97 { return mpAttributeLayer; }
98
99 - bool isRepeatCountValid() const { return maRepeats; }
100 + bool isRepeatCountValid() const { return bool(maRepeats); }
101 double getRepeatCount() const { return *maRepeats; }
102 bool isAutoReverse() const { return mbAutoReverse; }
103
104 --- libreoffice-4.2.6.3-orig/slideshow/source/engine/rehearsetimingsactivity.cxx 2014-08-23 00:22:41.000000000 +1000
105 +++ libreoffice-4.2.6.3/slideshow/source/engine/rehearsetimingsactivity.cxx 2014-09-14 22:25:51.327321898 +1000
106 @@ -398,11 +398,12 @@
107 {
108 // new sprite pos, transformation might have changed:
109 maSpriteRectangle = calcSpriteRectangle( maViews.front().first );
110 + ::basegfx::B2DPoint rectMin( maSpriteRectangle.getMinimum() );
111
112 // reposition sprites
113 for_each_sprite( boost::bind( &cppcanvas::Sprite::move,
114 _1,
115 - boost::cref(maSpriteRectangle.getMinimum())) );
116 + boost::cref( rectMin )) );
117
118 // sprites changed, need screen update
119 mrScreenUpdater.notifyUpdate();
120 --- libreoffice-4.2.6.3-orig/slideshow/source/engine/shapes/appletshape.cxx 2014-08-23 00:22:41.000000000 +1000
121 +++ libreoffice-4.2.6.3/slideshow/source/engine/shapes/appletshape.cxx 2014-09-14 22:25:51.327829537 +1000
122 @@ -148,12 +148,13 @@
123 void AppletShape::implViewsChanged()
124 {
125 // resize all ViewShapes
126 + ::basegfx::B2DRectangle bounds( AppletShape::getBounds() );
127 ::std::for_each( maViewAppletShapes.begin(),
128 maViewAppletShapes.end(),
129 ::boost::bind(
130 &ViewAppletShape::resize,
131 _1,
132 - ::boost::cref( AppletShape::getBounds())) );
133 + ::boost::cref( bounds )) );
134 }
135
136 // ---------------------------------------------------------------------
137 @@ -252,11 +253,12 @@
138
139 bool AppletShape::implStartIntrinsicAnimation()
140 {
141 + ::basegfx::B2DRectangle bounds( getBounds() );
142 ::std::for_each( maViewAppletShapes.begin(),
143 maViewAppletShapes.end(),
144 ::boost::bind( &ViewAppletShape::startApplet,
145 _1,
146 - ::boost::cref( getBounds() )));
147 + ::boost::cref( bounds )));
148 mbIsPlaying = true;
149
150 return true;
151 --- libreoffice-4.2.6.3-orig/slideshow/source/engine/shapes/drawshape.cxx 2014-08-23 00:22:41.000000000 +1000
152 +++ libreoffice-4.2.6.3/slideshow/source/engine/shapes/drawshape.cxx 2014-09-14 22:25:51.328463497 +1000
153 @@ -168,6 +168,7 @@
154 }
155
156 // redraw all view shapes, by calling their update() method
157 + ViewShape::RenderArgs renderArgs( getViewRenderArgs() );
158 if( ::std::count_if( maViewShapes.begin(),
159 maViewShapes.end(),
160 ::boost::bind<bool>(
161 @@ -178,8 +179,7 @@
162 // the extra mem_fn. WTF.
163 _1,
164 ::boost::cref( mpCurrMtf ),
165 - ::boost::cref(
166 - getViewRenderArgs() ),
167 + ::boost::cref( renderArgs ),
168 nUpdateFlags,
169 isVisible() ) )
170 != static_cast<ViewShapeVector::difference_type>(maViewShapes.size()) )
171 --- libreoffice-4.2.6.3-orig/slideshow/source/engine/shapes/mediashape.cxx 2014-08-23 00:22:41.000000000 +1000
172 +++ libreoffice-4.2.6.3/slideshow/source/engine/shapes/mediashape.cxx 2014-09-14 22:25:51.328874055 +1000
173 @@ -125,12 +125,13 @@
174 void MediaShape::implViewsChanged()
175 {
176 // resize all ViewShapes
177 + ::basegfx::B2DRectangle bounds( getBounds() );
178 ::std::for_each( maViewMediaShapes.begin(),
179 maViewMediaShapes.end(),
180 ::boost::bind(
181 &ViewMediaShape::resize,
182 _1,
183 - ::boost::cref( getBounds())) );
184 + ::boost::cref( bounds )) );
185 }
186
187 // ---------------------------------------------------------------------
188 --- libreoffice-4.2.6.3-orig/slideshow/source/engine/unoviewcontainer.cxx 2014-08-23 00:22:41.000000000 +1000
189 +++ libreoffice-4.2.6.3/slideshow/source/engine/unoviewcontainer.cxx 2014-09-14 22:25:51.329303003 +1000
190 @@ -45,11 +45,12 @@
191 const UnoViewVector::iterator aEnd( maViews.end() );
192
193 // already added?
194 + uno::Reference<presentation::XSlideShowView> xView (rView->getUnoView());
195 if( ::std::find_if( maViews.begin(),
196 aEnd,
197 ::boost::bind(
198 ::std::equal_to< uno::Reference< presentation::XSlideShowView > >(),
199 - ::boost::cref( rView->getUnoView() ),
200 + ::boost::cref( xView ),
201 ::boost::bind(
202 &UnoView::getUnoView,
203 _1 ) ) ) != aEnd )
Report Message
Find on MARC Find on Google Groups