diff options
Diffstat (limited to 'slideshow')
7 files changed, 17 insertions, 21 deletions
diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx index 737bbb9aa8e9..4ea1d9b8c220 100644 --- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx +++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx @@ -69,8 +69,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const return ActivitiesFactory::createAnimateActivity( aParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Rotate") ), + ::rtl::OUString("Rotate"), rShape, getContext().mpSubsettableShapeManager, getSlideSize() ), @@ -80,8 +79,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const return ActivitiesFactory::createAnimateActivity( aParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("SkewX") ), + ::rtl::OUString("SkewX"), rShape, getContext().mpSubsettableShapeManager, getSlideSize() ), @@ -91,8 +89,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const return ActivitiesFactory::createAnimateActivity( aParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("SkewY") ), + ::rtl::OUString("SkewY"), rShape, getContext().mpSubsettableShapeManager, getSlideSize() ), diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index e0b894ebbb65..b803b441a39f 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -249,7 +249,7 @@ bool isMainSequenceRootNode_( // detect main sequence root node (need that for // end-of-mainsequence signalling below) beans::NamedValue const aSearchKey( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "node-type" ) ), + rtl::OUString( "node-type" ), uno::makeAny( presentation::EffectNodeType::MAIN_SEQUENCE ) ); uno::Sequence<beans::NamedValue> const userData(xNode->getUserData()); @@ -719,7 +719,7 @@ void BaseNode::showState() const // read shape name ::rtl::OUString aName; if( (xPropSet->getPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ) + ::rtl::OUString("Name") ) >>= aName) ) { const ::rtl::OString& rAsciiName( diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index b07c87e80fed..355892abf130 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -154,8 +154,8 @@ namespace slideshow sal_Int32 nDocWidth=0; sal_Int32 nDocHeight=0; - xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width") ) ) >>= nDocWidth; - xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height") ) ) >>= nDocHeight; + xPropSet->getPropertyValue( ::rtl::OUString("Width") ) >>= nDocWidth; + xPropSet->getPropertyValue( ::rtl::OUString("Height") ) >>= nDocHeight; mpMtf = pMtf; maBounds = ::basegfx::B2DRectangle( 0,0,nDocWidth, nDocHeight ); diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index e9d596e87dd5..69ed0c3d7ff7 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -782,7 +782,7 @@ namespace public: MainSequenceSearcher() { - maSearchKey.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "node-type" ) ); + maSearchKey.Name = ::rtl::OUString( "node-type" ); maSearchKey.Value <<= presentation::EffectNodeType::MAIN_SEQUENCE; } @@ -978,8 +978,8 @@ bool SlideImpl::applyInitialShapeAttributes( xPropsCreator.set( xFac->createInstanceWithContext( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.animations.TargetPropertiesCreator") ), + ::rtl::OUString( + "com.sun.star.animations.TargetPropertiesCreator"), maContext.mxComponentContext ), uno::UNO_QUERY_THROW ); } @@ -1231,8 +1231,8 @@ basegfx::B2ISize SlideImpl::getSlideSizeImpl() const sal_Int32 nDocWidth = 0; sal_Int32 nDocHeight = 0; - xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Width") ) ) >>= nDocWidth; - xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Height") ) ) >>= nDocHeight; + xPropSet->getPropertyValue( ::rtl::OUString("Width") ) >>= nDocWidth; + xPropSet->getPropertyValue( ::rtl::OUString("Height") ) >>= nDocHeight; return basegfx::B2ISize( nDocWidth, nDocHeight ); } diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx index 8d3309e5b00f..00b716b13efd 100644 --- a/slideshow/source/engine/soundplayer.cxx +++ b/slideshow/source/engine/soundplayer.cxx @@ -112,8 +112,8 @@ namespace slideshow if( !mxPlayer.is() ) throw lang::NoSupportException( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "No sound support for ") ) + rSoundURL, + rtl::OUString( + "No sound support for ") + rSoundURL, uno::Reference<uno::XInterface>() ); } diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index b31dbcab9ec2..0e45dac82284 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -745,7 +745,7 @@ namespace slideshow // read bound rect awt::Rectangle aTmpRect; if( !(xPropSet->getPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BoundRect") ) ) >>= aTmpRect) ) + ::rtl::OUString("BoundRect") ) >>= aTmpRect) ) { ENSURE_OR_THROW( false, "getAPIShapeBounds(): Could not get \"BoundRect\" property from shape" ); @@ -767,7 +767,7 @@ namespace slideshow // read prio sal_Int32 nPrio(0); if( !(xPropSet->getPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ZOrder") ) ) >>= nPrio) ) + ::rtl::OUString("ZOrder") ) >>= nPrio) ) { ENSURE_OR_THROW( false, "getAPIShapePrio(): Could not get \"ZOrder\" property from shape" ); diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx index 2141fb3c7c8b..2db843b47390 100644 --- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx @@ -354,8 +354,7 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition( pGeneratedActivity = ActivitiesFactory::createSimpleActivity( rParms, AnimationFactory::createNumberPropertyAnimation( - ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("Opacity") ), + ::rtl::OUString("Opacity"), rShape, rShapeManager, rSlideSize ), |