RTL_CONSTASCII_USTRINGPARAM macro

6 files changed, 30 insertions, 30 deletions

diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index b4f57b365ac3..f00bf1f00ab9 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -64,7 +64,7 @@ Reference<XInterface> SAL_CALL PresenterCanvas_createInstance (
 
 ::rtl::OUString PresenterCanvas_getImplementationName (void) throw(RuntimeException)
 {
-    return OUString::createFromAscii("com.sun.star.comp.Draw.PresenterCanvasFactory");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterCanvasFactory"));
 }
 
 
@@ -74,7 +74,7 @@ Sequence<rtl::OUString> SAL_CALL PresenterCanvas_getSupportedServiceNames (void)
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.rendering.Canvas"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.Canvas")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -233,7 +233,7 @@ void SAL_CALL PresenterCanvas::initialize (
             if ( ! (rArguments[2] >>= mxSharedWindow))
             {
                 throw lang::IllegalArgumentException(
-                    OUString::createFromAscii("PresenterCanvas: invalid shared window"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid shared window")),
                     static_cast<XWeak*>(this),
                     1);
             }
@@ -241,7 +241,7 @@ void SAL_CALL PresenterCanvas::initialize (
             if ( ! (rArguments[3] >>= mxSharedCanvas))
             {
                 throw lang::IllegalArgumentException(
-                    OUString::createFromAscii("PresenterCanvas: invalid shared canvas"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid shared canvas")),
                     static_cast<XWeak*>(this),
                     2);
             }
@@ -249,7 +249,7 @@ void SAL_CALL PresenterCanvas::initialize (
             if ( ! (rArguments[4] >>= mxWindow))
             {
                 throw lang::IllegalArgumentException(
-                    OUString::createFromAscii("PresenterCanvas: invalid window"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid window")),
                     static_cast<XWeak*>(this),
                     3);
             }
@@ -270,7 +270,7 @@ void SAL_CALL PresenterCanvas::initialize (
     else
     {
         throw RuntimeException(
-            OUString::createFromAscii("PresenterCanvas: invalid number of arguments"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterCanvas: invalid number of arguments")),
                 static_cast<XWeak*>(this));
     }
 }
diff --git a/sd/source/ui/presenter/PresenterCanvasFactory.cxx b/sd/source/ui/presenter/PresenterCanvasFactory.cxx
index 81b990f57f09..cfb1d84ee5a3 100644
--- a/sd/source/ui/presenter/PresenterCanvasFactory.cxx
+++ b/sd/source/ui/presenter/PresenterCanvasFactory.cxx
@@ -252,7 +252,7 @@ Reference<rendering::XCanvas> PresenterCanvasFactory::CreateCanvas (
             xFactory->createInstanceWithArguments(
                 rsCanvasServiceName.getLength()>0
                     ? rsCanvasServiceName
-                        : OUString::createFromAscii("com.sun.star.rendering.VCLCanvas"),
+                        : OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.VCLCanvas")),
                 aArg),
             UNO_QUERY);
     }
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index 5814b2d16e13..493c3c5a4bed 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -61,7 +61,7 @@ Reference<XInterface> SAL_CALL PresenterHelperService_createInstance (
 ::rtl::OUString PresenterHelperService_getImplementationName (void)
     throw(RuntimeException)
 {
-    return OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper"));
 }
 
 
@@ -71,7 +71,7 @@ Sequence<rtl::OUString> SAL_CALL PresenterHelperService_getSupportedServiceNames
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.drawing.PresenterHelper"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterHelper")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -177,7 +177,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createSharedCanvas (
         || ! rxWindow.is())
     {
         throw RuntimeException(
-            OUString::createFromAscii("illegal argument"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("illegal argument")),
             Reference<XInterface>(static_cast<XWeak*>(this)));
     }
 
@@ -223,7 +223,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas (
             xFactory->createInstanceWithArguments(
                 rsOptionalCanvasServiceName.getLength()>0
                     ? rsOptionalCanvasServiceName
-                    : OUString::createFromAscii("com.sun.star.rendering.VCLCanvas"),
+                    : OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.rendering.VCLCanvas")),
                 aArg),
             UNO_QUERY);
     }
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index 12f54ff91a2d..d7c8793a6d63 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -100,7 +100,7 @@ Reference<XInterface> SAL_CALL PresenterPreviewCache_createInstance (
 
 ::rtl::OUString PresenterPreviewCache_getImplementationName (void) throw(RuntimeException)
 {
-    return OUString::createFromAscii("com.sun.star.comp.Draw.PresenterPreviewCache");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterPreviewCache"));
 }
 
 
@@ -110,7 +110,7 @@ Sequence<rtl::OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceNames
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.drawing.PresenterPreviewCache"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterPreviewCache")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index cf9550baf1c2..0b93c4d657f3 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -73,7 +73,7 @@ Reference<XInterface> SAL_CALL PresenterTextViewService_createInstance (
 
 ::rtl::OUString PresenterTextViewService_getImplementationName (void) throw(RuntimeException)
 {
-    return OUString::createFromAscii("com.sun.star.comp.Draw.PresenterTextView");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterTextView"));
 }
 
 
@@ -83,7 +83,7 @@ Sequence<rtl::OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNam
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.drawing.PresenterTextView"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterTextView")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -193,7 +193,7 @@ void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments)
     else
     {
         throw RuntimeException(
-            OUString::createFromAscii("PresenterTextView: invalid number of arguments"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterTextView: invalid number of arguments")),
                 static_cast<XWeak*>(this));
     }
 }
@@ -303,15 +303,15 @@ void PresenterTextView::ThrowIfDisposed (void)
 //===== PresenterTextView::Implementation =====================================
 
 PresenterTextView::Implementation::Implementation (void)
-    : msTextPropertyName(OUString::createFromAscii("Text")),
-      msBitmapPropertyName(OUString::createFromAscii("Bitmap")),
-      msSizePropertyName(OUString::createFromAscii("Size")),
-      msBackgroundColorPropertyName(OUString::createFromAscii("BackgroundColor")),
-      msTextColorPropertyName(OUString::createFromAscii("TextColor")),
-      msFontDescriptorPropertyName(OUString::createFromAscii("FontDescriptor")),
-      msTopPropertyName(OUString::createFromAscii("Top")),
-      msTopRelativePropertyName(OUString::createFromAscii("RelativeTop")),
-      msTotalHeightPropertyName(OUString::createFromAscii("TotalHeight")),
+    : msTextPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Text"))),
+      msBitmapPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmap"))),
+      msSizePropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Size"))),
+      msBackgroundColorPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("BackgroundColor"))),
+      msTextColorPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("TextColor"))),
+      msFontDescriptorPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("FontDescriptor"))),
+      msTopPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("Top"))),
+      msTopRelativePropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeTop"))),
+      msTotalHeightPropertyName(OUString(RTL_CONSTASCII_USTRINGPARAM("TotalHeight"))),
       mxBitmap(),
       mpCanvas(),
       mpOutputDevice(new VirtualDevice(*Application::GetDefaultDevice(), 0, 0)),
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index dbd43cbbab5b..148e8322b15e 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -54,7 +54,7 @@ Reference<XInterface> SAL_CALL SlideRenderer_createInstance (
 
 ::rtl::OUString SlideRenderer_getImplementationName (void) throw(RuntimeException)
 {
-    return OUString::createFromAscii("com.sun.star.comp.Draw.SlideRenderer");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.SlideRenderer"));
 }
 
 
@@ -64,7 +64,7 @@ Sequence<rtl::OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void)
     throw (RuntimeException)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.drawing.SlideRenderer"));
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SlideRenderer")));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -117,7 +117,7 @@ void SAL_CALL SlideRenderer::initialize (const Sequence<Any>& rArguments)
     else
     {
         throw RuntimeException(
-            OUString::createFromAscii("SlideRenderer: invalid number of arguments"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("SlideRenderer: invalid number of arguments")),
                 static_cast<XWeak*>(this));
     }
 }
@@ -203,7 +203,7 @@ BitmapEx SlideRenderer::CreatePreview (
     const SdPage* pPage = SdPage::getImplementation(rxSlide);
     if (pPage == NULL)
         throw lang::IllegalArgumentException(
-            OUString::createFromAscii("SlideRenderer::createPreview() called with invalid slide"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("SlideRenderer::createPreview() called with invalid slide")),
             static_cast<XWeak*>(this),
             0);
 
@@ -211,7 +211,7 @@ BitmapEx SlideRenderer::CreatePreview (
     Size aPageSize = pPage->GetSize();
     if (aPageSize.Height() <= 0)
         throw lang::IllegalArgumentException(
-            OUString::createFromAscii("SlideRenderer::createPreview() called with invalid size"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("SlideRenderer::createPreview() called with invalid size")),
             static_cast<XWeak*>(this),
             1);