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 /lotuswordpro | |
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 'lotuswordpro')
-rw-r--r-- | lotuswordpro/source/filter/lwpbulletstylemgr.hxx | 1 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwptablelayout.hxx | 1 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfcell.hxx | 1 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfindex.hxx | 3 |
4 files changed, 0 insertions, 6 deletions
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx index 94622b2c9f46..8b5b8acad2e4 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx @@ -101,7 +101,6 @@ private: typedef std::pair<boost::shared_ptr<LwpBulletOverride>, LwpObjectID> OverridePair; std::vector <OUString> m_vStyleNameList; std::vector <OverridePair> m_vIDsPairList; - OUString m_aCurrentStyleName; LwpFoundry* m_pFoundry; XFList* m_pBulletList; bool m_bContinue; diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx index 71ddcfdfd5d4..97f8e6bc8602 100644 --- a/lotuswordpro/source/filter/lwptablelayout.hxx +++ b/lotuswordpro/source/filter/lwptablelayout.hxx @@ -118,7 +118,6 @@ protected: private: //CColumnLayoutHead cColumnLayout; LwpObjectID m_ColumnLayout; - OUString m_FrameStyleName; LwpCellLayout * m_pDefaultCellLayout; OUString m_DefaultColumnStyleName; OUString m_DefaultRowStyleName; diff --git a/lotuswordpro/source/filter/xfilter/xfcell.hxx b/lotuswordpro/source/filter/xfilter/xfcell.hxx index 8f62f0849cf7..9ae0010f4e62 100644 --- a/lotuswordpro/source/filter/xfilter/xfcell.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcell.hxx @@ -164,7 +164,6 @@ private: sal_Int32 m_nRepeated; enumXFValueType m_eValueType; OUString m_strValue; - OUString m_strDisplay; OUString m_strFormula; bool m_bProtect; }; diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx index add2470b882e..6d09ac5ecd60 100644 --- a/lotuswordpro/source/filter/xfilter/xfindex.hxx +++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx @@ -128,8 +128,6 @@ private: typedef std::pair<enumXFIndexTemplate, OUString> TOCTEMPLATE_ENTRY_TYPE; std::vector<TOCTEMPLATE_ENTRY_TYPE> m_aEntries; // template entry + text style std::map<sal_uInt16, OUString> m_aTextEntries; - - OUString m_strChapterTextStyle; }; /** @@ -171,7 +169,6 @@ public: private: enumXFIndex m_eType; OUString m_strTitle; - OUString m_strSectStyle; bool m_bProtect; bool m_bSeparator; XFParagraph* m_pTitle; |