diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-15 11:27:44 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-16 08:45:17 +0200 |
commit | 98c4cd372bf0e9d4b5b129405f5af4562d8a0f64 (patch) | |
tree | f3aae749f01d0453a227b922a6ad3217171700d7 /sdext | |
parent | 666901bc82fab69f9a80b564f97b5456d0ef684e (diff) |
loplugin:unusedfields improve write-only analysis
by whitelisting a couple of methods we know only write to their
parameters
Change-Id: Id7aef9c03c23d10c27707b21eb9a0db4a6c2757c
Reviewed-on: https://gerrit.libreoffice.org/37647
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sdext')
-rw-r--r-- | sdext/source/minimizer/graphiccollector.cxx | 1 | ||||
-rw-r--r-- | sdext/source/minimizer/graphiccollector.hxx | 1 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterTextView.cxx | 9 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterTextView.hxx | 1 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterTheme.cxx | 12 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterTheme.hxx | 1 |
6 files changed, 4 insertions, 21 deletions
diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx index f9024b460aa5..6e03ff69a0c3 100644 --- a/sdext/source/minimizer/graphiccollector.cxx +++ b/sdext/source/minimizer/graphiccollector.cxx @@ -100,7 +100,6 @@ void ImpAddGraphicEntity( const Reference< XComponentContext >& rxMSF, Reference aUser.mxShape = rxShape; aUser.mbFillBitmap = false; xShapePropertySet->getPropertyValue( "GraphicURL" ) >>= aUser.maGraphicURL; - xShapePropertySet->getPropertyValue( "GraphicStreamURL" ) >>= aUser.maGraphicStreamURL; xShapePropertySet->getPropertyValue( "GraphicCrop" ) >>= aGraphicCropLogic; awt::Size aLogicalSize( rxShape->getSize() ); diff --git a/sdext/source/minimizer/graphiccollector.hxx b/sdext/source/minimizer/graphiccollector.hxx index 2e54dc77dc6a..ae31016574b9 100644 --- a/sdext/source/minimizer/graphiccollector.hxx +++ b/sdext/source/minimizer/graphiccollector.hxx @@ -58,7 +58,6 @@ class GraphicCollector css::uno::Reference< css::beans::XPropertySet > mxPropertySet; // to be used otherwise the PropertySet css::uno::Reference< css::beans::XPropertySet > mxPagePropertySet; OUString maGraphicURL; - OUString maGraphicStreamURL; css::text::GraphicCrop maGraphicCropLogic; css::awt::Size maLogicalSize; bool mbFillBitmap; diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index f876ea729194..3e4d174a21eb 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -469,7 +469,6 @@ PresenterTextParagraph::PresenterTextParagraph ( mnAscent(0), mnDescent(0), mnLineHeight(-1), - meAdjust(style::ParagraphAdjust_LEFT), mnWritingMode (text::WritingMode2::LR_TB), mnCharacterOffset(0), maCells() @@ -488,14 +487,6 @@ PresenterTextParagraph::PresenterTextParagraph ( } try { - xProperties->getPropertyValue("ParaAdjust") >>= meAdjust; - } - catch(beans::UnknownPropertyException&) - { - // Ignore the exception. Use the default value. - } - try - { xProperties->getPropertyValue("WritingMode") >>= mnWritingMode; } catch(beans::UnknownPropertyException&) diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index b56bd5a85f31..cca8b4a89ad1 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -190,7 +190,6 @@ private: double mnAscent; double mnDescent; double mnLineHeight; - css::style::ParagraphAdjust meAdjust; sal_Int8 mnWritingMode; /// The index of the first character in this paragraph with respect to /// the whole text. diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 6ff144ffa14c..10c7cf023482 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -235,7 +235,6 @@ public: PresenterConfigurationAccess& rConfiguration, ReadContext& rReadContext); - OUString msThemeName; OUString msConfigurationNodeName; std::shared_ptr<Theme> mpParentTheme; SharedBitmapDescriptor mpBackground; @@ -282,7 +281,8 @@ std::shared_ptr<PresenterTheme::Theme> PresenterTheme::ReadTheme() "/org.openoffice.Office.PresenterScreen/", PresenterConfigurationAccess::READ_ONLY); - return aReadContext.ReadTheme(aConfiguration, msThemeName); + OUString sThemeName; + return aReadContext.ReadTheme(aConfiguration, sThemeName); } bool PresenterTheme::HasCanvas() const @@ -578,11 +578,10 @@ double PresenterTheme::FontDescriptor::GetCellSizeForDesignSize ( //===== Theme ================================================================= PresenterTheme::Theme::Theme ( - const OUString& rsName, + const OUString& /*rsName*/, const Reference<container::XHierarchicalNameAccess>& rxThemeRoot, const OUString& rsNodeName) - : msThemeName(rsName), - msConfigurationNodeName(rsNodeName), + : msConfigurationNodeName(rsNodeName), mpParentTheme(), maPaneStyles(), maViewStyles(), @@ -596,9 +595,6 @@ void PresenterTheme::Theme::Read ( PresenterConfigurationAccess& rConfiguration, ReadContext& rReadContext) { - PresenterConfigurationAccess::GetConfigurationNode(mxThemeRoot, "ThemeName") - >>= msThemeName; - // Parent theme name. OUString sParentThemeName; if ((PresenterConfigurationAccess::GetConfigurationNode(mxThemeRoot, "ParentTheme") diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index 841f9782f900..82b3d78e9887 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -124,7 +124,6 @@ public: private: css::uno::Reference<css::uno::XComponentContext> mxContext; - const OUString msThemeName; std::shared_ptr<Theme> mpTheme; css::uno::Reference<css::rendering::XCanvas> mxCanvas; |