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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sun Mar 17 21:02:55 2013 UTC (20 months, 1 week ago) by gienah
Branch: MAIN
Fix bug 454274 >=app-office/libreoffice-4.0.0.2: fails to build with dev-libs/boost-1.53.0. Thanks to cJ for earlier proposed patch and testing.

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

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

  ViewVC Help
Powered by ViewVC 1.1.20