diff options
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/inc/MediaDescriptorHelper.hxx | 6 | ||||
| -rw-r--r-- | chart2/source/tools/MediaDescriptorHelper.cxx | 20 |
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); } |