diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-22 09:52:13 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-02-22 14:34:21 +0200 |
commit | db8067145f0126402be39042934e11228a1b42e9 (patch) | |
tree | 0a9d18faaf0c862cc544e6a991b32a68bbb40e28 | |
parent | 14420e83296fd393cba956047370564c3517cdae (diff) |
loplugin:write only fields
Change-Id: I44f249a17d0a510ec63a488b656d57a1a392f821
30 files changed, 26 insertions, 309 deletions
diff --git a/avmedia/source/opengl/oglmanager.cxx b/avmedia/source/opengl/oglmanager.cxx index d17f7ac498b5..b34c51a75f78 100644 --- a/avmedia/source/opengl/oglmanager.cxx +++ b/avmedia/source/opengl/oglmanager.cxx @@ -17,10 +17,8 @@ using namespace com::sun::star; namespace avmedia { namespace ogl { -OGLManager::OGLManager( const uno::Reference< lang::XMultiServiceFactory >& rMgr ) - : m_xMgr( rMgr ) +OGLManager::OGLManager() { - (void) m_xMgr; } OGLManager::~OGLManager() diff --git a/avmedia/source/opengl/oglmanager.hxx b/avmedia/source/opengl/oglmanager.hxx index d413508c5038..2f7fb05b68d2 100644 --- a/avmedia/source/opengl/oglmanager.hxx +++ b/avmedia/source/opengl/oglmanager.hxx @@ -21,7 +21,7 @@ class OGLManager : public ::cppu::WeakImplHelper< css::media::XManager, css::lan { public: - explicit OGLManager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rMgr ); + explicit OGLManager(); virtual ~OGLManager(); // XManager @@ -33,7 +33,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; private: - css::uno::Reference< css::lang::XMultiServiceFactory > m_xMgr; }; } // namespace ogl diff --git a/avmedia/source/opengl/ogluno.cxx b/avmedia/source/opengl/ogluno.cxx index 17b8ea966010..c8add21c1bec 100644 --- a/avmedia/source/opengl/ogluno.cxx +++ b/avmedia/source/opengl/ogluno.cxx @@ -15,9 +15,9 @@ using namespace ::com::sun::star; -static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact ) +static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& /*rxFact*/ ) { - return uno::Reference< uno::XInterface >( *new ::avmedia::ogl::OGLManager( rxFact ) ); + return uno::Reference< uno::XInterface >( *new ::avmedia::ogl::OGLManager ); } extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediaogl_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* ) diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index 599dcc34ecd6..b16c6ccf941c 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -217,24 +217,21 @@ bool lcl_ShowCategoriesAsDataLabel( const Reference< chart2::XDiagram > & xDiagr struct DataBrowserModel::tDataColumn { uno::Reference<chart2::XDataSeries> m_xDataSeries; - sal_Int32 m_nIndexInDataSeries; OUString m_aUIRoleName; uno::Reference<chart2::data::XLabeledDataSequence> m_xLabeledDataSequence; eCellType m_eCellType; sal_Int32 m_nNumberFormatKey; // default CTOR - tDataColumn() : m_nIndexInDataSeries( -1 ), m_eCellType( TEXT ), m_nNumberFormatKey( 0 ) {} + tDataColumn() : m_eCellType( TEXT ), m_nNumberFormatKey( 0 ) {} // "full" CTOR tDataColumn( const uno::Reference<chart2::XDataSeries> & xDataSeries, - sal_Int32 nIndexInDataSeries, const OUString& aUIRoleName, const uno::Reference<chart2::data::XLabeledDataSequence>& xLabeledDataSequence, eCellType aCellType, sal_Int32 nNumberFormatKey ) : m_xDataSeries( xDataSeries ), - m_nIndexInDataSeries( nIndexInDataSeries ), m_aUIRoleName( aUIRoleName ), m_xLabeledDataSequence( xLabeledDataSequence ), m_eCellType( aCellType ), @@ -893,7 +890,6 @@ void DataBrowserModel::updateFromModel() m_aColumns.push_back( tDataColumn( aSeries[nSeriesIdx], - nSeqIdx, lcl_getUIRoleName( aLSeqs[nSeqIdx] ), aLSeqs[nSeqIdx], NUMBER, @@ -973,7 +969,6 @@ void DataBrowserModel::addErrorBarRanges( m_aColumns.push_back( tDataColumn( xDataSeries, - rInOutSequenceIndex, lcl_getUIRoleName( *aIt ), *aIt, NUMBER, diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx index 18bf2e08af5b..6297ad1da067 100644 --- a/chart2/source/inc/ExplicitCategoriesProvider.hxx +++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx @@ -47,24 +47,6 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0; }; -struct DatePlusIndex -{ - DatePlusIndex() - : fValue(1.0) - , nIndex( -1 ) - { - } - - DatePlusIndex( const double& _fValue, sal_Int32 _nIndex ) - : fValue(_fValue) - , nIndex( _nIndex ) - { - } - - double fValue; - sal_Int32 nIndex; -}; - class OOO_DLLPUBLIC_CHARTTOOLS ExplicitCategoriesProvider { public: @@ -102,7 +84,7 @@ public: ::com::sun::star::chart2::data::XLabeledDataSequence> >& getSplitCategoriesList() { return m_aSplitCategoriesList;} bool isDateAxis(); - const std::vector< DatePlusIndex >& getDateCategories(); + const std::vector< double >& getDateCategories(); private: //member bool volatile m_bDirty; @@ -120,7 +102,7 @@ private: //member bool m_bIsDateAxis; bool m_bIsAutoDate; - std::vector< DatePlusIndex > m_aDateCategories; + std::vector< double > m_aDateCategories; }; } // namespace chart diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index b661046d9560..2d1802cec97d 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -400,16 +400,7 @@ Sequence< OUString > ExplicitCategoriesProvider::getExplicitSimpleCategories( return lcl_getExplicitSimpleCategories( rSplitCategoriesProvider, aComplexCats ); } -struct DatePlusIndexComparator -{ - inline bool operator() ( const DatePlusIndex& aFirst, - const DatePlusIndex& aSecond ) const - { - return ( aFirst.fValue < aSecond.fValue ); - } -}; - -bool lcl_fillDateCategories( const uno::Reference< data::XDataSequence >& xDataSequence, std::vector< DatePlusIndex >& rDateCategories, bool bIsAutoDate, ChartModel& rModel ) +bool lcl_fillDateCategories( const uno::Reference< data::XDataSequence >& xDataSequence, std::vector< double >& rDateCategories, bool bIsAutoDate, ChartModel& rModel ) { bool bOnlyDatesFound = true; bool bAnyDataFound = false; @@ -468,18 +459,18 @@ bool lcl_fillDateCategories( const uno::Reference< data::XDataSequence >& xDataS if( !bContainsEmptyString && !bContainsNan ) bAnyDataFound = true; } - DatePlusIndex aDatePlusIndex( 1.0, nN ); - if( bIsDate && (aAny >>= aDatePlusIndex.fValue) ) - rDateCategories.push_back( aDatePlusIndex ); + double aDate( 1.0 ); + if( bIsDate && (aAny >>= aDate) ) + rDateCategories.push_back( aDate ); else { if( aAny.hasValue() && !bContainsEmptyString )//empty string does not count as non date value! bOnlyDatesFound=false; - ::rtl::math::setNan( &aDatePlusIndex.fValue ); - rDateCategories.push_back( aDatePlusIndex ); + ::rtl::math::setNan( &aDate ); + rDateCategories.push_back( aDate ); } } - ::std::sort( rDateCategories.begin(), rDateCategories.end(), DatePlusIndexComparator() ); + ::std::sort( rDateCategories.begin(), rDateCategories.end() ); } return bAnyDataFound && bOnlyDatesFound; @@ -572,7 +563,7 @@ bool ExplicitCategoriesProvider::isDateAxis() return m_bIsDateAxis; } -const std::vector< DatePlusIndex >& ExplicitCategoriesProvider::getDateCategories() +const std::vector< double >& ExplicitCategoriesProvider::getDateCategories() { init(); return m_aDateCategories; diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 475eca90738b..6c789cd8146b 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -1352,18 +1352,18 @@ long VSeriesPlotter::calculateTimeResolutionOnXAxis() long nRet = ::com::sun::star::chart::TimeUnit::YEAR; if( m_pExplicitCategoriesProvider ) { - const std::vector< DatePlusIndex >& rDateCategories = m_pExplicitCategoriesProvider->getDateCategories(); - std::vector< DatePlusIndex >::const_iterator aIt = rDateCategories.begin(), aEnd = rDateCategories.end(); + const std::vector< double >& rDateCategories = m_pExplicitCategoriesProvider->getDateCategories(); + std::vector< double >::const_iterator aIt = rDateCategories.begin(), aEnd = rDateCategories.end(); Date aNullDate(30,12,1899); if( m_apNumberFormatterWrapper.get() ) aNullDate = m_apNumberFormatterWrapper->getNullDate(); if( aIt!=aEnd ) { - Date aPrevious(aNullDate); aPrevious+=static_cast<long>(rtl::math::approxFloor(aIt->fValue)); + Date aPrevious(aNullDate); aPrevious+=static_cast<long>(rtl::math::approxFloor(*aIt)); ++aIt; for(;aIt!=aEnd;++aIt) { - Date aCurrent(aNullDate); aCurrent+=static_cast<long>(rtl::math::approxFloor(aIt->fValue)); + Date aCurrent(aNullDate); aCurrent+=static_cast<long>(rtl::math::approxFloor(*aIt)); if( ::com::sun::star::chart::TimeUnit::YEAR == nRet ) { if( DateHelper::IsInSameYear( aPrevious, aCurrent ) ) diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 50dbd0af34c7..241e3156c9cf 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -184,9 +184,8 @@ namespace tracing struct AllocationType { const sal_Char* pName; - sal_Int32 nAllocatedUnits; - AllocationType( ) : pName( nullptr ), nAllocatedUnits( 0 ) { } + AllocationType( ) : pName( nullptr ) { } }; @@ -235,7 +234,6 @@ namespace tracing ::osl::MutexGuard aGuard( s_aMutex ); AllocationState::iterator aPos = getLocation( _pName ); - ++aPos->nAllocatedUnits; } @@ -244,7 +242,6 @@ namespace tracing ::osl::MutexGuard aGuard( s_aMutex ); AllocationState::iterator aPos = getLocation( _pName ); - --aPos->nAllocatedUnits; } #define TRACE_ALLOC( type ) tracing::AllocationTracer::registerUnit( #type ); diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 9de66589345c..4afe3f925025 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -2448,7 +2448,6 @@ namespace cppcanvas internal::TransparencyGroupActionFactory::createTransparencyGroupAction( std::move(pMtf), std::move(pGradient), - rParms, rStates.getState().mapModeTransform * vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), rStates.getState().mapModeTransform * diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx index 9d75134a38cb..52c94b772b2c 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx @@ -78,9 +78,6 @@ namespace cppcanvas VCL gradient, to be rendered into the action's alpha channel. - @param rParms - Render parameters - @param rDstPoint Left, top edge of destination, in current state coordinate system @@ -91,7 +88,6 @@ namespace cppcanvas */ TransparencyGroupAction( MtfAutoPtr&& rGroupMtf, GradientAutoPtr&& rAlphaGradient, - const Renderer::Parameters& rParms, const ::basegfx::B2DPoint& rDstPoint, const ::basegfx::B2DVector& rDstSize, const CanvasSharedPtr& rCanvas, @@ -111,8 +107,6 @@ namespace cppcanvas MtfAutoPtr mpGroupMtf; GradientAutoPtr mpAlphaGradient; - const Renderer::Parameters maParms; - const ::basegfx::B2DSize maDstSize; mutable uno::Reference< rendering::XBitmap > mxBufferBitmap; // contains last rendered version @@ -144,14 +138,12 @@ namespace cppcanvas TransparencyGroupAction::TransparencyGroupAction( MtfAutoPtr&& rGroupMtf, GradientAutoPtr&& rAlphaGradient, - const Renderer::Parameters& rParms, const ::basegfx::B2DPoint& rDstPoint, const ::basegfx::B2DVector& rDstSize, const CanvasSharedPtr& rCanvas, const OutDevState& rState ) : mpGroupMtf( std::move(rGroupMtf) ), mpAlphaGradient( std::move(rAlphaGradient) ), - maParms( rParms ), maDstSize( rDstSize ), mxBufferBitmap(), maLastTransformation(), @@ -476,7 +468,6 @@ namespace cppcanvas ActionSharedPtr TransparencyGroupActionFactory::createTransparencyGroupAction( MtfAutoPtr&& rGroupMtf, GradientAutoPtr&& rAlphaGradient, - const Renderer::Parameters& rParms, const ::basegfx::B2DPoint& rDstPoint, const ::basegfx::B2DVector& rDstSize, const CanvasSharedPtr& rCanvas, @@ -484,7 +475,6 @@ namespace cppcanvas { return ActionSharedPtr( new TransparencyGroupAction(std::move(rGroupMtf), std::move(rAlphaGradient), - rParms, rDstPoint, rDstSize, rCanvas, diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx index 17978848e5b5..e73ebf37d8b5 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx @@ -71,9 +71,6 @@ namespace cppcanvas VCL gradient, to be rendered into the action's alpha channel. - @param rParms - Render parameters - @param rDstPoint Left, top edge of destination, in current state coordinate system @@ -84,7 +81,6 @@ namespace cppcanvas */ ActionSharedPtr createTransparencyGroupAction( MtfAutoPtr&& rGroupMtf, GradientAutoPtr&& rAlphaGradient, - const Renderer::Parameters& rParms, const ::basegfx::B2DPoint& rDstPoint, const ::basegfx::B2DVector& rDstSize, const CanvasSharedPtr& rCanvas, diff --git a/cppcanvas/source/wrapper/implsprite.cxx b/cppcanvas/source/wrapper/implsprite.cxx index 5f58ba210e30..889b06125b8d 100644 --- a/cppcanvas/source/wrapper/implsprite.cxx +++ b/cppcanvas/source/wrapper/implsprite.cxx @@ -40,7 +40,6 @@ namespace cppcanvas const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ) : mxGraphicDevice(), mxSprite( rSprite ), - mxAnimatedSprite(), mpTransformArbiter( rTransformArbiter ) { // Avoiding ternary operator in initializer list (Solaris diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx index fdb0c06a9316..05d05635ee49 100644 --- a/cppcanvas/source/wrapper/implsprite.hxx +++ b/cppcanvas/source/wrapper/implsprite.hxx @@ -62,7 +62,6 @@ namespace cppcanvas css::uno::Reference< css::rendering::XGraphicDevice > mxGraphicDevice; const css::uno::Reference< css::rendering::XSprite > mxSprite; - const css::uno::Reference< css::rendering::XAnimatedSprite > mxAnimatedSprite; ImplSpriteCanvas::TransformationArbiterSharedPtr mpTransformArbiter; }; } diff --git a/filter/source/msfilter/viscache.hxx b/filter/source/msfilter/viscache.hxx index cf91eda47103..d4afde6df34d 100644 --- a/filter/source/msfilter/viscache.hxx +++ b/filter/source/msfilter/viscache.hxx @@ -29,7 +29,6 @@ class Impl_OlePres { SotClipboardFormatId nFormat; sal_uInt16 nAspect; - Bitmap * pBmp; GDIMetaFile * pMtf; sal_uInt32 nAdvFlags; @@ -40,7 +39,6 @@ public: explicit Impl_OlePres( SotClipboardFormatId nF ) : nFormat( nF ) , nAspect( ASPECT_CONTENT ) - , pBmp( nullptr ) , pMtf( nullptr ) , nAdvFlags( 0x2 ) // in Dokument gefunden , nJobLen( 0 ) @@ -49,7 +47,6 @@ public: ~Impl_OlePres() { delete pJob; - delete pBmp; delete pMtf; } void SetMtf( const GDIMetaFile & rMtf ) diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 89d954d6bbbb..6c6ff63ba3b4 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -97,14 +97,12 @@ SVGAttributeWriter::SVGAttributeWriter( SVGExport& rExport, SVGFontExport& rFont : mrExport( rExport ) , mrFontExport( rFontExport ) , mpElemFont( nullptr ) - , mpElemPaint( nullptr ) { } SVGAttributeWriter::~SVGAttributeWriter() { - delete mpElemPaint; delete mpElemFont; } diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 9eb27d2b96fd..28c9eae65d0b 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -88,7 +88,6 @@ private: SVGExport& mrExport; SVGFontExport& mrFontExport; SvXMLElementExport* mpElemFont; - SvXMLElementExport* mpElemPaint; SVGAttributeWriter(); diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index b4736d705b55..9a713d483ae7 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -547,8 +547,7 @@ static void lcl_removeListenerFromNode( Reference<XNode> xNode, // create proper evaluation context for this MIP aVector.push_back( EvaluationContext( *aIter, getModel(), - getBindingNamespaces(), - nCount, aNodes.size() ) ); + getBindingNamespaces() ) ); } return aVector; } diff --git a/forms/source/xforms/evaluationcontext.hxx b/forms/source/xforms/evaluationcontext.hxx index 59799f0b6515..0edf05561cdf 100644 --- a/forms/source/xforms/evaluationcontext.hxx +++ b/forms/source/xforms/evaluationcontext.hxx @@ -35,30 +35,21 @@ public: EvaluationContext() : mxContextNode(), mxModel(), - mxNamespaces(), - mnContextPosition( 0 ), - mnContextSize( 0 ) + mxNamespaces() { } EvaluationContext( const css::uno::Reference<css::xml::dom::XNode>& xContextNode, const css::uno::Reference<css::xforms::XModel>& xModel, - const css::uno::Reference<css::container::XNameContainer>& xNamespaces, - sal_Int32 nPosition, - sal_Int32 nSize ) + const css::uno::Reference<css::container::XNameContainer>& xNamespaces ) : mxContextNode( xContextNode ), mxModel( xModel ), - mxNamespaces( xNamespaces ), - mnContextPosition( nPosition ), - mnContextSize( nSize ) + mxNamespaces( xNamespaces ) { } css::uno::Reference<css::xml::dom::XNode> mxContextNode; css::uno::Reference<css::xforms::XModel> mxModel; css::uno::Reference<css::container::XNameContainer> mxNamespaces; - - sal_Int32 mnContextPosition; - sal_Int32 mnContextSize; }; diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index 1a0e50bc81b3..c56730331ca7 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -162,7 +162,7 @@ EvaluationContext Model::getEvaluationContext() xElement->getNodeType() == NodeType_ELEMENT_NODE, "no element in evaluation context" ); - return EvaluationContext( xElement, this, mxNamespaces, 0, 1 ); + return EvaluationContext( xElement, this, mxNamespaces ); } diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx deleted file mode 100644 index 4674e8bf0e97..000000000000 --- a/framework/inc/classes/checkediterator.hxx +++ /dev/null @@ -1,93 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_CHECKEDITERATOR_HXX -#define INCLUDED_FRAMEWORK_INC_CLASSES_CHECKEDITERATOR_HXX - -#include <sal/config.h> - -#include <sal/log.hxx> -#include <sal/types.h> - -#include <iterator> - -namespace framework{ - -/*-************************************************************************************************************ - @short implement a iterator which support 2 end states! - @descr For our search methods we need a "walking" iterator object with special functionality! - We must check for 3 different states of an iterator - normal position, exact end, after end. - It's necessary to detect if we have not found a entry and must return our default or - default already returned and we must break loop! - see using in class FilterCache too for further information! - - @Attention If your wish to debug this inline code ... - under windows and msdev you can use "set ENVCFLAGS=/Ob0" to do that! - @devstatus ready to use - @threadsafe no -*//*-*************************************************************************************************************/ - -template< class TContainer > -class CheckedIterator -{ - - // public methods - - public: - - // constructor / destructor - - /*-**************************************************************************************************** - @short standard constructor - @descr Set default values on members. - We set it internal to E_UNKNOWN to detect uninitialized instances of this class. - If we found one - we know: "We must call initialize first!" - *//*-*****************************************************************************************************/ - - inline CheckedIterator() - : m_eEndState ( E_UNKNOWN ) - , m_pContainer( nullptr ) - { - } - - // interface methods - - // private member - - private: - - // This enum defines our four states for an iterator position in current container. - enum EEndState - { - E_UNKNOWN , - E_BEFOREEND , - E_END , - E_AFTEREND - }; - - const TContainer* m_pContainer; // pointer to current container - EEndState m_eEndState; // "position state" of iterator! - typename TContainer::const_iterator m_pPosition; // point to actual element in container -}; - -} // namespace framework - -#endif // INCLUDED_FRAMEWORK_INC_CLASSES_CHECKEDITERATOR_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index f41aeb5415eb..19ed2044e1c4 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX #define INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX -#include <classes/checkediterator.hxx> #include <classes/wildcard.hxx> #include <classes/converter.hxx> #include <macros/xinterface.hxx> diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx index 105c386b9232..aa94bea415b6 100644 --- a/framework/inc/uielement/uielement.hxx +++ b/framework/inc/uielement/uielement.hxx @@ -38,7 +38,6 @@ struct DockedData m_bLocked( false ) {} css::awt::Point m_aPos; - css::awt::Size m_aSize; sal_Int16 m_nDockedArea; bool m_bLocked; }; diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 6dfddc554a1a..e5c4311010a0 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -53,14 +53,12 @@ struct TTabPageInfo TTabPageInfo() : m_nIndex ( -1 ) , m_bCreated (false) - , m_pPage ( nullptr ) , m_lProperties ( ) {} explicit TTabPageInfo(::sal_Int32 nID) : m_nIndex ( nID ) , m_bCreated (false) - , m_pPage ( nullptr ) , m_lProperties ( ) {} @@ -68,7 +66,6 @@ struct TTabPageInfo ::sal_Int32 m_nIndex; bool m_bCreated; - VclPtr<FwkTabPage> m_pPage; css::uno::Sequence< css::beans::NamedValue > m_lProperties; }; diff --git a/hwpfilter/source/hpara.cxx b/hwpfilter/source/hpara.cxx index b193147f8b38..96b2729c8698 100644 --- a/hwpfilter/source/hpara.cxx +++ b/hwpfilter/source/hpara.cxx @@ -75,7 +75,6 @@ HWPPara::HWPPara() , etcflag(0) , ctrlflag(0) , pstyno(0) - , pno(0) , linfo(nullptr) , cshapep(nullptr) , hhstr(nullptr) diff --git a/hwpfilter/source/hpara.h b/hwpfilter/source/hpara.h index 343f08afafde..28e67dc456b8 100644 --- a/hwpfilter/source/hpara.h +++ b/hwpfilter/source/hpara.h @@ -104,7 +104,6 @@ class DLLEXPORT HWPPara unsigned char pstyno; CharShape cshape; /* When characters are all the same shape */ ParaShape pshape; /* if reuse flag is 0, */ - int pno; /* then run-time only */ LineInfo *linfo; CharShape *cshapep; diff --git a/hwpfilter/source/list.hxx b/hwpfilter/source/list.hxx deleted file mode 100644 index 89fe528d1c59..000000000000 --- a/hwpfilter/source/list.hxx +++ /dev/null @@ -1,107 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_HWPFILTER_SOURCE_LIST_HXX -#define INCLUDED_HWPFILTER_SOURCE_LIST_HXX - -/** - * Re-implement a simple container: LinkedList + LinkedListIterator - * - * DO NOT USE EXCEPT FOR REPLACING THE ORIGINAL LinkedList/LinkedListIterator! - * USE STL CONTAINERS FOR NEW CODE! - * - * The classes LinkedList and LinkedListIterator were originally - * implemented in two files LinkedList.cxx/.h, whose license would not - * allow re-distribution through OpenOffice.org. This file - * re-implements the same functionality, based on the STL. - */ - -#include <cstddef> -#include <vector> - -template<class T> -class LinkedList -{ - typedef std::vector<T*> list_t; - list_t maList; - -public: - /// construct list with one element (pItem) or no element (pItem == NULL) - explicit LinkedList( T* pItem = 0 ); - ~LinkedList(); -}; - -/** iterator class for LinkedList<T>. Iterator may travel outside of - * list using operator++/--, in which case current() must return - * NULL. */ -template<class T> -class LinkedListIterator -{ - // iterator state: reference list + position - LinkedList<T>* mpList; - int mnPosition; - -public: - /// construct list with single element - explicit LinkedListIterator( LinkedList<T>* pList = 0 ); - ~LinkedListIterator(); -}; - - -// IMPLEMENTATION - -// (the implementation of template classes must be accessible to using -// code, hence this implementation is in the header.) - - -#include <algorithm> - -// define assert based on SAL, so we do not introduce a tools dependency -#include <osl/diagnose.h> -#define ASSERT(x) OSL_ENSURE((x), " HWP FILTER: " #x) - - -template<class T> -LinkedList<T>::LinkedList( T* pItem ) -{ - if( pItem != nullptr ) - maList.push_back( pItem ); -} - -template<class T> -LinkedList<T>::~LinkedList() -{ -} - -template<class T> -LinkedListIterator<T>::LinkedListIterator( LinkedList<T>* pList ) : - mpList( pList ), - mnPosition( 0 ) -{ - ASSERT( pList != nullptr ); -} - -template<class T> -LinkedListIterator<T>::~LinkedListIterator() -{ -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/hwpfilter/source/nodes.h b/hwpfilter/source/nodes.h index 7d93f104b0ca..539452244d5a 100644 --- a/hwpfilter/source/nodes.h +++ b/hwpfilter/source/nodes.h @@ -22,7 +22,7 @@ #include <stdio.h> #include <stdlib.h> -#include "list.hxx" +#include <osl/diagnose.h> enum IDLIST { ID_MATHML, diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx index 22d6b7801f4b..71e77b4f2b71 100644 --- a/idl/inc/database.hxx +++ b/idl/inc/database.hxx @@ -77,7 +77,6 @@ class SvIdlDataBase SvRefMemberList<SvMetaClass *> aClassList; SvRefMemberList<SvMetaModule *> aModuleList; SvRefMemberList<SvMetaSlot *> aSlotList; - SvRefMemberList<SvMetaType *> aTmpTypeList; // not persistent SvRefMemberList<SvMetaObject *> aContextStack; protected: diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx index 4663f579cade..6092fbbba7ab 100644 --- a/idl/inc/globals.hxx +++ b/idl/inc/globals.hxx @@ -29,8 +29,6 @@ struct SvGlobalHashNames { SvStringHashEntryRef MM_module; SvStringHashEntryRef MM_interface; - SvStringHashEntryRef MM_String; - SvStringHashEntryRef MM_void; SvStringHashEntryRef MM_shell; SvStringHashEntryRef MM_Toggle; SvStringHashEntryRef MM_AutoUpdate; diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index cb73712225b4..dc24d94736c9 100644 --- a/idl/source/prj/globals.cxx +++ b/idl/source/prj/globals.cxx @@ -56,8 +56,6 @@ inline SvStringHashEntry * INS( const OString& rName ) SvGlobalHashNames::SvGlobalHashNames() : MM_module( INS( "module" ) ) , MM_interface( INS( "interface" ) ) - , MM_String( INS( "String" ) ) - , MM_void( INS( "void" ) ) , MM_shell( INS( "shell" ) ) , MM_Toggle( INS( "Toggle" ) ) , MM_AutoUpdate( INS( "AutoUpdate" ) ) |