summaryrefslogtreecommitdiff
path: root/slideshow/source/engine
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-06 09:37:21 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-06 09:37:21 +0100
commit69b81b64f8ecd9ea627ec0efe894808e527d98fc (patch)
tree830a9c8c0fcd85dc1054ebd20ff1208d74e67ab9 /slideshow/source/engine
parentb8f0442fcab93d9f28bee3d216a244cc91288dab (diff)
loplugin:stringconstant: elide explicit ctor usage (automatic rewrite)
Change-Id: I23de1fa2f8e6c0cf6281b32eab179e131aa98056
Diffstat (limited to 'slideshow/source/engine')
-rw-r--r--slideshow/source/engine/animationnodes/animationtransformnode.cxx6
-rw-r--r--slideshow/source/engine/rehearsetimingsactivity.cxx2
-rw-r--r--slideshow/source/engine/shapes/shapeimporter.cxx4
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx10
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx6
-rw-r--r--slideshow/source/engine/transitions/shapetransitionfactory.cxx2
6 files changed, 14 insertions, 16 deletions
diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx
index b9a99c3ae184..ee451ea2cb89 100644
--- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx
@@ -66,7 +66,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const
return ActivitiesFactory::createAnimateActivity(
aParms,
AnimationFactory::createNumberPropertyAnimation(
- OUString("Rotate"),
+ "Rotate",
rShape,
getContext().mpSubsettableShapeManager,
getSlideSize() ),
@@ -76,7 +76,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const
return ActivitiesFactory::createAnimateActivity(
aParms,
AnimationFactory::createNumberPropertyAnimation(
- OUString("SkewX"),
+ "SkewX",
rShape,
getContext().mpSubsettableShapeManager,
getSlideSize() ),
@@ -86,7 +86,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const
return ActivitiesFactory::createAnimateActivity(
aParms,
AnimationFactory::createNumberPropertyAnimation(
- OUString("SkewY"),
+ "SkewY",
rShape,
getContext().mpSubsettableShapeManager,
getSlideSize() ),
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index bcdb38107900..308d381d1591 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -165,7 +165,7 @@ RehearseTimingsActivity::RehearseTimingsActivity( const SlideShowContext& rConte
blackHole->SetMapMode( MAP_PIXEL );
Rectangle rect;
const FontMetric metric( blackHole->GetFontMetric() );
- blackHole->GetTextBoundRect( rect, OUString("XX:XX:XX") );
+ blackHole->GetTextBoundRect( rect, "XX:XX:XX" );
maSpriteSizePixel.setX( rect.getWidth() * 12 / 10 );
maSpriteSizePixel.setY( metric.GetLineHeight() * 11 / 10 );
mnYOffset = (metric.GetAscent() + (metric.GetLineHeight() / 20));
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index 061e898ceabd..732e9f377680 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -290,7 +290,7 @@ ShapeSharedPtr ShapeImporter::createShape(
// (Netscape)Plugin shape. This is a special object
return createAppletShape( xCurrShape,
mnAscendingPrio,
- OUString( "com.sun.star.comp.sfx2.PluginObject" ),
+ "com.sun.star.comp.sfx2.PluginObject",
aPropertyValues,
SAL_N_ELEMENTS(aPropertyValues),
mrContext );
@@ -310,7 +310,7 @@ ShapeSharedPtr ShapeImporter::createShape(
// (Java)Applet shape. This is a special object
return createAppletShape( xCurrShape,
mnAscendingPrio,
- OUString( "com.sun.star.comp.sfx2.AppletObject" ),
+ "com.sun.star.comp.sfx2.AppletObject",
aPropertyValues,
SAL_N_ELEMENTS(aPropertyValues),
mrContext );
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index fb272d5db79d..291d65216003 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -247,7 +247,7 @@ namespace slideshow
if( xPropSet.is() &&
getPropertyValue( xParentWindow,
xPropSet,
- OUString("Window" )) )
+ "Window") )
{
const awt::Rectangle aRect( xParentWindow->getPosSize() );
@@ -372,19 +372,19 @@ namespace slideshow
bool bLoop( false );
getPropertyValue( bLoop,
rxProps,
- OUString( "Loop" ));
+ "Loop");
mxPlayer->setPlaybackLoop( bLoop );
bool bMute( false );
getPropertyValue( bMute,
rxProps,
- OUString( "Mute" ));
+ "Mute");
mxPlayer->setMute( bMute || !mbIsSoundEnabled);
sal_Int16 nVolumeDB(0);
getPropertyValue( nVolumeDB,
rxProps,
- OUString( "VolumeDB" ));
+ "VolumeDB");
mxPlayer->setVolumeDB( nVolumeDB );
if( mxPlayerWindow.is() )
@@ -392,7 +392,7 @@ namespace slideshow
media::ZoomLevel eZoom(media::ZoomLevel_FIT_TO_WINDOW);
getPropertyValue( eZoom,
rxProps,
- OUString( "Zoom" ));
+ "Zoom");
mxPlayerWindow->setZoomLevel( eZoom );
}
}
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index db061ea1ba95..0fb582fbc4ef 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -2161,8 +2161,7 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD
if( !xPropSet.is() ||
!getPropertyValue( nChange,
xPropSet,
- OUString(
- "Change")) )
+ "Change") )
{
OSL_TRACE(
"queryAutomaticSlideTransition(): "
@@ -2174,8 +2173,7 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD
if( !xPropSet.is() ||
!getPropertyValue( nAutomaticNextSlideTimeout,
xPropSet,
- OUString(
- "HighResDuration")) )
+ "HighResDuration") )
{
OSL_TRACE(
"queryAutomaticSlideTransition(): "
diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
index 0f00991f326c..68e5e234aa45 100644
--- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
@@ -334,7 +334,7 @@ AnimationActivitySharedPtr createShapeTransitionByType(
pGeneratedActivity = ActivitiesFactory::createSimpleActivity(
rParms,
AnimationFactory::createNumberPropertyAnimation(
- OUString("Opacity"),
+ "Opacity",
rShape,
rShapeManager,
rSlideSize ),