diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-10-21 15:59:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-24 07:43:21 +0000 |
| commit | 9ad0e56be46df46b021109acfd6ece9d17ce84f8 (patch) | |
| tree | 4e6967bfbaa9eab94f399f5d5356f87e84fb2694 /filter | |
| parent | 6f428c38c533026c9749f71ed3144db2d4575ab6 (diff) | |
fixes for >>= with rhs Any
this changes behaviour because >>= always returned true
Change-Id: Ia7bbce1696e5c23f6e1e6f1a7e60b3c462cf0086
Reviewed-on: https://gerrit.libreoffice.org/30141
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/flash/swffilter.cxx | 7 | ||||
| -rw-r--r-- | filter/source/svg/svgfilter.cxx | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index b3db3bc3b090..5ac39b8c6a2e 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -262,12 +262,9 @@ sal_Bool SAL_CALL FlashExportFilter::filter( const css::uno::Sequence< css::bean if(xSelection.is()) { - Any aSelection; - - if(xSelection->getSelection() >>= aSelection) - { + Any aSelection = xSelection->getSelection(); + if (aSelection.hasValue()) aSelection >>= mxSelectedShapes; - } } } } diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index 7304a56c9077..bd6dae648a25 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -235,9 +235,9 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto if (xSelection.is()) { - uno::Any aSelection; + uno::Any aSelection = xSelection->getSelection(); - if (xSelection->getSelection() >>= aSelection) + if (aSelection.hasValue()) { bGotSelection = ( aSelection >>= maShapeSelection ); } |