diff options
author | Noel Grandin <noel@peralex.com> | 2016-05-31 15:07:58 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-02 06:32:07 +0000 |
commit | 8e8a88ec1ad02c153ae3c7653edc81716dc91b7a (patch) | |
tree | 6762b644bdfbadeaacea13c05abb23b8c95e1efe | |
parent | b6056eabfa8583d687165e3f9656cd322230829c (diff) |
loplugin:unusedfields
Change-Id: Ieed5f4d9411478d2568b8e5f4bbe0782bd1d309d
Reviewed-on: https://gerrit.libreoffice.org/25724
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
25 files changed, 8 insertions, 76 deletions
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx index 1200586bceb7..9e24c49c31f8 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.cxx +++ b/dbaccess/source/sdbtools/connection/objectnames.cxx @@ -19,7 +19,6 @@ #include "objectnames.hxx" -#include "module_sdbt.hxx" #include "sdbt_resource.hrc" #include <com/sun/star/sdb/CommandType.hpp> @@ -354,16 +353,9 @@ namespace sdbtools return PNameValidation( new QueryValidityCheck( _rContext, _rxConnection ) ); } - // ObjectNames_Impl - struct ObjectNames_Impl - { - SdbtClient m_aModuleClient; // keep the module alive as long as this instance lives - }; - // ObjectNames ObjectNames::ObjectNames( const Reference<XComponentContext>& _rContext, const Reference< XConnection >& _rxConnection ) :ConnectionDependentComponent( _rContext ) - ,m_pImpl( new ObjectNames_Impl ) { setWeakConnection( _rxConnection ); } diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx index 3b9b71cc6292..0af21d456e90 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.hxx +++ b/dbaccess/source/sdbtools/connection/objectnames.hxx @@ -21,6 +21,7 @@ #define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_OBJECTNAMES_HXX #include "connectiondependent.hxx" +#include "module_sdbt.hxx" #include <com/sun/star/sdb/tools/XObjectNames.hpp> @@ -34,14 +35,13 @@ namespace sdbtools // ObjectNames typedef ::cppu::WeakImplHelper< css::sdb::tools::XObjectNames > ObjectNames_Base; - struct ObjectNames_Impl; /** default implementation for XObjectNames */ class ObjectNames :public ObjectNames_Base ,public ConnectionDependentComponent { private: - ::std::unique_ptr< ObjectNames_Impl > m_pImpl; + SdbtClient m_aModuleClient; // keep the module alive as long as this instance lives public: /** constructs the instance diff --git a/framework/source/dispatch/dispatchdisabler.cxx b/framework/source/dispatch/dispatchdisabler.cxx index 608b18d70013..7f1fe492bd58 100644 --- a/framework/source/dispatch/dispatchdisabler.cxx +++ b/framework/source/dispatch/dispatchdisabler.cxx @@ -18,8 +18,7 @@ using namespace css; using namespace framework; -DispatchDisabler::DispatchDisabler(const uno::Reference< uno::XComponentContext >& rxContext) : - mxContext( rxContext ) +DispatchDisabler::DispatchDisabler(const uno::Reference< uno::XComponentContext >& ) { } diff --git a/framework/source/inc/dispatch/dispatchdisabler.hxx b/framework/source/inc/dispatch/dispatchdisabler.hxx index 3d7a61811d98..046bbb1d4972 100644 --- a/framework/source/inc/dispatch/dispatchdisabler.hxx +++ b/framework/source/inc/dispatch/dispatchdisabler.hxx @@ -44,7 +44,6 @@ class DispatchDisabler : public ::cppu::WeakImplHelper< std::set<OUString> maDisabledURLs; css::uno::Reference< css::frame::XDispatchProvider > mxSlave; css::uno::Reference< css::frame::XDispatchProvider > mxMaster; - css::uno::Reference< css::uno::XComponentContext > mxContext; public: DispatchDisabler(const css::uno::Reference< css::uno::XComponentContext >& rxContext); virtual ~DispatchDisabler() {} diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx index aee749cc6220..12b2f806fcd8 100644 --- a/include/sfx2/sfxhelp.hxx +++ b/include/sfx2/sfxhelp.hxx @@ -26,12 +26,11 @@ #include <vcl/help.hxx> #include <memory> -class SfxHelp_Impl; class SfxFrame; + class SFX2_DLLPUBLIC SfxHelp : public Help { bool bIsDebug; - std::unique_ptr< SfxHelp_Impl > pImpl; private: SAL_DLLPRIVATE bool Start_Impl( const OUString& rURL, const vcl::Window* pWindow, const OUString& rKeyword ); diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx index 18822c9542cf..e7777eb72173 100644 --- a/include/tools/errinf.hxx +++ b/include/tools/errinf.hxx @@ -126,8 +126,6 @@ class TOOLS_DLLPUBLIC ErrorHandler friend class ErrorHandler_Impl; private: - std::unique_ptr<ErrorHandler_Impl> pImpl; - static sal_uInt16 HandleError_Impl( sal_uIntPtr lId, sal_uInt16 nFlags, bool bJustCreateString, diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx index fbb51386ac21..c73ae16fdb6d 100644 --- a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx @@ -72,7 +72,6 @@ XFFrameStyle::XFFrameStyle() , m_bProtectContent(false) , m_bProtectSize(false) , m_bProtectPos(false) - , m_bEditable(false) , m_bPrintable(true) , m_bBackground(false) , m_nTransparency(0) diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx index 2a7cb6f55086..727fad5eb1fd 100644 --- a/lotuswordpro/source/filter/xfilter/xfframestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfframestyle.hxx @@ -159,7 +159,6 @@ protected: bool m_bProtectContent; bool m_bProtectSize; bool m_bProtectPos; - bool m_bEditable; bool m_bPrintable; bool m_bBackground; sal_Int16 m_nTransparency; diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 99f75011d891..4a31d1421a7c 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -236,8 +236,6 @@ public: RscLangArray aLangString; RscLangArray aLangShort; - Atom nAcceleratorType; - RscError* pEH; // error handler RscNameTable aNmTb; // name table RscFileTab aFileTab; // fila name table diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 681785103ddf..b0e48074aec5 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -57,7 +57,6 @@ RscTypCont::RscTypCont( RscError * pErrHdl, , aLangType() , aLangString( pHS->getID( "Lang_Chars" ), RSC_NOTYPE, &aString, &aLangType ) , aLangShort( pHS->getID( "Lang_short" ), RSC_NOTYPE, &aShort, &aLangType ) - , nAcceleratorType( 0 ) , nFlags( nFlagsP ) { nUniqueId = 256; diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index e05f66324e54..cc6eff80014e 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -453,7 +453,7 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC { // create the new child rtl::Reference< ::accessibility::AccessibleShape > pReplacement(::accessibility::ShapeTypeHandler::Instance().CreateAccessibleObject ( - ::accessibility::AccessibleShapeInfo ( _rxShape, pCurrentChild->getAccessibleParent(), this ), + ::accessibility::AccessibleShapeInfo ( _rxShape, pCurrentChild->getAccessibleParent() ), _rShapeTreeInfo )); if ( pReplacement.is() ) @@ -558,7 +558,7 @@ uno::Reference< XAccessible > ScChildrenShapes::Get(const ScAccessibleShapeData* if (!pData->pAccShape.is()) { ::accessibility::ShapeTypeHandler& rShapeHandler = ::accessibility::ShapeTypeHandler::Instance(); - ::accessibility::AccessibleShapeInfo aShapeInfo(pData->xShape, mpAccessibleDocument, const_cast<ScChildrenShapes*>(this)); + ::accessibility::AccessibleShapeInfo aShapeInfo(pData->xShape, mpAccessibleDocument); pData->pAccShape = rShapeHandler.CreateAccessibleObject( aShapeInfo, maShapeTreeInfo); if (pData->pAccShape.is()) diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 3fcf81585200..9979338c04cd 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1006,7 +1006,7 @@ uno::Reference<XAccessible> ScShapeChildren::GetBackgroundShapeAt(const awt::Poi if (!rShape.mpAccShape.is()) { ::accessibility::ShapeTypeHandler& rShapeHandler = ::accessibility::ShapeTypeHandler::Instance(); - ::accessibility::AccessibleShapeInfo aShapeInfo(rShape.mxShape, mpAccDoc, const_cast<ScShapeChildren*>(this)); + ::accessibility::AccessibleShapeInfo aShapeInfo(rShape.mxShape, mpAccDoc); if (mpViewShell) { diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index 2a616f53697b..73da0e7d04a9 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -132,7 +132,6 @@ SlideBackground::SlideBackground( maDspBckController(SID_DISPLAY_MASTER_BACKGROUND, *pBindings, *this), maDspObjController(SID_DISPLAY_MASTER_OBJECTS, *pBindings, *this), maMetricController(SID_ATTR_METRIC, *pBindings, *this), - mpFillStyleItem(), mpColorItem(), mpGradientItem(), mpHatchItem(), diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx index 0bffcdda23eb..bbe9b4031f10 100644 --- a/sd/source/ui/sidebar/SlideBackground.hxx +++ b/sd/source/ui/sidebar/SlideBackground.hxx @@ -92,7 +92,6 @@ private: ::sfx2::sidebar::ControllerItem maDspObjController; ::sfx2::sidebar::ControllerItem maMetricController; - std::unique_ptr< XFillStyleItem > mpFillStyleItem; std::unique_ptr< XFillColorItem > mpColorItem; std::unique_ptr< XFillGradientItem > mpGradientItem; std::unique_ptr< XFillHatchItem > mpHatchItem; diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 22253868af2c..33121b8fb224 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -217,8 +217,7 @@ OUString SfxHelp_Impl::GetHelpText( const OUString& aCommandURL, const OUString& } SfxHelp::SfxHelp() : - bIsDebug( false ), - pImpl( new SfxHelp_Impl ) + bIsDebug( false ) { // read the environment variable "HELP_DEBUG" // if it's set, you will see debug output on active help diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index b6134fbce616..e3c024398f6f 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -68,14 +68,12 @@ namespace slideshow } LayerManager::LayerManager( const UnoViewContainer& rViews, - const ::basegfx::B2DRange& rPageBounds, bool bDisableAnimationZOrder ) : mrViews(rViews), maLayers(), maXShapeHash( 101 ), maAllShapes(), maUpdateShapes(), - maPageBounds( rPageBounds ), mnActiveSprites(0), mbLayerAssociationDirty(false), mbActive(false), diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx index 859de3743f50..c40b2ade0498 100644 --- a/slideshow/source/engine/slide/layermanager.hxx +++ b/slideshow/source/engine/slide/layermanager.hxx @@ -65,16 +65,12 @@ namespace slideshow @param rViews Views currently registered - @param rPageBounds - Overall page bounds, in user space coordinates - @param bDisableAnimationZOrder When true, all sprite animations run in the foreground. That is, no extra layers are created, and the slideshow runs potentially faster. */ LayerManager( const UnoViewContainer& rViews, - const ::basegfx::B2DRange& rPageBounds, bool bDisableAnimationZOrder ); /// Forbid copy construction @@ -334,12 +330,6 @@ namespace slideshow */ ShapeUpdateSet maUpdateShapes; - /** Overall slide bounds (in user coordinate - system). shapes that exceed this boundary are clipped, - thus, layers only need to be of this size. - */ - const basegfx::B2DRange maPageBounds; - /// Number of shape sprites currently active on this LayerManager sal_Int32 mnActiveSprites; diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 0c63e51badb4..8e7397d0296c 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -175,9 +175,6 @@ private: /// Prefetch show, but don't call applyInitialShapeAttributes() bool implPrefetchShow(); - /// Query the rectangle covered by the slide - ::basegfx::B2DRectangle getSlideRect() const; - /// Start GIF and other intrinsic shape animations void endIntrinsicAnimations(); @@ -334,7 +331,6 @@ SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDra mxRootNode( xRootNode ), mpLayerManager( new LayerManager( rViewContainer, - getSlideRect(), bDisableAnimationZOrder) ), mpShapeManager( new ShapeManagerImpl( rEventMultiplexer, @@ -859,14 +855,6 @@ void SlideImpl::deactivatePaintOverlay() mbPaintOverlayActive = false; } -::basegfx::B2DRectangle SlideImpl::getSlideRect() const -{ - const basegfx::B2ISize slideSize( getSlideSizeImpl() ); - return ::basegfx::B2DRectangle(0.0,0.0, - slideSize.getX(), - slideSize.getY()); -} - void SlideImpl::endIntrinsicAnimations() { mpSubsettableShapeManager->notifyIntrinsicAnimationsDisabled(); diff --git a/sw/source/uibase/sidebar/PageFooterPanel.hxx b/sw/source/uibase/sidebar/PageFooterPanel.hxx index 0759f2cc2241..0fbb20a3abb1 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.hxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.hxx @@ -66,15 +66,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame); virtual ~PageFooterPanel(); virtual void dispose() override; - -private: - - VclPtr<CheckBox> mpFooterToggle; - VclPtr<MetricField> mpFooterHeightField; - VclPtr<MetricField> mpFooterLMargin; - VclPtr<MetricField> mpFooterRMargin; - VclPtr<MetricField> mpFooterSpacing; - VclPtr<ListBox> mpSameContentLB; }; } } //end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx b/sw/source/uibase/sidebar/PageStylesPanel.hxx index b6d4b849cb86..756994be4f96 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.hxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx @@ -66,15 +66,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame); virtual ~PageStylesPanel(); virtual void dispose() override; - -private: - - VclPtr<CheckBox> mpFooterToggle; - VclPtr<MetricField> mpFooterHeightField; - VclPtr<MetricField> mpFooterLMargin; - VclPtr<MetricField> mpFooterRMargin; - VclPtr<MetricField> mpFooterSpacing; - VclPtr<ListBox> mpSameContentLB; }; } } //end of namespace sw::sidebar diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx index 40e7b697c8e2..1091e40c32d9 100644 --- a/tools/source/ref/errinf.cxx +++ b/tools/source/ref/errinf.cxx @@ -185,7 +185,6 @@ ErrorContext *ErrorContext::GetContext() ErrorHandler::ErrorHandler() - : pImpl(new ErrorHandler_Impl) { EDcrData &rData = TheEDcrData::get(); rData.errorHandlers.insert(rData.errorHandlers.begin(), this); diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index 2f412bf67b12..9104f49527c7 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -110,7 +110,6 @@ namespace vcl struct ToolBoxLayoutData : public ControlLayoutData { std::vector< sal_uInt16 > m_aLineItemIds; - std::vector< sal_uInt16 > m_aLineItemPositions; }; } /* namespace vcl */ diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index ad3e1d9ad840..ba2c858d29fd 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -137,7 +137,6 @@ public: sal_uInt16 mnId; // Item ID MenuItemType mnType; // Item type bool mbVisible; // Item visibility. - Menu* mpVCLMenu; // VCL Menu into which this menu item is inserted GtkSalMenu* mpParentMenu; // The menu into which this menu item is inserted GtkSalMenu* mpSubMenu; // Submenu of this item (if defined) }; diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index ac6b69ca2ca9..88e4eb7c3c46 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -64,7 +64,6 @@ struct ImplTabCtrlData { std::unordered_map< int, int > maLayoutPageIdToLine; std::unordered_map< int, int > maLayoutLineToPageId; - std::vector< Rectangle > maTabRectangles; Point maItemsOffset; // offset of the tabitems std::vector< ImplTabItem > maItemList; VclPtr<ListBox> mpListBox; diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index 414b6b0ed795..70a4130d1bf9 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -1095,7 +1095,6 @@ GtkSalMenuItem::GtkSalMenuItem( const SalItemParams* pItemData ) : mnId( pItemData->nId ), mnType( pItemData->eType ), mbVisible( true ), - mpVCLMenu( pItemData->pMenu ), mpParentMenu( nullptr ), mpSubMenu( nullptr ) { |