chart2/source/tools/MediaDescriptorHelper.cxx | 37 --------------------------
1 file changed, 37 deletions(-)
New commits:
commit cf73ebad644ee3bb7cd96ee3a754c526ab62e354
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Fri May 8 20:48:59 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat May 9 18:24:59 2020 +0200
remove dead code
Change-Id: I095e9a6137ea835f6182819b55e911079925f740
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93814
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx
b/chart2/source/tools/MediaDescriptorHelper.cxx
index ab5de9574667..d3ff5d6ca2d9 100644
--- a/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -35,11 +35,8 @@ MediaDescriptorHelper::MediaDescriptorHelper( const
uno::Sequence<
{
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 = [&aRegularProperties, &nRegularCount](const
beans::PropertyValue& rRegularProp)
@@ -53,11 +50,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const
uno::Sequence<
m_aModelProperties[nModelCount] = rModelProp;
++nModelCount;
};
- auto addDepreciatedProp = [&aDeprecatedProperties,
&nDeprecatedCount](const beans::PropertyValue& rDeprecatedProp)
- {
- aDeprecatedProperties[nDeprecatedCount] = rDeprecatedProp;
- ++nDeprecatedCount;
- };
//read given rMediaDescriptor and store in internal structures:
for( sal_Int32 i= rMediaDescriptor.getLength();i--;)
@@ -84,10 +76,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const
uno::Sequence<
{
addModelProp(rProp);
}
- else if (rProp.Name == "FileName")
- {
- addDepreciatedProp(rProp);
- }
else if (rProp.Name == "FilterData")
{
addModelProp(rProp);
@@ -97,10 +85,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const
uno::Sequence<
ISSET_FilterName = rProp.Value >>= FilterName;
addModelProp(rProp);
}
- else if (rProp.Name == "FilterFlags")
- {
- addDepreciatedProp(rProp);
- }
else if (rProp.Name == "FilterOptions")
{
addModelProp(rProp);
@@ -140,10 +124,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const
uno::Sequence<
{
addModelProp(rProp);
}
- else if (rProp.Name == "OpenFlags")
- {
- addDepreciatedProp(rProp);
- }
else if (rProp.Name == "OpenNewView")
{
addRegularProp(rProp);
@@ -164,10 +144,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const
uno::Sequence<
{
addRegularProp(rProp);
}
- else if (rProp.Name == "PostString")
- {
- addDepreciatedProp(rProp);
- }
else if (rProp.Name == "Preview")
{
addModelProp(rProp);
@@ -203,14 +179,6 @@ MediaDescriptorHelper::MediaDescriptorHelper( const
uno::Sequence<
ISSET_Stream = rProp.Value >>= Stream;
addModelProp(rProp);
}
- else if (rProp.Name == "TemplateName")
- {
- addDepreciatedProp(rProp);
- }
- else if (rProp.Name == "TemplateRegionName")
- {
- addDepreciatedProp(rProp);
- }
else if (rProp.Name == "Unpacked")
{
addModelProp(rProp);
@@ -232,14 +200,9 @@ MediaDescriptorHelper::MediaDescriptorHelper( const
uno::Sequence<
{
addModelProp(rProp);
}
- else if (rProp.Name == "WinExtent")
- {
- addDepreciatedProp(rProp);
- }
}
aRegularProperties.realloc(nRegularCount);
- aDeprecatedProperties.realloc(nDeprecatedCount);
m_aModelProperties.realloc(nModelCount);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
