/[gentoo-x86]/app-office/libreoffice/files/libreoffice-4.0.0.3-boost-1.53.0.patch
Gentoo

Contents of /app-office/libreoffice/files/libreoffice-4.0.0.3-boost-1.53.0.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sat Feb 16 13:18:10 2013 UTC (22 months ago) by gienah
Branch: MAIN
Fix bug 454274 app-office/libreoffice-4.0.0.3: fails to build with dev-libs/boost-1.53.0. Tested with gcc 4.7.2. Add patch libreoffice-3.6.4.3-boost-1.53.0.patch for Bug 456162 - app-office/libreoffice-3.4.6.3: fails to build with dev-libs/boost-1.53.0 - not applied in the libreoffice-3.6.4.3.ebuild though as libreoffice-3.6.4.3 is stable and boost 1.53.0 is package masked.

(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

1 --- libreoffice-4.0.0.3-orig/comphelper/inc/comphelper/scoped_disposing_ptr.hxx 2013-01-31 21:54:53.000000000 +1100
2 +++ libreoffice-4.0.0.3/comphelper/inc/comphelper/scoped_disposing_ptr.hxx 2013-02-16 00:09:02.325443592 +1100
3 @@ -78,7 +78,7 @@
4
5 operator bool () const
6 {
7 - return m_aItem;
8 + return static_cast< bool >(m_aItem);
9 }
10
11 virtual ~scoped_disposing_ptr()
12 --- libreoffice-4.0.0.3-orig/slideshow/source/engine/animatedsprite.cxx 2013-01-31 21:54:53.000000000 +1100
13 +++ libreoffice-4.0.0.3/slideshow/source/engine/animatedsprite.cxx 2013-02-16 00:09:02.356444129 +1100
14 @@ -151,7 +151,7 @@
15 }
16 }
17
18 - return mpSprite;
19 + return static_cast< bool >(mpSprite);
20 }
21
22 void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize& rPixelOffset )
23 --- libreoffice-4.0.0.3-orig/slideshow/source/inc/shapeattributelayer.hxx 2013-01-31 21:54:53.000000000 +1100
24 +++ libreoffice-4.0.0.3/slideshow/source/inc/shapeattributelayer.hxx 2013-02-16 00:09:02.372444407 +1100
25 @@ -467,7 +467,7 @@
26 // ShapeAttributeLayer(const ShapeAttributeLayer&);
27 // ShapeAttributeLayer& operator=( const ShapeAttributeLayer& );
28
29 - bool haveChild() const { return mpChild; }
30 + bool haveChild() const { return static_cast< bool >(mpChild); }
31 void updateStateIds();
32
33 template< typename T > T calcValue( const T& rCurrValue,
34 --- libreoffice-4.0.0.3-orig/slideshow/source/inc/shapeattributelayerholder.hxx 2013-01-31 21:54:53.000000000 +1100
35 +++ libreoffice-4.0.0.3/slideshow/source/inc/shapeattributelayerholder.hxx 2013-02-16 00:09:02.374444442 +1100
36 @@ -83,7 +83,7 @@
37 if( mpShape )
38 mpAttributeLayer = mpShape->createAttributeLayer();
39
40 - return mpAttributeLayer;
41 + return static_cast< bool >(mpAttributeLayer);
42 }
43
44 ShapeAttributeLayerSharedPtr get() const
45 --- libreoffice-4.0.0.3-orig/slideshow/source/engine/shapesubset.cxx 2013-01-31 21:54:53.000000000 +1100
46 +++ libreoffice-4.0.0.3/slideshow/source/engine/shapesubset.cxx 2013-02-16 00:09:02.366444303 +1100
47 @@ -104,7 +104,7 @@
48 maTreeNode );
49 }
50
51 - return mpSubsetShape;
52 + return static_cast< bool >(mpSubsetShape);
53 }
54
55 void ShapeSubset::disableSubsetShape()
56 --- libreoffice-4.0.0.3-orig/slideshow/source/engine/shapes/viewshape.cxx 2013-01-31 21:54:53.000000000 +1100
57 +++ libreoffice-4.0.0.3/slideshow/source/engine/shapes/viewshape.cxx 2013-02-16 00:09:02.363444251 +1100
58 @@ -178,7 +178,7 @@
59 }
60 }
61
62 - return io_rCacheEntry.mpRenderer;
63 + return static_cast< bool >(io_rCacheEntry.mpRenderer);
64 }
65
66 bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
67 --- libreoffice-4.0.0.3-orig/slideshow/source/engine/slide/slideanimations.cxx 2013-01-31 21:54:53.000000000 +1100
68 +++ libreoffice-4.0.0.3/slideshow/source/engine/slide/slideanimations.cxx 2013-02-16 00:09:02.369444355 +1100
69 @@ -74,7 +74,7 @@
70
71 SHOW_NODE_TREE( mpRootNode );
72
73 - return mpRootNode;
74 + return static_cast< bool >(mpRootNode);
75 }
76
77 bool SlideAnimations::isAnimated() const
78 --- libreoffice-4.0.0.3-orig/sw/source/core/inc/bookmrk.hxx 2013-01-31 21:54:53.000000000 +1100
79 +++ libreoffice-4.0.0.3/sw/source/core/inc/bookmrk.hxx 2013-02-16 00:09:02.377444493 +1100
80 @@ -75,7 +75,7 @@
81
82 virtual bool IsCoveringPosition(const SwPosition& rPos) const;
83 virtual bool IsExpanded() const
84 - { return m_pPos2; }
85 + { return static_cast< bool >(m_pPos2); }
86
87 virtual void SetName(const ::rtl::OUString& rName)
88 { m_aName = rName; }
89 --- libreoffice-4.0.0.3-orig/sc/source/filter/excel/xechart.cxx 2013-01-31 21:54:53.000000000 +1100
90 +++ libreoffice-4.0.0.3/sc/source/filter/excel/xechart.cxx 2013-02-16 00:09:02.336443783 +1100
91 @@ -682,7 +682,7 @@
92
93 bool XclExpChEscherFormat::IsValid() const
94 {
95 - return maData.mxEscherSet;
96 + return static_cast< bool >(maData.mxEscherSet);
97 }
98
99 void XclExpChEscherFormat::Save( XclExpStream& rStrm )
100 --- libreoffice-4.0.0.3-orig/sc/source/filter/excel/xehelper.cxx 2013-01-31 21:54:53.000000000 +1100
101 +++ libreoffice-4.0.0.3/sc/source/filter/excel/xehelper.cxx 2013-02-16 00:09:02.341443869 +1100
102 @@ -303,7 +303,7 @@
103 if( GetBiff() == EXC_BIFF8 ) // no HLINK records in BIFF2-BIFF7
104 {
105 // there was/is already a HLINK record
106 - mbMultipleUrls = mxLinkRec;
107 + mbMultipleUrls = static_cast< bool >(mxLinkRec);
108
109 mxLinkRec.reset( new XclExpHyperlink( GetRoot(), rUrlField, maScPos ) );
110
111 --- libreoffice-4.0.0.3-orig/sc/source/filter/excel/xichart.cxx 2013-01-31 21:54:53.000000000 +1100
112 +++ libreoffice-4.0.0.3/sc/source/filter/excel/xichart.cxx 2013-02-16 00:09:02.348443991 +1100
113 @@ -2688,7 +2688,7 @@
114 maType.Finalize( bStockChart );
115
116 // extended type info
117 - maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d, false );
118 + maTypeInfo.Set( maType.GetTypeInfo(), static_cast< bool >(mxChart3d), false );
119
120 // reverse series order for some unstacked 2D chart types
121 if( maTypeInfo.mbReverseSeries && !Is3dChart() && !maType.IsStacked() && !maType.IsPercent() )
122 --- libreoffice-4.0.0.3-orig/sc/source/filter/inc/xichart.hxx 2013-01-31 21:54:53.000000000 +1100
123 +++ libreoffice-4.0.0.3/sc/source/filter/inc/xichart.hxx 2013-02-16 00:09:02.353444077 +1100
124 @@ -1230,9 +1230,9 @@
125 /** Returns true, if the axis contains caption labels. */
126 inline bool HasLabels() const { return !mxTick || mxTick->HasLabels(); }
127 /** Returns true, if the axis shows its major grid lines. */
128 - inline bool HasMajorGrid() const { return mxMajorGrid; }
129 + inline bool HasMajorGrid() const { return static_cast< bool >(mxMajorGrid); }
130 /** Returns true, if the axis shows its minor grid lines. */
131 - inline bool HasMinorGrid() const { return mxMinorGrid; }
132 + inline bool HasMinorGrid() const { return static_cast< bool >(mxMinorGrid); }
133
134 /** Creates an API axis object. */
135 XAxisRef CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const;
136 --- libreoffice-4.0.0.3-orig/vcl/source/gdi/svgdata.cxx 2013-01-31 21:54:53.000000000 +1100
137 +++ libreoffice-4.0.0.3/vcl/source/gdi/svgdata.cxx 2013-02-16 00:07:00.382345866 +1100
138 @@ -166,7 +166,7 @@
139
140 //////////////////////////////////////////////////////////////////////////////
141 SvgData::SvgData(const OUString& rPath):
142 - maSvgDataArray(NULL),
143 + maSvgDataArray(static_cast< unsigned char * >(NULL)),
144 mnSvgDataArrayLength(0),
145 maPath(rPath),
146 maRange(),

  ViewVC Help
Powered by ViewVC 1.1.20