idl/inc/hash.hxx | 8 ++------ idl/source/cmptools/hash.cxx | 2 +- include/editeng/numitem.hxx | 10 ++++------ include/svx/svdcrtv.hxx | 1 - include/svx/svdoashp.hxx | 1 - sd/inc/anminfo.hxx | 1 - sd/source/core/anminfo.cxx | 2 -- sd/source/ui/dlg/TemplateScanner.cxx | 3 +-- sd/source/ui/inc/TemplateScanner.hxx | 5 ++--- sdext/source/presenter/PresenterToolBar.cxx | 7 ------- svx/source/svdraw/svdoashp.cxx | 1 - vcl/opengl/PackedTextureAtlas.cxx | 2 -- xmloff/source/text/XMLPropertyBackpatcher.cxx | 1 - xmloff/source/text/XMLPropertyBackpatcher.hxx | 3 --- 14 files changed, 10 insertions(+), 37 deletions(-)
New commits: commit fbd23182ee1804fd87a13d79a71e231549767408 Author: Noel Grandin <n...@peralex.com> Date: Wed Jun 29 09:09:05 2016 +0200 loplugin:unusedfields Change-Id: If06fffa8db050df0f9c1c7da6163575bf522382e Reviewed-on: https://gerrit.libreoffice.org/26754 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noelgran...@gmail.com> diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx index a2e923c..6546ca7 100644 --- a/idl/inc/hash.hxx +++ b/idl/inc/hash.hxx @@ -52,19 +52,16 @@ class SvStringHashEntry : public SvRefBase { friend class SvStringHashTable; OString aName; - sal_uInt32 nHashId; sal_uLong nValue; bool bHasId; public: SvStringHashEntry() - : nHashId(0) - , nValue(0) + : nValue(0) , bHasId(false) { } - SvStringHashEntry( const OString& rName, sal_uInt32 nIdx ) + SvStringHashEntry( const OString& rName ) : aName(rName) - , nHashId(nIdx) , nValue(0) , bHasId(true) { @@ -80,7 +77,6 @@ public: SvStringHashEntry & operator = ( const SvStringHashEntry & rRef ) { SvRefBase::operator=( rRef ); aName = rRef.aName; - nHashId = rRef.nHashId; nValue = rRef.nValue; bHasId = rRef.bHasId; return *this; diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx index fc63730..a03f4cd 100644 --- a/idl/source/cmptools/hash.cxx +++ b/idl/source/cmptools/hash.cxx @@ -167,7 +167,7 @@ bool SvStringHashTable::Insert( const OString& rName, sal_uInt32 * pIndex ) return false; if( !IsEntry( *pIndex ) ) - pEntries[ *pIndex ] = SvStringHashEntry( rName, *pIndex ); + pEntries[ *pIndex ] = SvStringHashEntry( rName ); return true; } diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index 2d67dd1..13ffac0 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -315,11 +315,10 @@ public: class SvxNodeNum { sal_uInt16 nLevelVal[ SVX_MAX_NUM ]; // Numbers of all levels - sal_uInt16 nSetValue; // predetermined number - sal_uInt8 nMyLevel; // Current Level + sal_uInt8 nMyLevel; // Current Level public: - explicit inline SvxNodeNum( sal_uInt16 nSetVal = USHRT_MAX ); + explicit inline SvxNodeNum(); inline SvxNodeNum& operator=( const SvxNodeNum& rCpy ); sal_uInt8 GetLevel() const { return nMyLevel; } @@ -329,8 +328,8 @@ public: sal_uInt16* GetLevelVal() { return nLevelVal; } }; -SvxNodeNum::SvxNodeNum( sal_uInt16 nSetVal ) - : nSetValue( nSetVal ), nMyLevel( 0 ) +SvxNodeNum::SvxNodeNum() + : nMyLevel( 0 ) { memset( nLevelVal, 0, sizeof( nLevelVal ) ); } @@ -339,7 +338,6 @@ inline SvxNodeNum& SvxNodeNum::operator=( const SvxNodeNum& rCpy ) { if ( &rCpy != this) { - nSetValue = rCpy.nSetValue; nMyLevel = rCpy.nMyLevel; memcpy( nLevelVal, rCpy.nLevelVal, sizeof( nLevelVal ) ); diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index 83fc407..33fa675 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -51,7 +51,6 @@ protected: sal_uInt32 nAktInvent; // set the current ones sal_uInt16 nAktIdent; // Obj for re-creating - bool bAutoTextEdit : 1; // Textedit after we start the creation of a text frame bool b1stPointAsCenter : 1; bool bUseIncompatiblePathCreateInterface : 1; diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index b31d9bf..4ff7100 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -145,7 +145,6 @@ protected: // and object sizes virtual void AdaptTextMinSize() override; - OUString aName; Size m_aSuggestedTextFrameSize; public: diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx index db2aeb3..96cb5a0 100644 --- a/sd/inc/anminfo.hxx +++ b/sd/inc/anminfo.hxx @@ -57,7 +57,6 @@ public: bool mbSecondSoundOn; ///< for object fading. bool mbSecondPlayFull; ///< for object fading. sal_uInt16 mnVerb; ///< for OLE object - sal_uLong mnPresOrder; SdrObject& mrObject; void SetBookmark( const OUString& rBookmark ); diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx index b62b0ee..f0b5f10 100644 --- a/sd/source/core/anminfo.cxx +++ b/sd/source/core/anminfo.cxx @@ -52,7 +52,6 @@ SdAnimationInfo::SdAnimationInfo(SdrObject& rObject) mbSecondSoundOn (false), mbSecondPlayFull (false), mnVerb (0), - mnPresOrder (TREELIST_APPEND), mrObject (rObject) { maBlueScreen = RGB_Color(COL_LIGHTMAGENTA); @@ -82,7 +81,6 @@ SdAnimationInfo::SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rOb mbSecondSoundOn (rAnmInfo.mbSecondSoundOn), mbSecondPlayFull (rAnmInfo.mbSecondPlayFull), mnVerb (rAnmInfo.mnVerb), - mnPresOrder (TREELIST_APPEND), mrObject (rObject) { // can not be copied diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 33dcc56..9650894 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -357,7 +357,6 @@ TemplateScanner::State TemplateScanner::ScanFolder() FolderDescriptor aDescriptor (*mpFolderDescriptors->begin()); mpFolderDescriptors->erase(mpFolderDescriptors->begin()); - OUString sTitle (aDescriptor.msTitle); OUString aId (aDescriptor.msContentIdentifier); maFolderContent = ::ucbhelper::Content (aId, aDescriptor.mxFolderEnvironment, comphelper::getProcessComponentContext()); @@ -365,7 +364,7 @@ TemplateScanner::State TemplateScanner::ScanFolder() { // Scan the folder and insert it into the list of template // folders. - mpTemplateDirectory = new TemplateDir (sTitle); + mpTemplateDirectory = new TemplateDir; mpTemplateDirectory->EnableSorting(mbEntrySortingEnabled); // Continue with scanning all entries in the folder. eNextState = INITIALIZE_ENTRY_SCAN; diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index eed8d94..3af8871 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -72,11 +72,10 @@ private: class TemplateDir { public: - TemplateDir (const OUString& rsRegion ) - : msRegion(rsRegion), maEntries(), + TemplateDir() + : maEntries(), mbSortingEnabled(false), mpEntryCompare(nullptr) {} - OUString msRegion; ::std::vector<TemplateEntry*> maEntries; void EnableSorting(bool bSortingEnabled = true); diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index a791386..2f298b2 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -263,7 +263,6 @@ namespace { class TimeFormatter { public: - TimeFormatter(); static OUString FormatTime (const oslDateTime& rTime); }; @@ -319,7 +318,6 @@ namespace { const SharedElementMode& rpDisabledMode) override; virtual void restart() override; private: - TimeFormatter maTimeFormatter; TimeValue maStartTimeValue; PresentationTimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar); virtual ~PresentationTimeLabel(); @@ -1792,10 +1790,6 @@ geometry::RealRectangle2D Text::GetBoundingBox (const Reference<rendering::XCanv //===== TimeFormatter ========================================================= -TimeFormatter::TimeFormatter() -{ -} - OUString TimeFormatter::FormatTime (const oslDateTime& rTime) { OUStringBuffer sText; @@ -1897,7 +1891,6 @@ PresentationTimeLabel::~PresentationTimeLabel() PresentationTimeLabel::PresentationTimeLabel ( const ::rtl::Reference<PresenterToolBar>& rpToolBar) : TimeLabel(rpToolBar), - maTimeFormatter(), maStartTimeValue() { restart(); diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index b23ff7e..7b3d6a9 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -2817,7 +2817,6 @@ SdrObjCustomShape& SdrObjCustomShape::operator=(const SdrObjCustomShape& rObj) if( this == &rObj ) return *this; SdrTextObj::operator=( rObj ); - aName = rObj.aName; fObjectRotation = rObj.fObjectRotation; InvalidateRenderGeometry(); return *this; diff --git a/vcl/opengl/PackedTextureAtlas.cxx b/vcl/opengl/PackedTextureAtlas.cxx index 38475b1..46fdf3b 100644 --- a/vcl/opengl/PackedTextureAtlas.cxx +++ b/vcl/opengl/PackedTextureAtlas.cxx @@ -111,12 +111,10 @@ struct PackedTexture { std::unique_ptr<ImplOpenGLTexture> mpTexture; std::unique_ptr<Node> mpRootNode; - int mnDeallocatedArea; PackedTexture(int nWidth, int nHeight) : mpTexture(new ImplOpenGLTexture(nWidth, nHeight, true)) , mpRootNode(new Node(nWidth, nHeight)) - , mnDeallocatedArea(0) {} }; diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx index fbc86fd..08c2c17 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.cxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx @@ -34,7 +34,6 @@ template<class A> XMLPropertyBackpatcher<A>::XMLPropertyBackpatcher( const OUString& sPropName) : sPropertyName(sPropName) -, sPreservePropertyName() { } diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx index 74e2c9b..af31ec5 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.hxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx @@ -61,9 +61,6 @@ class XMLPropertyBackpatcher /// name of property that gets set or backpatched OUString sPropertyName; - /// name of the property to preserve - OUString sPreservePropertyName; - /// backpatch list type typedef ::std::vector< css::uno::Reference<css::beans::XPropertySet> > BackpatchListType; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits