summaryrefslogtreecommitdiff
path: root/sfx2
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 /sfx2
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 'sfx2')
-rw-r--r--sfx2/inc/srchdlg.hxx1
-rw-r--r--sfx2/source/appl/newhelp.hxx1
-rw-r--r--sfx2/source/sidebar/Deck.cxx2
-rw-r--r--sfx2/source/sidebar/Deck.hxx3
4 files changed, 0 insertions, 7 deletions
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index f846a5267dbf..95b7a00c8ada 100644
--- a/sfx2/inc/srchdlg.hxx
+++ b/sfx2/inc/srchdlg.hxx
@@ -46,7 +46,6 @@ private:
Link m_aFindHdl;
Link m_aCloseHdl;
- OUString m_sToggleText;
OUString m_sConfigName;
OString m_sWinState;
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 46016d9eab1c..a910fd003438 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -497,7 +497,6 @@ friend class SfxHelpIndexWindow_Impl;
bool bGrabFocusToToolBox;
Point aWinPos;
OUString sTitle;
- OUString sKeyword;
virtual void Resize() SAL_OVERRIDE;
virtual void Split() SAL_OVERRIDE;
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index e5baf1c9d9bd..f294a1a1644b 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -47,8 +47,6 @@ Deck::Deck (
: Window(pParentWindow, 0),
msId(rDeckDescriptor.msId),
maIcon(),
- msIconURL(rDeckDescriptor.msIconURL),
- msHighContrastIconURL(rDeckDescriptor.msHighContrastIconURL),
mnMinimalWidth(0),
maPanels(),
mpTitleBar(new DeckTitleBar(rDeckDescriptor.msTitle, this, rCloserAction)),
diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx
index c071f1d3a5d2..b162a4373787 100644
--- a/sfx2/source/sidebar/Deck.hxx
+++ b/sfx2/source/sidebar/Deck.hxx
@@ -86,11 +86,8 @@ public:
};
private:
- const ::rtl::OUString msTitle;
const ::rtl::OUString msId;
Image maIcon;
- const ::rtl::OUString msIconURL;
- const ::rtl::OUString msHighContrastIconURL;
sal_Int32 mnMinimalWidth;
SharedPanelContainer maPanels;
::boost::scoped_ptr<DeckTitleBar> mpTitleBar;