diff options
| author | Mark Wright <markwright@internode.on.net> | 2013-02-10 02:04:02 +1100 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-02-09 22:41:50 +0000 |
| commit | d4bab97023e3569571a92551040574b20aceca7c (patch) | |
| tree | fb465a0fe21abe9ce6269fb71613cba7caeea90b /sc | |
| parent | 020e2b900b017d64a52f494707015a0e2e959d63 (diff) | |
fix compile for change to boost 1.53.0 declaring smart pointer operator bool as explicity for C++11 compilers
Change-Id: If2c3ad68b2ffea645a9f2035cd802553edc0ee79
Reviewed-on: https://gerrit.libreoffice.org/2064
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xechart.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xehelper.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xichart.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/inc/xichart.hxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index fd99e8bf4608..75a2eb2b17fe 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -683,7 +683,7 @@ void XclExpChEscherFormat::Convert( const ScfPropertySet& rPropSet, XclChObjectT bool XclExpChEscherFormat::IsValid() const { - return maData.mxEscherSet; + return static_cast< bool >(maData.mxEscherSet); } void XclExpChEscherFormat::Save( XclExpStream& rStrm ) diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index c493560432d9..81e9ac2fa52a 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -303,7 +303,7 @@ rtl::OUString XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlFie if( GetBiff() == EXC_BIFF8 ) // no HLINK records in BIFF2-BIFF7 { // there was/is already a HLINK record - mbMultipleUrls = mxLinkRec; + mbMultipleUrls = static_cast< bool >(mxLinkRec); mxLinkRec.reset( new XclExpHyperlink( GetRoot(), rUrlField, maScPos ) ); diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 63c9c433a9f5..f2321bf3c61e 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -2690,7 +2690,7 @@ void XclImpChTypeGroup::Finalize() maType.Finalize( bStockChart ); // extended type info - maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d, false ); + maTypeInfo.Set( maType.GetTypeInfo(), static_cast< bool >(mxChart3d), false ); // reverse series order for some unstacked 2D chart types if( maTypeInfo.mbReverseSeries && !Is3dChart() && !maType.IsStacked() && !maType.IsPercent() ) diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 57538f05fc24..7c444126822b 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -1230,9 +1230,9 @@ public: /** Returns true, if the axis contains caption labels. */ inline bool HasLabels() const { return !mxTick || mxTick->HasLabels(); } /** Returns true, if the axis shows its major grid lines. */ - inline bool HasMajorGrid() const { return mxMajorGrid; } + inline bool HasMajorGrid() const { return static_cast< bool >(mxMajorGrid); } /** Returns true, if the axis shows its minor grid lines. */ - inline bool HasMinorGrid() const { return mxMinorGrid; } + inline bool HasMinorGrid() const { return static_cast< bool >(mxMinorGrid); } /** Creates an API axis object. */ XAxisRef CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const; |