targeted string re-work

Change-Id: Ia1ab054537ac379f08ecd1950ca686d08be35d03

3 files changed, 15 insertions, 22 deletions

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>() );
                 }
             }