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

Contents of /app-office/libreoffice/files/libreoffice-3.6.4.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 (16 months, 3 weeks 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-core-3.6.4.3-orig/comphelper/inc/comphelper/scoped_disposing_ptr.hxx 2012-11-28 19:29:53.000000000 +1100
2 +++ libreoffice-core-3.6.4.3/comphelper/inc/comphelper/scoped_disposing_ptr.hxx 2013-02-09 00:09:13.608271375 +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-core-3.6.4.3-orig/slideshow/source/engine/animatedsprite.cxx 2012-11-28 19:29:53.000000000 +1100
13 +++ libreoffice-core-3.6.4.3/slideshow/source/engine/animatedsprite.cxx 2013-02-09 00:09:13.610271414 +1100
14 @@ -160,7 +160,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-core-3.6.4.3-orig/slideshow/source/inc/shapeattributelayer.hxx 2012-11-28 19:29:53.000000000 +1100
24 +++ libreoffice-core-3.6.4.3/slideshow/source/inc/shapeattributelayer.hxx 2013-02-09 00:09:13.613271472 +1100
25 @@ -476,7 +476,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-core-3.6.4.3-orig/slideshow/source/inc/shapeattributelayerholder.hxx 2012-11-28 19:29:53.000000000 +1100
35 +++ libreoffice-core-3.6.4.3/slideshow/source/inc/shapeattributelayerholder.hxx 2013-02-09 00:09:13.615271511 +1100
36 @@ -92,7 +92,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-core-3.6.4.3-orig/slideshow/source/engine/shapesubset.cxx 2012-11-28 19:29:53.000000000 +1100
46 +++ libreoffice-core-3.6.4.3/slideshow/source/engine/shapesubset.cxx 2013-02-09 00:09:13.617271550 +1100
47 @@ -113,7 +113,7 @@
48 maTreeNode );
49 }
50
51 - return mpSubsetShape;
52 + return static_cast< bool >(mpSubsetShape);
53 }
54
55 void ShapeSubset::disableSubsetShape()
56 --- libreoffice-core-3.6.4.3-orig/slideshow/source/engine/shapes/viewshape.cxx 2012-11-28 19:29:53.000000000 +1100
57 +++ libreoffice-core-3.6.4.3/slideshow/source/engine/shapes/viewshape.cxx 2013-02-09 00:09:13.621271628 +1100
58 @@ -187,7 +187,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-core-3.6.4.3-orig/slideshow/source/engine/slide/slideanimations.cxx 2012-11-28 19:29:53.000000000 +1100
68 +++ libreoffice-core-3.6.4.3/slideshow/source/engine/slide/slideanimations.cxx 2013-02-09 00:09:13.623271666 +1100
69 @@ -83,7 +83,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-core-3.6.4.3-orig/sc/source/core/data/colorscale.cxx 2012-11-28 19:29:53.000000000 +1100
79 +++ libreoffice-core-3.6.4.3/sc/source/core/data/colorscale.cxx 2013-02-09 00:09:13.627271744 +1100
80 @@ -219,7 +219,7 @@
81
82 bool ScColorScaleEntry::HasFormula() const
83 {
84 - return mpCell;
85 + return static_cast< bool >(mpCell);
86 }
87
88 void ScColorScaleEntry::SetMin(bool bMin)
89 --- libreoffice-core-3.6.4.3-orig/sw/source/core/inc/bookmrk.hxx 2012-11-28 19:29:53.000000000 +1100
90 +++ libreoffice-core-3.6.4.3/sw/source/core/inc/bookmrk.hxx 2013-02-09 00:09:13.629271783 +1100
91 @@ -84,7 +84,7 @@
92
93 virtual bool IsCoveringPosition(const SwPosition& rPos) const;
94 virtual bool IsExpanded() const
95 - { return m_pPos2; }
96 + { return static_cast< bool >(m_pPos2); }
97
98 virtual void SetName(const ::rtl::OUString& rName)
99 { m_aName = rName; }
100 --- libreoffice-core-3.6.4.3-orig/sd/source/ui/slidesorter/view/SlsButtonBar.cxx 2012-11-28 19:29:53.000000000 +1100
101 +++ libreoffice-core-3.6.4.3/sd/source/ui/slidesorter/view/SlsButtonBar.cxx 2013-02-09 00:09:13.632271841 +1100
102 @@ -401,7 +401,7 @@
103
104 bool ButtonBar::IsMouseOverButton (void) const
105 {
106 - return mpButtonUnderMouse;
107 + return static_cast< bool >(mpButtonUnderMouse);
108 }
109
110
111 --- libreoffice-core-3.6.4.3-orig/writerfilter/source/dmapper/StyleSheetTable.cxx 2012-11-28 19:29:53.000000000 +1100
112 +++ libreoffice-core-3.6.4.3/writerfilter/source/dmapper/StyleSheetTable.cxx 2013-02-09 00:10:20.949580346 +1100
113 @@ -169,7 +169,7 @@
114 pStack->push_back(pEntry);
115
116 TableStyleSheetEntry* pParent = static_cast<TableStyleSheetEntry *>( pEntry.get( ) );
117 - pProps->insert( pParent->GetProperties( nMask ), pStack );
118 + pProps->insert( pParent->GetProperties( nMask ), static_cast< bool >(pStack) );
119
120 pStack->pop_back();
121 }
122 --- libreoffice-core-3.6.4.3-orig/sc/source/filter/excel/xechart.cxx 2012-11-28 19:29:53.000000000 +1100
123 +++ libreoffice-core-3.6.4.3/sc/source/filter/excel/xechart.cxx 2013-02-09 00:09:13.645272093 +1100
124 @@ -691,7 +691,7 @@
125
126 bool XclExpChEscherFormat::IsValid() const
127 {
128 - return maData.mxEscherSet;
129 + return static_cast< bool >(maData.mxEscherSet);
130 }
131
132 void XclExpChEscherFormat::Save( XclExpStream& rStrm )
133 --- libreoffice-core-3.6.4.3-orig/sc/source/filter/excel/xehelper.cxx 2012-11-28 19:29:53.000000000 +1100
134 +++ libreoffice-core-3.6.4.3/sc/source/filter/excel/xehelper.cxx 2013-02-09 00:09:13.648272151 +1100
135 @@ -312,7 +312,7 @@
136 if( GetBiff() == EXC_BIFF8 ) // no HLINK records in BIFF2-BIFF7
137 {
138 // there was/is already a HLINK record
139 - mbMultipleUrls = mxLinkRec;
140 + mbMultipleUrls = static_cast< bool >(mxLinkRec);
141
142 mxLinkRec.reset( new XclExpHyperlink( GetRoot(), rUrlField, maScPos ) );
143
144 --- libreoffice-core-3.6.4.3-orig/sc/source/filter/excel/xichart.cxx 2012-11-28 19:29:53.000000000 +1100
145 +++ libreoffice-core-3.6.4.3/sc/source/filter/excel/xichart.cxx 2013-02-09 00:09:13.656272306 +1100
146 @@ -2698,7 +2698,7 @@
147 maType.Finalize( bStockChart );
148
149 // extended type info
150 - maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d, false );
151 + maTypeInfo.Set( maType.GetTypeInfo(), static_cast< bool >(mxChart3d), false );
152
153 // reverse series order for some unstacked 2D chart types
154 if( maTypeInfo.mbReverseSeries && !Is3dChart() && !maType.IsStacked() && !maType.IsPercent() )
155 --- libreoffice-core-3.6.4.3-orig/sc/source/filter/inc/xichart.hxx 2012-11-28 19:29:53.000000000 +1100
156 +++ libreoffice-core-3.6.4.3/sc/source/filter/inc/xichart.hxx 2013-02-09 00:09:13.661272403 +1100
157 @@ -1240,9 +1240,9 @@
158 /** Returns true, if the axis contains caption labels. */
159 inline bool HasLabels() const { return !mxTick || mxTick->HasLabels(); }
160 /** Returns true, if the axis shows its major grid lines. */
161 - inline bool HasMajorGrid() const { return mxMajorGrid; }
162 + inline bool HasMajorGrid() const { return static_cast< bool >(mxMajorGrid); }
163 /** Returns true, if the axis shows its minor grid lines. */
164 - inline bool HasMinorGrid() const { return mxMinorGrid; }
165 + inline bool HasMinorGrid() const { return static_cast< bool >(mxMinorGrid); }
166
167 /** Creates an API axis object. */
168 XAxisRef CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const;

  ViewVC Help
Powered by ViewVC 1.1.20