[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - filter/source
Armin Le Grand
Armin.Le.Grand at cib.de
Sat Jul 7 22:20:58 UTC 2018
filter/source/svg/svgfilter.cxx | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 9ca92f22bb4bc1931cb1237a2348682b83c00e78
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
Date: Fri Jul 6 15:21:29 2018 +0200
tdf#118254 Do not rely on XStatusIndicator for SVG import
For SVGs loaded as Document and status 'hidden' is used,
there is no xStatusIndicator handed over to the SVGFilter.
Compared with old filter - there it was used setting it
somewhere else, but not required. Remove code that it
requires it.
Change-Id: I9fbf2b4ea02d8c5aae234f78f96b4acd37b7341b
Reviewed-on: https://gerrit.libreoffice.org/57062
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
(cherry picked from commit 3a27688e0b54e124ab533b9670da76ef9dc455d2)
Reviewed-on: https://gerrit.libreoffice.org/57097
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index b143bfef55cc..9c50869ab593 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -117,14 +117,12 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
// use MediaDescriptor to get needed data out of Sequence< PropertyValue >
utl::MediaDescriptor aMediaDescriptor(rDescriptor);
uno::Reference<io::XInputStream> xInputStream;
- uno::Reference<task::XStatusIndicator> xStatus;
xInputStream.set(aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()], UNO_QUERY);
- xStatus.set(aMediaDescriptor[utl::MediaDescriptor::PROP_STATUSINDICATOR()], UNO_QUERY);
- if(!xInputStream.is() || !xStatus.is())
+ if(!xInputStream.is())
{
- // we need the InputStream and StatusIndicator
+ // we need the InputStream
break;
}
More information about the Libreoffice-commits
mailing list