mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for >>= with rhs Any

Browse Source 
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>
This commit is contained in:
Jochen Nitschke
2016-10-21 15:59:45 +02:00
committed by Noel Grandin
parent 6f428c38c5
commit 9ad0e56be4
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
filter/source/flash/swffilter.cxx
View File

@@ -262,10 +262,8 @@ sal_Bool SAL_CALL FlashExportFilter::filter( const css::uno::Sequence< css::bean
if(xSelection.is()) if(xSelection.is())
{ {
Any aSelection; Any aSelection = xSelection->getSelection();
if (aSelection.hasValue())
if(xSelection->getSelection() >>= aSelection)
{
aSelection >>= mxSelectedShapes; aSelection >>= mxSelectedShapes;
} }
} }
@@ -273,7 +271,6 @@ sal_Bool SAL_CALL FlashExportFilter::filter( const css::uno::Sequence< css::bean
} }
} }
} }
}
if(mxSelectedDrawPage.is() && mxSelectedShapes.is() && mxSelectedShapes->getCount()) if(mxSelectedDrawPage.is() && mxSelectedShapes.is() && mxSelectedShapes->getCount())
{ {

4
filter/source/svg/svgfilter.cxx
View File

@@ -235,9 +235,9 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
if (xSelection.is()) if (xSelection.is())
{ {
uno::Any aSelection; uno::Any aSelection = xSelection->getSelection();
if (xSelection->getSelection() >>= aSelection) if (aSelection.hasValue())
{ {
bGotSelection = ( aSelection >>= maShapeSelection ); bGotSelection = ( aSelection >>= maShapeSelection );
} }

3
xmloff/source/draw/shapeexport.cxx
View File

@@ -2583,7 +2583,8 @@ void XMLShapeExport::ImpExportConnectorShape(
} }
} }
if( xProps->getPropertyValue("PolyPolygonBezier") >>= aAny ) aAny = xProps->getPropertyValue("PolyPolygonBezier");
if( aAny.hasValue() )
{ {
// get PolygonBezier // get PolygonBezier
auto pSourcePolyPolygon = o3tl::tryAccess<drawing::PolyPolygonBezierCoords>(aAny); auto pSourcePolyPolygon = o3tl::tryAccess<drawing::PolyPolygonBezierCoords>(aAny);