diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-15 15:58:56 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-15 15:58:56 +0200 |
commit | ad9498f8b888f7851a8612b8d654a2bc89005925 (patch) | |
tree | ff7e98ce301121fdddf44f2fc8cb42bd2b1fac4f /xmloff/source/chart | |
parent | eea16cb3e65a4308caddb7618d31a76ca259dbb1 (diff) |
More -Werror,-Wunused-private-field
...detected with a modified trunk Clang with
> Index: lib/Sema/SemaDeclCXX.cpp
> ===================================================================
> --- lib/Sema/SemaDeclCXX.cpp (revision 219190)
> +++ lib/Sema/SemaDeclCXX.cpp (working copy)
> @@ -1917,9 +1917,10 @@
> const Type *T = FD.getType()->getBaseElementTypeUnsafe();
> // FIXME: Destruction of ObjC lifetime types has side-effects.
> if (const CXXRecordDecl *RD = T->getAsCXXRecordDecl())
> - return !RD->isCompleteDefinition() ||
> - !RD->hasTrivialDefaultConstructor() ||
> - !RD->hasTrivialDestructor();
> + return !RD->hasAttr<WarnUnusedAttr>() &&
> + (!RD->isCompleteDefinition() ||
> + !RD->hasTrivialDefaultConstructor() ||
> + !RD->hasTrivialDestructor());
> return false;
> }
>
> @@ -3517,9 +3518,11 @@
> bool addFieldInitializer(CXXCtorInitializer *Init) {
> AllToInit.push_back(Init);
>
> +#if 0
> // Check whether this initializer makes the field "used".
> if (Init->getInit()->HasSideEffects(S.Context))
> S.UnusedPrivateFields.remove(Init->getAnyMember());
> +#endif
>
> return false;
> }
to warn about members of SAL_WARN_UNUSED-annotated class types, and warn about
initializations with side effects (cf.
<http://lists.cs.uiuc.edu/pipermail/cfe-dev/2014-October/039602.html>
"-Wunused-private-field distracted by side effects").
Change-Id: I3f3181c4eb8180ca28e1fa3dffc9dbe1002c6628
Diffstat (limited to 'xmloff/source/chart')
4 files changed, 1 insertions, 6 deletions
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx index 3a4b075d9677..a68e49a636a7 100644 --- a/xmloff/source/chart/SchXMLChartContext.hxx +++ b/xmloff/source/chart/SchXMLChartContext.hxx @@ -105,7 +105,6 @@ private: ::com::sun::star::chart::ChartDataRowSource meDataRowSource; bool mbIsStockChart; - com::sun::star::uno::Sequence< com::sun::star::chart::ChartSeriesAddress > maSeriesAddresses; OUString msCategoriesAddress; OUString msChartAddress; diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx index 3cdafbb52ff0..598d89b89b63 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx @@ -43,7 +43,6 @@ SchXMLRegressionCurveObjectContext::SchXMLRegressionCurveObjectContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const OUString &rSeriesStyleName, std::list< RegressionStyle >& rRegressionStyleList, const css::uno::Reference< css::chart2::XDataSeries >& xSeries, @@ -52,7 +51,6 @@ SchXMLRegressionCurveObjectContext::SchXMLRegressionCurveObjectContext( mrImportHelper( rImpHelper ), mxSeries( xSeries ), maChartSize( rChartSize ), - maSeriesStyleName( rSeriesStyleName), mrRegressionStyleList( rRegressionStyleList ) { } diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx index f0b3625edd4a..0905b65e33f8 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx @@ -35,7 +35,6 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const OUString &rSeriesStyleName, std::list< RegressionStyle >& rRegressionStyleList, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, @@ -54,7 +53,6 @@ private: SchXMLImportHelper& mrImportHelper; com::sun::star::uno::Reference<com::sun::star::chart2::XDataSeries > mxSeries; com::sun::star::awt::Size maChartSize; - OUString maSeriesStyleName; std::list< RegressionStyle >& mrRegressionStyleList; }; diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index c86ea58a24bc..2c13b80983f2 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -665,7 +665,7 @@ SvXMLImportContext* SchXMLSeries2Context::CreateChildContext( case XML_TOK_SERIES_REGRESSION_CURVE: pContext = new SchXMLRegressionCurveObjectContext( mrImportHelper, GetImport(), - nPrefix, rLocalName, msAutoStyleName, mrRegressionStyleList, + nPrefix, rLocalName, mrRegressionStyleList, m_xSeries, maChartSize ); break; case XML_TOK_SERIES_ERROR_INDICATOR: |