diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-03 14:08:19 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-04 07:17:23 +0100 |
commit | 21e0d8162a0e683558c4d042ce688fc9a6833809 (patch) | |
tree | 8c93a0158d7669b1e92a43c65b6b4a7a7eeca685 /include | |
parent | 5de151f0fd7b590ae13560086b46ea84e4d9cf9c (diff) |
loplugin:unusedfields
fix the ReturnStmt check
Change-Id: I95076076bd1313d23798c4615ea12910c86ed9a8
Reviewed-on: https://gerrit.libreoffice.org/47309
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/comphelper/accimplaccess.hxx | 9 | ||||
-rw-r--r-- | include/oox/ppt/slidepersist.hxx | 3 | ||||
-rw-r--r-- | include/svl/style.hxx | 5 | ||||
-rw-r--r-- | include/svx/deflt3d.hxx | 7 | ||||
-rw-r--r-- | include/svx/obj3d.hxx | 3 | ||||
-rw-r--r-- | include/svx/polygn3d.hxx | 4 | ||||
-rw-r--r-- | include/unotools/textsearch.hxx | 2 |
7 files changed, 2 insertions, 31 deletions
diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx index 943c12b864c1..a304ccc3cc94 100644 --- a/include/comphelper/accimplaccess.hxx +++ b/include/comphelper/accimplaccess.hxx @@ -36,7 +36,6 @@ namespace comphelper typedef ::cppu::ImplHelper1 < css::lang::XUnoTunnel > OAccImpl_Base; - struct OAccImpl_Impl; /** This is a helper class which allows accessing several aspects of the implementation of an AccessibleContext. @@ -62,14 +61,6 @@ namespace comphelper */ class COMPHELPER_DLLPUBLIC OAccessibleImplementationAccess : public OAccImpl_Base { - private: - std::unique_ptr<OAccImpl_Impl> m_pImpl; - - protected: - /// retrieves the parent previously set via <method>setAccessibleParent</method> - const css::uno::Reference< css::accessibility::XAccessible >& - implGetForeignControlledParent( ) const; - protected: OAccessibleImplementationAccess( ); virtual ~OAccessibleImplementationAccess( ); diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx index cd1ca4ec4e07..a2378b82aefb 100644 --- a/include/oox/ppt/slidepersist.hxx +++ b/include/oox/ppt/slidepersist.hxx @@ -85,8 +85,6 @@ public: void setTheme( const oox::drawingml::ThemePtr& rThemePtr ){ mpThemePtr = rThemePtr; } const oox::drawingml::ThemePtr& getTheme() const { return mpThemePtr; } - const oox::drawingml::ClrSchemePtr& getClrScheme() const { return mpClrSchemePtr; } - void setClrMap( const oox::drawingml::ClrMapPtr pClrMapPtr ){ mpClrMapPtr = pClrMapPtr; } const oox::drawingml::ClrMapPtr& getClrMap() const { return mpClrMapPtr; } @@ -131,7 +129,6 @@ private: std::shared_ptr< oox::vml::Drawing > mpDrawingPtr; css::uno::Reference< css::drawing::XDrawPage > mxPage; oox::drawingml::ThemePtr mpThemePtr; // the theme that is used - oox::drawingml::ClrSchemePtr mpClrSchemePtr; // the local color scheme (if any) oox::drawingml::ClrMapPtr mpClrMapPtr; // color mapping (if any) SlidePersistPtr mpMasterPagePtr; diff --git a/include/svl/style.hxx b/include/svl/style.hxx index b23c4fee6e26..d8b6e9aeb75f 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -102,7 +102,6 @@ protected: SfxStyleFamily nFamily; OUString aName, aParent, aFollow; - OUString maDisplayName; OUString aHelpFile; // name of the help file SfxItemSet* pSet; // ItemSet sal_uInt16 nMask; // Flags @@ -130,10 +129,6 @@ public: // SfxStyleSheetBasePool parent. virtual bool SetName(const OUString& rNewName, bool bReindexNow = true); - /** returns the display name of this style, it is used at the user interface. - If the display name is empty, this method returns the internal name. */ - OUString const & GetDisplayName() const; - virtual const OUString& GetParent() const; virtual bool SetParent( const OUString& ); virtual const OUString& GetFollow() const; diff --git a/include/svx/deflt3d.hxx b/include/svx/deflt3d.hxx index d4d083287c87..e69a62a1625e 100644 --- a/include/svx/deflt3d.hxx +++ b/include/svx/deflt3d.hxx @@ -34,9 +34,6 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dDefaultAttributes { private: - // Compound object - Color aDefaultAmbientColor; - // Cube object basegfx::B3DPoint aDefaultCubePos; basegfx::B3DVector aDefaultCubeSize; @@ -67,10 +64,6 @@ public: // Reset to defaults void Reset(); - // Getter/Setter for default values of all 3D objects - // Compound object - const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; } - // Cube object const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; } const basegfx::B3DVector& GetDefaultCubeSize() { return aDefaultCubeSize; } diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index 36da39e1e2a4..8f664c815a60 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -227,7 +227,7 @@ protected: Color aMaterialAmbientColor; protected: - void SetDefaultAttributes(E3dDefaultAttributes& rDefault); + void SetDefaultAttributes(); // convert given basegfx::B3DPolyPolygon to screen coor basegfx::B2DPolyPolygon TransformToScreenCoor(const basegfx::B3DPolyPolygon& rCandidate); @@ -235,7 +235,6 @@ protected: public: E3dCompoundObject(); - E3dCompoundObject(E3dDefaultAttributes& rDefault); virtual ~E3dCompoundObject() override; virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx index 345024d271fb..98778dd493e3 100644 --- a/include/svx/polygn3d.hxx +++ b/include/svx/polygn3d.hxx @@ -44,9 +44,7 @@ public: void SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyPoly2D); - E3dPolygonObj( - E3dDefaultAttributes& rDefault, - const basegfx::B3DPolyPolygon& rPolyPoly3D); + E3dPolygonObj(const basegfx::B3DPolyPolygon& rPolyPoly3D); E3dPolygonObj(); virtual ~E3dPolygonObj() override; diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx index 5571fca7c15f..32ec831784ea 100644 --- a/include/unotools/textsearch.hxx +++ b/include/unotools/textsearch.hxx @@ -95,7 +95,6 @@ public: private: OUString sSrchStr; // the search string - OUString sReplaceStr; // the replace string SearchType m_eSrchType; // search normal/regular/LevDist @@ -116,7 +115,6 @@ public: ~SearchParam(); const OUString& GetSrchStr() const { return sSrchStr; } - const OUString& GetReplaceStr() const { return sReplaceStr; } SearchType GetSrchType() const { return m_eSrchType; } bool IsCaseSensitive() const { return m_bCaseSense; } |