summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-03-13 14:21:27 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-03-14 08:48:04 +0100
commit527977d5cac51a9edd522d675f0ccf575d2f2dc0 (patch)
tree3bcdc4dd578315c31e377ce90c149b5984d49811 /chart2
parent5f40c324b5578b23735d2d7fe30b0b7731867fba (diff)
loplugin:unusedfields
Change-Id: Id6792f0955a25533d33f6da6ed8c3e993f578c3f Reviewed-on: https://gerrit.libreoffice.org/69170 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/inc/MediaDescriptorHelper.hxx6
-rw-r--r--chart2/source/tools/MediaDescriptorHelper.cxx20
2 files changed, 11 insertions, 15 deletions
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx
index cd78408c92b9..d91b36652883 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -52,12 +52,6 @@ public:
//all properties given in the constructor are stored in the following three sequences
- css::uno::Sequence< css::beans::PropertyValue >
- m_aRegularProperties; //these are the properties which are described in service com.sun.star.document.MediaDescriptor and not marked as deprecated
-
- css::uno::Sequence< css::beans::PropertyValue >
- m_aDeprecatedProperties; //these are properties which are described in service com.sun.star.document.MediaDescriptor but are marked as deprecated
-
//properties which should be given to a model are additionally stored in this sequence (not documented properties and deprecated properties are not included!)
css::uno::Sequence< css::beans::PropertyValue >
m_aModelProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor
diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx
index 8307bc38a31c..ab5de9574667 100644
--- a/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -31,18 +31,20 @@ namespace apphelper
MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
beans::PropertyValue > & rMediaDescriptor )
- : m_aRegularProperties(rMediaDescriptor.getLength())
- , m_aDeprecatedProperties(rMediaDescriptor.getLength())
- , m_aModelProperties(rMediaDescriptor.getLength())
+ : m_aModelProperties(rMediaDescriptor.getLength())
{
+ css::uno::Sequence< css::beans::PropertyValue >
+ aRegularProperties(rMediaDescriptor.getLength()); //these are the properties which are described in service com.sun.star.document.MediaDescriptor and not marked as deprecated
+ css::uno::Sequence< css::beans::PropertyValue >
+ aDeprecatedProperties(rMediaDescriptor.getLength()); //these are properties which are described in service com.sun.star.document.MediaDescriptor but are marked as deprecated
impl_init();
sal_Int32 nRegularCount = 0;
sal_Int32 nDeprecatedCount = 0;
sal_Int32 nModelCount = 0;
- auto addRegularProp = [this, &nRegularCount](const beans::PropertyValue& rRegularProp)
+ auto addRegularProp = [&aRegularProperties, &nRegularCount](const beans::PropertyValue& rRegularProp)
{
- m_aRegularProperties[nRegularCount] = rRegularProp;
+ aRegularProperties[nRegularCount] = rRegularProp;
++nRegularCount;
};
auto addModelProp = [this, &nModelCount, &addRegularProp](const beans::PropertyValue& rModelProp)
@@ -51,9 +53,9 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
m_aModelProperties[nModelCount] = rModelProp;
++nModelCount;
};
- auto addDepreciatedProp = [this, &nDeprecatedCount](const beans::PropertyValue& rDeprecatedProp)
+ auto addDepreciatedProp = [&aDeprecatedProperties, &nDeprecatedCount](const beans::PropertyValue& rDeprecatedProp)
{
- m_aDeprecatedProperties[nDeprecatedCount] = rDeprecatedProp;
+ aDeprecatedProperties[nDeprecatedCount] = rDeprecatedProp;
++nDeprecatedCount;
};
@@ -236,8 +238,8 @@ MediaDescriptorHelper::MediaDescriptorHelper( const uno::Sequence<
}
}
- m_aRegularProperties.realloc(nRegularCount);
- m_aDeprecatedProperties.realloc(nDeprecatedCount);
+ aRegularProperties.realloc(nRegularCount);
+ aDeprecatedProperties.realloc(nDeprecatedCount);
m_aModelProperties.realloc(nModelCount);
}