summaryrefslogtreecommitdiffstats
path: root/sw/source/ui/index/cnttab.cxx
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 /sw/source/ui/index/cnttab.cxx
parentResolves: #i63015# always default to WinAnsiEncoding... (diff)
downloadcore-ad9498f8b888f7851a8612b8d654a2bc89005925.tar.gz
core-ad9498f8b888f7851a8612b8d654a2bc89005925.zip
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 'sw/source/ui/index/cnttab.cxx')
-rw-r--r--sw/source/ui/index/cnttab.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 2ebdcee14dcd..9d26b38d0f42 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -191,14 +191,13 @@ class SwAutoMarkDlg_Impl : public ModalDialog
SwEntryBrowseBox* m_pEntriesBB;
OUString sAutoMarkURL;
- const OUString sAutoMarkType;
bool bCreateMode;
DECL_LINK(OkHdl, void *);
public:
SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAutoMarkURL,
- const OUString& rAutoMarkType, bool bCreate);
+ bool bCreate);
virtual ~SwAutoMarkDlg_Impl();
};
@@ -1447,7 +1446,7 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu)
}
boost::scoped_ptr<SwAutoMarkDlg_Impl> pAutoMarkDlg(new SwAutoMarkDlg_Impl(
- m_pAutoMarkPB, sAutoMarkURL, sAutoMarkType, bNew ));
+ m_pAutoMarkPB, sAutoMarkURL, bNew ));
if( RET_OK != pAutoMarkDlg->Execute() && bNew )
sAutoMarkURL = sSaveAutoMarkURL;
@@ -4012,11 +4011,10 @@ bool SwEntryBrowseBox::IsModified()const
}
SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAutoMarkURL,
- const OUString& rAutoMarkType, bool bCreate)
+ bool bCreate)
: ModalDialog(pParent, "CreateAutomarkDialog",
"modules/swriter/ui/createautomarkdialog.ui")
, sAutoMarkURL(rAutoMarkURL)
- , sAutoMarkType(rAutoMarkType)
, bCreateMode(bCreate)
{
get(m_pOKPB, "ok");