targeted string re-work

Change-Id: Ia1ab054537ac379f08ecd1950ca686d08be35d03

8 files changed, 36 insertions, 43 deletions

diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 56562a938290..521c304bcd91 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -70,7 +70,7 @@ public:
                  ActivitySharedPtr const&                                 rActivity,
                  ActivitiesQueue &                                        rActivityQueue ) :
 #if OSL_DEBUG_LEVEL > 1
-        Event(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WakeupEvent"))),
+        Event(::rtl::OUString("WakeupEvent")),
 #endif
         maTimer(pTimeBase),
         mnNextTime(0.0),
@@ -175,7 +175,7 @@ RehearseTimingsActivity::RehearseTimingsActivity( const SlideShowContext& rConte
     Rectangle rect;
     const FontMetric metric( blackHole.GetFontMetric() );
     blackHole.GetTextBoundRect(
-        rect, String(RTL_CONSTASCII_USTRINGPARAM("XX:XX:XX")) );
+        rect, String("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 d90fa8e1dc1f..0db069c774b8 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -87,7 +87,7 @@ bool importShapeGraphic(
     }
 
     rtl::OUString const aVndUrl(
-        RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:" ) );
+        "vnd.sun.star.GraphicObject:"  );
     sal_Int32 nIndex( aURL.indexOf( aVndUrl ) );
 
     if(nIndex != -1)
@@ -303,9 +303,7 @@ ShapeSharedPtr ShapeImporter::createShape(
         // (Netscape)Plugin shape. This is a special object
         return createAppletShape( xCurrShape,
                                   mnAscendingPrio,
-                                  ::rtl::OUString(
-                                      RTL_CONSTASCII_USTRINGPARAM(
-                                          "com.sun.star.comp.sfx2.PluginObject" )),
+                                  ::rtl::OUString( "com.sun.star.comp.sfx2.PluginObject" ),
                                   aPropertyValues,
                                   SAL_N_ELEMENTS(aPropertyValues),
                                   mrContext );
@@ -325,9 +323,7 @@ ShapeSharedPtr ShapeImporter::createShape(
         // (Java)Applet shape. This is a special object
         return createAppletShape( xCurrShape,
                                   mnAscendingPrio,
-                                  ::rtl::OUString(
-                                      RTL_CONSTASCII_USTRINGPARAM(
-                                          "com.sun.star.comp.sfx2.AppletObject" )),
+                                  ::rtl::OUString( "com.sun.star.comp.sfx2.AppletObject" ),
                                   aPropertyValues,
                                   SAL_N_ELEMENTS(aPropertyValues),
                                   mrContext );
@@ -460,7 +456,7 @@ bool ShapeImporter::isSkip(
         rtl::OUString layerName;
         uno::Reference<beans::XPropertySet> xPropLayerSet(
                                                           xLayer, uno::UNO_QUERY );
-        const uno::Any& a(xPropLayerSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"))) );
+        const uno::Any& a(xPropLayerSet->getPropertyValue(rtl::OUString("Name")) );
         bool const bRet = (a >>= layerName);
         if(bRet)
         {
diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx
index 7afd55d3bf45..36588d901186 100644
--- a/slideshow/source/engine/shapes/viewappletshape.cxx
+++ b/slideshow/source/engine/shapes/viewappletshape.cxx
@@ -148,7 +148,7 @@ namespace slideshow
 
                 uno::Reference< awt::XWindow2 > xParentWindow(
                     xPropSet->getPropertyValue(
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Window" ))),
+                        ::rtl::OUString("Window" )),
                     uno::UNO_QUERY_THROW );
 
                 uno::Reference<lang::XMultiComponentFactory> xFactory(
@@ -161,7 +161,7 @@ namespace slideshow
 
                     uno::Reference< awt::XToolkit > xToolkit(
                         xFactory->createInstanceWithContext(
-                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" )),
+                            ::rtl::OUString("com.sun.star.awt.Toolkit" ),
                             mxComponentContext ),
                         uno::UNO_QUERY_THROW );
 
@@ -185,7 +185,7 @@ namespace slideshow
 
                     mxFrame.set(
                         xFactory->createInstanceWithContext(
-                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Frame" )),
+                            ::rtl::OUString("com.sun.star.frame.Frame" ),
                             mxComponentContext ),
                         uno::UNO_QUERY_THROW );
 
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index b1a93c2a25c0..16a824a92ab6 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -223,7 +223,7 @@ namespace slideshow
             if( xPropSet.is() &&
                 getPropertyValue( xParentWindow,
                                   xPropSet,
-                                  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Window" ))) )
+                                  ::rtl::OUString("Window" )) )
             {
                 const awt::Rectangle aRect( xParentWindow->getPosSize() );
 
@@ -289,15 +289,13 @@ namespace slideshow
                         if (xPropSet.is())
                         {
                             if ((xPropSet->getPropertyValue(
-                                  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                          "PrivateTempFileURL"))) >>= aURL)
+                                  ::rtl::OUString( "PrivateTempFileURL")) >>= aURL)
                                 && !aURL.isEmpty())
                             {
                                 implInitializeMediaPlayer( aURL );
                             }
                             else if (xPropSet->getPropertyValue(
-                                  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                          "MediaURL"))) >>= aURL)
+                                  ::rtl::OUString( "MediaURL")) >>= aURL)
                             {
                                 implInitializeMediaPlayer( aURL );
                             }
@@ -359,19 +357,19 @@ namespace slideshow
                     sal_Bool bLoop( false );
                     getPropertyValue( bLoop,
                                       rxProps,
-                                      ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Loop" )));
+                                      ::rtl::OUString( "Loop" ));
                     mxPlayer->setPlaybackLoop( bLoop );
 
                     sal_Bool bMute( false );
                     getPropertyValue( bMute,
                                       rxProps,
-                                      ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Mute" )));
+                                      ::rtl::OUString( "Mute" ));
                     mxPlayer->setMute( bMute || !mbIsSoundEnabled);
 
                     sal_Int16 nVolumeDB(0);
                     getPropertyValue( nVolumeDB,
                                       rxProps,
-                                      ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VolumeDB" )));
+                                      ::rtl::OUString( "VolumeDB" ));
                     mxPlayer->setVolumeDB( nVolumeDB );
 
                     if( mxPlayerWindow.is() )
@@ -379,7 +377,7 @@ namespace slideshow
                         media::ZoomLevel eZoom(media::ZoomLevel_FIT_TO_WINDOW);
                         getPropertyValue( eZoom,
                                           rxProps,
-                                          ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Zoom" )));
+                                          ::rtl::OUString( "Zoom" ));
                         mxPlayerWindow->setZoomLevel( eZoom );
                     }
                 }
@@ -407,8 +405,7 @@ namespace slideshow
                 catch( const uno::Exception& )
                 {
                     throw lang::NoSupportException(
-                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                           "No video support for ") ) + rMediaURL,
+                        rtl::OUString( "No video support for " ) + rMediaURL,
                         uno::Reference<uno::XInterface>() );
                 }
             }
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index eed2da2eba19..238cee28156b 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -623,7 +623,7 @@ SlideShowImpl::SlideShowImpl(
             // #i82460# try to retrieve special transition factory
             mxOptionalTransitionFactory.set(
                 xFactory->createInstanceWithContext(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.TransitionFactory" )),
+                    ::rtl::OUString("com.sun.star.presentation.TransitionFactory" ),
                     mxComponentContext ),
                 uno::UNO_QUERY );
         }
@@ -1455,17 +1455,17 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult
     uno::Reference< beans::XPropertySet > xLayerPropSet(xDrawnInSlideshow, uno::UNO_QUERY);
 
     //Layer Name which enables to catch annotations
-    rtl::OUString layerName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DrawnInSlideshow"));
+    rtl::OUString layerName = rtl::OUString("DrawnInSlideshow");
     uno::Any aPropLayer;
 
     aPropLayer <<= layerName;
-    xLayerPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), aPropLayer);
+    xLayerPropSet->setPropertyValue(rtl::OUString("Name"), aPropLayer);
 
     aPropLayer <<= true;
-    xLayerPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsVisible")), aPropLayer);
+    xLayerPropSet->setPropertyValue(rtl::OUString("IsVisible"), aPropLayer);
 
     aPropLayer <<= false;
-    xLayerPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsLocked")), aPropLayer);
+    xLayerPropSet->setPropertyValue(rtl::OUString("IsLocked"), aPropLayer);
 
     PolygonMap::iterator aIter=maPolygons.begin();
 
@@ -1497,7 +1497,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult
                 {
                     //create the PolyLineShape
                     uno::Reference< uno::XInterface > polyshape(xDocFactory->createInstance(
-                                                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyLineShape")) ) );
+                                                                    rtl::OUString("com.sun.star.drawing.PolyLineShape") ) );
                     uno::Reference< drawing::XShape > rPolyShape(polyshape, uno::UNO_QUERY);
 
                     //Add the shape to the slide
@@ -1527,27 +1527,27 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult
                     //Give the built PointSequenceSequence.
                     uno::Any aParam;
                     aParam <<= aRetval;
-                    aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PolyPolygon")), aParam );
+                    aXPropSet->setPropertyValue( rtl::OUString("PolyPolygon"), aParam );
 
                     //LineStyle : SOLID by default
                     uno::Any            aAny;
                     drawing::LineStyle  eLS;
                     eLS = drawing::LineStyle_SOLID;
                     aAny <<= eLS;
-                    aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineStyle")), aAny );
+                    aXPropSet->setPropertyValue( rtl::OUString("LineStyle"), aAny );
 
                     //LineColor
                     sal_uInt32          nLineColor;
                     nLineColor = pPolyPoly->getRGBALineColor();
                     //Transform polygon color from RRGGBBAA to AARRGGBB
                     aAny <<= RGBAColor2UnoColor(nLineColor);
-                    aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")), aAny );
+                    aXPropSet->setPropertyValue( rtl::OUString("LineColor"), aAny );
 
                     //LineWidth
                     double              fLineWidth;
                     fLineWidth = pPolyPoly->getStrokeWidth();
                     aAny <<= (sal_Int32)fLineWidth;
-                    aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineWidth")), aAny );
+                    aXPropSet->setPropertyValue( rtl::OUString("LineWidth"), aAny );
 
                     // make polygons special
                     xLayerManager->attachShapeToLayer(rPolyShape, xDrawnInSlideshow);
@@ -2172,7 +2172,7 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD
         !getPropertyValue( nChange,
                            xPropSet,
                            ::rtl::OUString(
-                               RTL_CONSTASCII_USTRINGPARAM("Change"))) )
+                               "Change")) )
     {
         OSL_TRACE(
             "queryAutomaticSlideTransition(): "
@@ -2185,7 +2185,7 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD
         !getPropertyValue( nAutomaticNextSlideTimeout,
                            xPropSet,
                            ::rtl::OUString(
-                               RTL_CONSTASCII_USTRINGPARAM("Duration"))) )
+                               "Duration")) )
     {
         OSL_TRACE(
             "queryAutomaticSlideTransition(): "
diff --git a/slideshow/source/engine/wakeupevent.cxx b/slideshow/source/engine/wakeupevent.cxx
index 3234863f8d2b..af53db4ae36c 100644
--- a/slideshow/source/engine/wakeupevent.cxx
+++ b/slideshow/source/engine/wakeupevent.cxx
@@ -42,7 +42,7 @@ namespace slideshow
             boost::shared_ptr<canvas::tools::ElapsedTime> const & pTimeBase,
             ActivitiesQueue& rActivityQueue ) :
 #if OSL_DEBUG_LEVEL > 1
-            Event(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WakeupEvent"))),
+            Event(::rtl::OUString("WakeupEvent")),
 #endif
             maTimer(pTimeBase),
             mnNextTime(0.0),
diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx
index 089d98e1368c..0034911bfe65 100644
--- a/slideshow/source/inc/interruptabledelayevent.hxx
+++ b/slideshow/source/inc/interruptabledelayevent.hxx
@@ -48,7 +48,7 @@ namespace slideshow
             DelayFacade( const EventSharedPtr&  rEvent,
                          double                 nTimeout    ) :
 #if OSL_DEBUG_LEVEL > 1
-                Event(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DelayFacade"))),
+                Event(::rtl::OUString("DelayFacade")),
 #endif
                 mpEvent( rEvent ),
                 mnTimeout( nTimeout )
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index a9322fdbfa85..d31f5903d395 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -422,7 +422,7 @@ DemoWindow::DemoWindow() :
     maUpdateTimer(),
     mbSlideDisplayed( false )
 {
-    SetText( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Slideshow Demo" )) );
+    SetText( rtl::OUString("Slideshow Demo" ) );
     SetSizePixel( Size( 640, 480 ) );
     EnablePaint( true );
 
@@ -447,7 +447,7 @@ void DemoWindow::init()
                 uno::UNO_QUERY_THROW );
 
             uno::Reference< uno::XInterface > xInt( xFactory->createInstance(
-                                                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.SlideShow")) ));
+                                                        ::rtl::OUString("com.sun.star.presentation.SlideShow") ));
 
             mxShow.set( xInt,
                         uno::UNO_QUERY_THROW );
@@ -466,7 +466,7 @@ void DemoWindow::init()
                                   uno::Reference< animations::XAnimationNode >(),
                                   uno::Sequence< beans::PropertyValue >() );
             mxShow->setProperty( beans::PropertyValue(
-                                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RehearseTimings")),
+                                     rtl::OUString("RehearseTimings"),
                                      0,
                                      uno::makeAny( sal_True ),
                                      beans::PropertyState_DIRECT_VALUE ));
@@ -561,8 +561,8 @@ void DemoApp::Main()
 
     // Create UCB.
     uno::Sequence< uno::Any > aArgs( 2 );
-    aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
-    aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
+    aArgs[ 0 ] <<= rtl::OUString(UCB_CONFIGURATION_KEY1_LOCAL );
+    aArgs[ 1 ] <<= rtl::OUString(UCB_CONFIGURATION_KEY2_OFFICE );
     ::ucbhelper::ContentBroker::initialize( xFactory, aArgs );
 
     DemoWindow pWindow;