summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-10-24 11:19:19 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-24 11:19:19 +0200
commit319a07c4be1bf9712a162a970ab3b659dd3777c2 (patch)
treeaf881c9c659e7f9c9e5e189ad9b4971944690fba /filter
parent610f59651563205564a0f4818b5c1d347ca02132 (diff)
Simplify code further
...after 9ad0e56be46df46b021109acfd6ece9d17ce84f8 "fixes for >>= with rhs Any" Change-Id: Idf7b7033bd0ef5501e2884841ba897f8691a5f77
Diffstat (limited to 'filter')
-rw-r--r--filter/source/flash/swffilter.cxx4
-rw-r--r--filter/source/svg/svgfilter.cxx8
2 files changed, 3 insertions, 9 deletions
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index 5ac39b8c6a2e..81ec8a03946d 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -262,9 +262,7 @@ sal_Bool SAL_CALL FlashExportFilter::filter( const css::uno::Sequence< css::bean
if(xSelection.is())
{
- Any aSelection = xSelection->getSelection();
- if (aSelection.hasValue())
- aSelection >>= mxSelectedShapes;
+ xSelection->getSelection() >>= mxSelectedShapes;
}
}
}
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index bd6dae648a25..c1faa06469b5 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -235,12 +235,8 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
if (xSelection.is())
{
- uno::Any aSelection = xSelection->getSelection();
-
- if (aSelection.hasValue())
- {
- bGotSelection = ( aSelection >>= maShapeSelection );
- }
+ bGotSelection
+ = ( xSelection->getSelection() >>= maShapeSelection );
}
}