summaryrefslogtreecommitdiff
path: root/include/xmloff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-10-15 15:58:56 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-10-15 15:58:56 +0200
commitad9498f8b888f7851a8612b8d654a2bc89005925 (patch)
treeff7e98ce301121fdddf44f2fc8cb42bd2b1fac4f /include/xmloff
parenteea16cb3e65a4308caddb7618d31a76ca259dbb1 (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 'include/xmloff')
-rw-r--r--include/xmloff/XMLTextMasterPageContext.hxx1
-rw-r--r--include/xmloff/xmlnume.hxx2
-rw-r--r--include/xmloff/xmlnumfi.hxx1
-rw-r--r--include/xmloff/xmlnumi.hxx1
4 files changed, 0 insertions, 5 deletions
diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx
index 929873b2d9d0..b562f652b03e 100644
--- a/include/xmloff/XMLTextMasterPageContext.hxx
+++ b/include/xmloff/XMLTextMasterPageContext.hxx
@@ -32,7 +32,6 @@ namespace com { namespace sun { namespace star {
class XMLOFF_DLLPUBLIC XMLTextMasterPageContext : public SvXMLStyleContext
{
const OUString sIsPhysical;
- const OUString sPageStyleLayout;
const OUString sFollowStyle;
OUString sFollow;
OUString sPageMasterName;
diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index f98c7b92f11a..8418ef26fe70 100644
--- a/include/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
@@ -40,8 +40,6 @@ class XMLTextListAutoStylePool;
class SvxXMLNumRuleExport
{
SvXMLExport& rExport;
- const OUString sCDATA;
- const OUString sWS;
const OUString sNumberingRules;
const OUString sIsPhysical;
const OUString sIsContinuousNumbering;
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index 201c4022cc28..e3426ac72dd7 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -128,7 +128,6 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext
OUString sFormatTitle;
// OUString sMapName;
OUString sCalendar;
- OUString sFormatString;
LanguageType nFormatLang;
com::sun::star::lang::Locale aLocale;
bool bAutoOrder;
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index 304fadd5a71c..4e7bc1591d5c 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -34,7 +34,6 @@ class SvxXMLListStyleContext : public SvXMLStyleContext
{
const OUString sIsPhysical;
const OUString sNumberingRules;
- const OUString sName;
const OUString sIsContinuousNumbering;
::com::sun::star::uno::Reference <