diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-04 08:29:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-04 14:10:44 +0200 |
| commit | 59b072e22b0610abc7ffdbc75873ef5cbba58de7 (patch) | |
| tree | 663c2d01a983508f9b22ec87fae29b16ab5a1683 /slideshow | |
| parent | baa411b59c3840a4dddf5447a0b4583eb5edea74 (diff) | |
yyyyy
Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/animationnodes/basenode.cxx | 4 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/viewappletshape.cxx | 3 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/viewmediashape.cxx | 6 | ||||
| -rw-r--r-- | slideshow/source/engine/tools.cxx | 3 |
4 files changed, 5 insertions, 11 deletions
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index 56bfecf7b5f4..778a2088bf20 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -718,9 +718,7 @@ void BaseNode::showState() const // read shape name OUString aName; - if( (xPropSet->getPropertyValue( - OUString("Name") ) - >>= aName) ) + if( xPropSet->getPropertyValue("Name") >>= aName ) { SAL_INFO("slideshow.verbose", "Node info: n" << reinterpret_cast<const char*>(this)+debugGetCurrentOffset() << diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index 7ab7a0b86ae9..7afef45cb56a 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -135,8 +135,7 @@ namespace slideshow uno::UNO_QUERY_THROW ); uno::Reference< awt::XWindow2 > xParentWindow( - xPropSet->getPropertyValue( - OUString("Window" )), + xPropSet->getPropertyValue("Window"), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory> xFactory( diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index f15cc842b726..fb272d5db79d 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -321,14 +321,12 @@ namespace slideshow { OUString aURL; xPropSet->getPropertyValue("MediaMimeType") >>= sMimeType; - if ((xPropSet->getPropertyValue( - OUString( "PrivateTempFileURL")) >>= aURL) + if ((xPropSet->getPropertyValue("PrivateTempFileURL") >>= aURL) && !aURL.isEmpty()) { implInitializeMediaPlayer( aURL, sMimeType ); } - else if (xPropSet->getPropertyValue( - OUString( "MediaURL")) >>= aURL) + else if (xPropSet->getPropertyValue("MediaURL") >>= aURL) { implInitializeMediaPlayer( aURL, sMimeType ); } diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index 1c4677394e1e..a34f14421880 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -717,8 +717,7 @@ namespace slideshow uno::UNO_QUERY_THROW ); // read bound rect awt::Rectangle aTmpRect; - if( !(xPropSet->getPropertyValue( - OUString("BoundRect") ) >>= aTmpRect) ) + if( !(xPropSet->getPropertyValue("BoundRect") >>= aTmpRect) ) { ENSURE_OR_THROW( false, "getAPIShapeBounds(): Could not get \"BoundRect\" property from shape" ); |