diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-07-24 21:50:58 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-07-24 21:50:58 +0200 |
commit | ee35719f07d500aa19b6d0a166446e3135044e70 (patch) | |
tree | 391ce5f5f7be2c4d564780e25ff2671e5b6ec370 | |
parent | 309e09b044b351711dee174d56f947eb1c619aaa (diff) |
-Werror,-Wunused-private-field
Change-Id: I3104a661b7c00851f6e444eb6899483bfc9c7417
-rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 3 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlimprt.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/condformatuno.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/inc/tpsort.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/unoobj/condformatuno.cxx | 3 | ||||
-rw-r--r-- | sd/inc/CustomAnimationEffect.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.cxx | 5 | ||||
-rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.hxx | 2 | ||||
-rw-r--r-- | sw/inc/dbmgr.hxx | 1 | ||||
-rw-r--r-- | sw/inc/docufld.hxx | 1 | ||||
-rw-r--r-- | sw/source/filter/xml/XMLRedlineImportHelper.cxx | 1 | ||||
-rw-r--r-- | sw/source/filter/xml/XMLRedlineImportHelper.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/inc/popbox.hxx | 1 |
13 files changed, 1 insertions, 25 deletions
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 959fcb6c657e..61953d7388c5 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -99,7 +99,6 @@ #include <utility> #define SC_LOCALE "Locale" -#define SC_STANDARDFORMAT "StandardFormat" #define SC_CURRENCYSYMBOL "CurrencySymbol" #define SC_REPEAT_ROW "repeat-row" #define SC_FILTER "filter" @@ -1992,8 +1991,6 @@ ScXMLImport::ScXMLImport( sNumberFormat(SC_UNONAME_NUMFMT), sLocale(SC_LOCALE), sCellStyle(SC_UNONAME_CELLSTYL), - sStandardFormat(SC_STANDARDFORMAT), - sType(SC_UNONAME_TYPE), pDocElemTokenMap( 0 ), pStylesElemTokenMap( 0 ), pStylesAttrTokenMap( 0 ), diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 527e823b3e2f..6efb408669b1 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -841,8 +841,6 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable OUString sNumberFormat; OUString sLocale; OUString sCellStyle; - OUString sStandardFormat; - OUString sType; rtl::Reference < XMLPropertyHandlerFactory > xScPropHdlFactory; rtl::Reference < XMLPropertySetMapper > xCellStylesPropertySetMapper; diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx index 2342ab0f414d..40f4c78b0370 100644 --- a/sc/source/ui/inc/condformatuno.hxx +++ b/sc/source/ui/inc/condformatuno.hxx @@ -288,7 +288,6 @@ public: ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - ScDocShell* mpDocShell; rtl::Reference<ScCondFormatObj> mxParent; SfxItemPropertySet maPropSet; const ScColorScaleFormat* mpFormat; @@ -382,7 +381,6 @@ public: ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - ScDocShell* mpDocShell; rtl::Reference<ScCondFormatObj> mxParent; SfxItemPropertySet maPropSet; const ScDataBarFormat* mpFormat; @@ -470,7 +468,6 @@ public: ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - ScDocShell* mpDocShell; rtl::Reference<ScCondFormatObj> mxParent; SfxItemPropertySet maPropSet; const ScIconSetFormat* mpFormat; diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index c4d516728a3b..0aa944192ba9 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -148,7 +148,6 @@ private: OUString aStrRowLabel; OUString aStrColLabel; OUString aStrUndefined; - OUString aStrAreaLabel; const sal_uInt16 nWhichSort; ScSortParam aSortData; diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx index 3b0a2f4d4c2a..9de1449e2d05 100644 --- a/sc/source/ui/unoobj/condformatuno.cxx +++ b/sc/source/ui/unoobj/condformatuno.cxx @@ -869,7 +869,6 @@ void SAL_CALL ScConditionEntryObj::removeVetoableChangeListener( const OUString& ScColorScaleFormatObj::ScColorScaleFormatObj(rtl::Reference<ScCondFormatObj> xParent, const ScColorScaleFormat* pFormat): - mpDocShell(xParent->getDocShell()), mxParent(xParent), maPropSet(getColorScalePropSet()), mpFormat(pFormat) @@ -1142,7 +1141,6 @@ void ScColorScaleEntryObj::setFormula(const OUString& rFormula) ScDataBarFormatObj::ScDataBarFormatObj(rtl::Reference<ScCondFormatObj> xParent, const ScDataBarFormat* pFormat): - mpDocShell(xParent->getDocShell()), mxParent(xParent), maPropSet(getDataBarPropSet()), mpFormat(pFormat) @@ -1543,7 +1541,6 @@ void ScDataBarEntryObj::setFormula(const OUString& rFormula) ScIconSetFormatObj::ScIconSetFormatObj(rtl::Reference<ScCondFormatObj> xParent, const ScIconSetFormat* pFormat): - mpDocShell(xParent->getDocShell()), mxParent(xParent), maPropSet(getIconSetPropSet()), mpFormat(pFormat) diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index ceb7333d08c8..c4f892b5f2ed 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -195,8 +195,6 @@ private: EffectSequenceHelper* mpEffectSequence; - OUString maName; - ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxNode; ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio > mxAudio; ::com::sun::star::uno::Any maTarget; diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 86f2afd1f2ca..c4892adddf40 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -412,14 +412,12 @@ namespace sd SlideTransitionPane::SlideTransitionPane( Window * pParent, ViewShellBase & rBase, - const Size& rMinSize, SdDrawDocument* pDoc, const css::uno::Reference<css::frame::XFrame>& rxFrame ) : PanelLayout( pParent, "SlideTransitionsPanel", "modules/simpress/ui/slidetransitionspanel.ui", rxFrame ), mrBase( rBase ), mpDrawDoc( pDoc ), - maMinSize( rMinSize ), mbHasSelection( false ), mbUpdatingControls( false ), mbIsMainViewChangePending( false ), @@ -1089,8 +1087,7 @@ vcl::Window * createSlideTransitionPanel( vcl::Window* pParent, ViewShellBase& r DrawDocShell* pDocSh = rBase.GetDocShell(); if( pDocSh ) { - Size aMinSize( pParent->LogicToPixel( Size( 72, 216 ), MAP_APPFONT ) ); - pWindow = VclPtr<SlideTransitionPane>::Create( pParent, rBase, aMinSize, pDocSh->GetDoc(), rxFrame ); + pWindow = VclPtr<SlideTransitionPane>::Create( pParent, rBase, pDocSh->GetDoc(), rxFrame ); } return pWindow; diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx index 24606c146dca..eac11eba8b94 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hxx +++ b/sd/source/ui/animations/SlideTransitionPane.hxx @@ -54,7 +54,6 @@ public: explicit SlideTransitionPane( Window * pParent, ViewShellBase & rBase, - const Size& rMinSize, SdDrawDocument* pDoc, const css::uno::Reference<css::frame::XFrame>& rxFrame ); virtual ~SlideTransitionPane(); @@ -101,7 +100,6 @@ private: ViewShellBase & mrBase; SdDrawDocument * mpDrawDoc; - Size maMinSize; VclPtr<ListBox> mpLB_SLIDE_TRANSITIONS; VclPtr<FixedText> mpFT_SPEED; diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 4c2bbfa13ff6..5febdf4b03b4 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -192,7 +192,6 @@ friend class SwConnectionDisposedListener_Impl; OUString sEMailAddrField; ///< Mailing: Column name of email address. OUString sSubject; ///< Mailing: Subject - OUString sAttached; ///< Mailing: Attached Files. bool bCancel; ///< Mail merge canceled. bool bInitDBFields : 1; bool bInMerge : 1; ///< merge process active diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index db71e007e32e..1636a5f64a78 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -525,7 +525,6 @@ public: // Extended User settings. class SwExtUserFieldType : public SwFieldType { - OUString aData; public: SwExtUserFieldType(); diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index 81290dc4e980..099d0c6e8318 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -240,7 +240,6 @@ XMLRedlineImportHelper::XMLRedlineImportHelper( bool bNoRedlinesPlease, const Reference<XPropertySet> & rModel, const Reference<XPropertySet> & rImportInfo ) : - sEmpty(), sInsertion( GetXMLToken( XML_INSERTION )), sDeletion( GetXMLToken( XML_DELETION )), sFormatChange( GetXMLToken( XML_FORMAT_CHANGE )), diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx index bd73f09c6cab..277de4699579 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx @@ -40,7 +40,6 @@ typedef ::std::map< OUString, RedlineInfo* > RedlineMapType; class XMLRedlineImportHelper { - const OUString sEmpty; const OUString sInsertion; const OUString sDeletion; const OUString sFormatChange; diff --git a/sw/source/uibase/inc/popbox.hxx b/sw/source/uibase/inc/popbox.hxx index bfe10e8ea280..e4b0c66f96f1 100644 --- a/sw/source/uibase/inc/popbox.hxx +++ b/sw/source/uibase/inc/popbox.hxx @@ -26,7 +26,6 @@ class SwNavigationPI; class SwHelpToolBox: public ToolBox, public DropTargetHelper { - Link<> aDoubleClickLink; Link<> aRightClickLink; // link gets mouse event as parameter !!! using ToolBox::DoubleClick; |