diff --git a/slideshow/source/engine/debug.cxx b/slideshow/source/engine/debug.cxx
index 1e5b312..f571ead 100644
--- a/slideshow/source/engine/debug.cxx
+++ b/slideshow/source/engine/debug.cxx
@@ -73,30 +73,30 @@ OUString DebugGetDescription (const AnimationNodeSharedPtr& rpNode)
     {
         // Node is a container.
         if (::boost::dynamic_pointer_cast<ParallelTimeContainer>(rpNode))
-            return OUString::createFromAscii("ParallelTimeContainer");
+            return OUString(RTL_CONSTASCII_USTRINGPARAM("ParallelTimeContainer"));
         else if (::boost::dynamic_pointer_cast<SequentialTimeContainer>(rpNode))
-            return OUString::createFromAscii("SequentialTimeContainer");
+            return OUString(RTL_CONSTASCII_USTRINGPARAM("SequentialTimeContainer"));
         else
-            return OUString::createFromAscii("<unknown container>");
+            return OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown container>"));
     }
     else if (::boost::dynamic_pointer_cast<AnimationTransitionFilterNode>(rpNode))
-        return OUString::createFromAscii("AnimationTransitionFilterNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("AnimationTransitionFilterNode"));
     else if (::boost::dynamic_pointer_cast<AnimationAudioNode>(rpNode))
-        return OUString::createFromAscii("AnimationAudioNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("AnimationAudioNode"));
     else if (::boost::dynamic_pointer_cast<AnimationColorNode>(rpNode))
-        return OUString::createFromAscii("AnimationColorNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("AnimationColorNode"));
     else if (::boost::dynamic_pointer_cast<AnimationCommandNode>(rpNode))
-        return OUString::createFromAscii("AnimationCommandNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("AnimationCommandNode"));
     else if (::boost::dynamic_pointer_cast<AnimationPathMotionNode>(rpNode))
-        return OUString::createFromAscii("AnimationPathMotionNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("AnimationPathMotionNode"));
     else if (::boost::dynamic_pointer_cast<AnimationSetNode>(rpNode))
-        return OUString::createFromAscii("AnimationSetNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("AnimationSetNode"));
     else if (::boost::dynamic_pointer_cast<AnimationTransformNode>(rpNode))
-        return OUString::createFromAscii("AnimationTransformNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("AnimationTransformNode"));
     else if (::boost::dynamic_pointer_cast<PropertyAnimationNode>(rpNode))
-        return OUString::createFromAscii("PropertyAnimationNode");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("PropertyAnimationNode"));
     else
-        return OUString::createFromAscii("<unknown node type>");
+        return OUString(RTL_CONSTASCII_USTRINGPARAM("<unknown node type>"));
 }
 
 
@@ -113,28 +113,28 @@ void DebugShowState (const AnimationNodeSharedPtr& rpNode)
     {
         default:
         case AnimationNode::INVALID:
-            sState = OUString::createFromAscii("Invalid");
-            sStateColor = OUString::createFromAscii("firebrick1");
+            sState = OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid"));
+            sStateColor = OUString(RTL_CONSTASCII_USTRINGPARAM("firebrick1"));
             break;
         case AnimationNode::UNRESOLVED:
-            sState = OUString::createFromAscii("Unresolved");
-            sStateColor = OUString::createFromAscii("dodgerblue4");
+            sState = OUString(RTL_CONSTASCII_USTRINGPARAM("Unresolved"));
+            sStateColor = OUString(RTL_CONSTASCII_USTRINGPARAM("dodgerblue4"));
             break;
         case AnimationNode::RESOLVED:
-            sState = OUString::createFromAscii("Resolved");
-            sStateColor = OUString::createFromAscii("dodgerblue");
+            sState = OUString(RTL_CONSTASCII_USTRINGPARAM("Resolved"));
+            sStateColor = OUString(RTL_CONSTASCII_USTRINGPARAM("dodgerblue"));
             break;
         case AnimationNode::ACTIVE:
-            sState = OUString::createFromAscii("Active");
-            sStateColor = OUString::createFromAscii("seagreen1");
+            sState = OUString(RTL_CONSTASCII_USTRINGPARAM("Active"));
+            sStateColor = OUString(RTL_CONSTASCII_USTRINGPARAM("seagreen1"));
             break;
         case AnimationNode::FROZEN:
-            sState = OUString::createFromAscii("Frozen");
-            sStateColor = OUString::createFromAscii("lightskyblue1");
+            sState = OUString(RTL_CONSTASCII_USTRINGPARAM("Frozen"));
+            sStateColor = OUString(RTL_CONSTASCII_USTRINGPARAM("lightskyblue1"));
             break;
         case AnimationNode::ENDED:
-            sState = OUString::createFromAscii("Ended");
-            sStateColor = OUString::createFromAscii("slategray3");
+            sState = OUString(RTL_CONSTASCII_USTRINGPARAM("Ended"));
+            sStateColor = OUString(RTL_CONSTASCII_USTRINGPARAM("slategray3"));
             break;
     }
     
@@ -158,11 +158,11 @@ void DebugShowState (const AnimationNodeSharedPtr& rpNode)
         }
         else
         {
-            sTrigger = OUString::createFromAscii("other");
+            sTrigger = OUString(RTL_CONSTASCII_USTRINGPARAM("other"));
         }
     }
     else
-        sTrigger = ::rtl::OUString::createFromAscii("void");
+        sTrigger = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void"));
 
     TRACE("Node state: n%x [label=\"%x / %x / %s\\n%s\\n%s\",style=filled,fillcolor=\"%s\"]\r",
         rpNode.get(),
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 6ba5aae..b8a0192 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -71,7 +71,7 @@ public:
                  ActivitySharedPtr const&                                 rActivity,
                  ActivitiesQueue &                                        rActivityQueue ) :
 #if OSL_DEBUG_LEVEL > 1
-        Event(::rtl::OUString::createFromAscii("WakeupEvent")),
+        Event(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WakeupEvent"))),
 #endif
         maTimer(pTimeBase),
         mnNextTime(0.0),
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index a1671c4..dab457e 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -468,11 +468,11 @@ bool ShapeImporter::isSkip(
         rtl::OUString layerName;
         uno::Reference<beans::XPropertySet> xPropLayerSet(
                                                           xLayer, uno::UNO_QUERY );
-        const uno::Any& a(xPropLayerSet->getPropertyValue(rtl::OUString::createFromAscii("Name")) );
+        const uno::Any& a(xPropLayerSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"))) );
         bool const bRet = (a >>= layerName);
         if(bRet)
         {
-            if( layerName.equals(rtl::OUString::createFromAscii("DrawnInSlideshow")))
+            if( layerName.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DrawnInSlideshow"))))
             {
                 //Transform shapes into PolyPolygons	
                 importPolygons(xPropSet);
diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx
index 1af40d9..d6f472e 100644
--- a/slideshow/source/engine/shapes/viewappletshape.cxx
+++ b/slideshow/source/engine/shapes/viewappletshape.cxx
@@ -150,7 +150,7 @@ namespace slideshow
             
                 uno::Reference< awt::XWindow2 > xParentWindow( 
                     xPropSet->getPropertyValue( 
-                        ::rtl::OUString::createFromAscii( "Window" )),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Window" ))),
                     uno::UNO_QUERY_THROW );
 
                 uno::Reference<lang::XMultiComponentFactory> xFactory( 
@@ -163,7 +163,7 @@ namespace slideshow
 
                     uno::Reference< awt::XToolkit > xToolkit(
                         xFactory->createInstanceWithContext( 
-                            ::rtl::OUString::createFromAscii( "com.sun.star.awt.Toolkit" ),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" )),
                             mxComponentContext ),
                         uno::UNO_QUERY_THROW );
 
@@ -187,7 +187,7 @@ namespace slideshow
 
                     mxFrame.set(
                         xFactory->createInstanceWithContext( 
-                            ::rtl::OUString::createFromAscii( "com.sun.star.frame.Frame" ),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "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 def413f..47ea7b1 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -232,7 +232,7 @@ namespace slideshow
             if( xPropSet.is() &&
                 getPropertyValue( xParentWindow,
                                   xPropSet,
-                                  ::rtl::OUString::createFromAscii( "Window" )) )
+                                  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Window" ))) )
             {
                 const awt::Rectangle aRect( xParentWindow->getPosSize() );
                 
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 41b5f66..cc54898 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -638,7 +638,7 @@ SlideShowImpl::SlideShowImpl(
             // #i82460# try to retrieve special transition factory
             mxOptionalTransitionFactory.set( 
                 xFactory->createInstanceWithContext( 
-                    ::rtl::OUString::createFromAscii( "com.sun.star.presentation.TransitionFactory" ),
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.TransitionFactory" )),
                     mxComponentContext ), 
                 uno::UNO_QUERY );
         }
@@ -1483,17 +1483,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::createFromAscii("DrawnInSlideshow");
+    rtl::OUString layerName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DrawnInSlideshow"));
     uno::Any aPropLayer;
         
     aPropLayer <<= layerName;
-    xLayerPropSet->setPropertyValue(rtl::OUString::createFromAscii("Name"), aPropLayer);
+    xLayerPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), aPropLayer);
     
     aPropLayer <<= true;
-    xLayerPropSet->setPropertyValue(rtl::OUString::createFromAscii("IsVisible"), aPropLayer);
+    xLayerPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsVisible")), aPropLayer);
     
     aPropLayer <<= false;
-    xLayerPropSet->setPropertyValue(rtl::OUString::createFromAscii("IsLocked"), aPropLayer);
+    xLayerPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsLocked")), aPropLayer);
 
     PolygonMap::iterator aIter=maPolygons.begin();
         
@@ -1525,7 +1525,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult
                 {
                     //create the PolyLineShape
                     uno::Reference< uno::XInterface > polyshape(xDocFactory->createInstance(
-                                                                    rtl::OUString::createFromAscii("com.sun.star.drawing.PolyLineShape") ) );		
+                                                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyLineShape")) ) );		
                     uno::Reference< drawing::XShape > rPolyShape(polyshape, uno::UNO_QUERY);
                                         
                     //Add the shape to the slide
@@ -1555,27 +1555,27 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult
                     //Give the built PointSequenceSequence.
                     uno::Any aParam;
                     aParam <<= aRetval;
-                    aXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygon"), aParam );                        				
+                    aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PolyPolygon")), aParam );                        				
 
                     //LineStyle : SOLID by default
                     uno::Any			aAny;
                     drawing::LineStyle	eLS;
                     eLS = drawing::LineStyle_SOLID;
                     aAny <<= eLS;
-                    aXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineStyle"), aAny );
+                    aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineStyle")), aAny );
 
                     //LineColor
                     sal_uInt32			nLineColor;
                     nLineColor = pPolyPoly->getRGBALineColor();
                     //Transform polygon color from RRGGBBAA to AARRGGBB					
                     aAny <<= RGBAColor2UnoColor(nLineColor);
-                    aXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineColor"), aAny );
+                    aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")), aAny );
                         
                     //LineWidth
                     double				fLineWidth;
                     fLineWidth = pPolyPoly->getStrokeWidth();
                     aAny <<= (sal_Int32)fLineWidth;
-                    aXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineWidth"), aAny );			
+                    aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineWidth")), aAny );			
 
                     // make polygons special						
                     xLayerManager->attachShapeToLayer(rPolyShape, xDrawnInSlideshow);
diff --git a/slideshow/source/engine/wakeupevent.cxx b/slideshow/source/engine/wakeupevent.cxx
index 9cab96a..a0ce86a 100644
--- a/slideshow/source/engine/wakeupevent.cxx
+++ b/slideshow/source/engine/wakeupevent.cxx
@@ -44,7 +44,7 @@ namespace slideshow
             boost::shared_ptr<canvas::tools::ElapsedTime> const & pTimeBase,
             ActivitiesQueue& rActivityQueue ) :
 #if OSL_DEBUG_LEVEL > 1
-            Event(::rtl::OUString::createFromAscii("WakeupEvent")),
+            Event(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WakeupEvent"))),
 #endif
             maTimer(pTimeBase),
             mnNextTime(0.0),
diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx
index baa074c..cd42055 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::createFromAscii("DelayFacade")),
+                Event(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DelayFacade"))),
 #endif
                 mpEvent( rEvent ),
                 mnTimeout( nTimeout )
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index 2ea4c23..0aec46b 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -418,7 +418,7 @@ DemoWindow::DemoWindow() :
     maUpdateTimer(),
     mbSlideDisplayed( false )
 {
-    SetText( rtl::OUString::createFromAscii( "Slideshow Demo" ) );
+    SetText( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Slideshow Demo" )) );
     SetSizePixel( Size( 640, 480 ) );
     EnablePaint( true );
 
@@ -460,7 +460,7 @@ void DemoWindow::init()
                                   uno::Reference< animations::XAnimationNode >(), 
                                   uno::Sequence< beans::PropertyValue >() );
             mxShow->setProperty( beans::PropertyValue( 
-                                     rtl::OUString::createFromAscii("RehearseTimings"),
+                                     rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RehearseTimings")),
                                      0,
                                      uno::makeAny( sal_True ),
                                      beans::PropertyState_DIRECT_VALUE ));