RTL_CONSTASCII_USTRINGPARAM improvements

10 files changed, 52 insertions, 60 deletions

diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index 3adf90836013..82eadcc4eb84 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -114,7 +114,7 @@ sal_Bool SAL_CALL component_writeInfo( void*, void* pRegistryKey )
         try
         {
             Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
-            pXNewKey->createKey( OUString::createFromAscii( FILE_PICKER_REGKEY_NAME ) );
+            pXNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_REGKEY_NAME ) ));
         }
         catch( InvalidRegistryException& )
         {
@@ -138,7 +138,7 @@ void* SAL_CALL component_getFactory(
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, FILE_PICKER_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString::createFromAscii( FILE_PICKER_SERVICE_NAME );
+        aSNS.getArray( )[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_SERVICE_NAME ));
 
         Reference< XSingleServiceFactory > xFactory ( createSingleFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 2021e8c93794..545c54b9fa3f 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -76,8 +76,8 @@ namespace
     uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
     {
         uno::Sequence<rtl::OUString> aRet(2);
-        aRet[0] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.FilePicker");
-        aRet[1] = rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.SystemFilePicker");
+        aRet[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker"));
+        aRet[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker"));
         return aRet;
     }
 }
@@ -123,7 +123,7 @@ void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePicke
 {
     if ( rBHelper.bDisposed )
         throw lang::DisposedException(
-            rtl::OUString::createFromAscii( "object is already disposed" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "object is already disposed" )),
             static_cast< XFilePicker2* >( this ) );
 
     if ( !rBHelper.bInDispose && !rBHelper.bDisposed )
@@ -139,7 +139,7 @@ void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePi
 {
     if ( rBHelper.bDisposed )
         throw lang::DisposedException(
-            rtl::OUString::createFromAscii( "object is already disposed" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "object is already disposed" )),
             static_cast< XFilePicker2* >( this ) );
 
     rBHelper.aLC.removeInterface( getCppuType( &xListener ), xListener );
@@ -462,7 +462,7 @@ sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException)
         OSL_ENSURE(sal_False, "Could not start event notifier thread!");
 
         throw uno::RuntimeException(
-            rtl::OUString::createFromAscii("Error executing dialog"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error executing dialog")),
             static_cast<XFilePicker2*>(this));
     }
 
@@ -630,7 +630,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
     uno::Any aAny;
     if ( 0 == aArguments.getLength( ) )
         throw lang::IllegalArgumentException(
-            rtl::OUString::createFromAscii( "no arguments" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "no arguments" )),
             static_cast<XFilePicker2*>(this), 1);
 
     aAny = aArguments[0];
@@ -638,7 +638,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
     if ( (aAny.getValueType() != ::getCppuType((sal_Int16*)0)) &&
          (aAny.getValueType() != ::getCppuType((sal_Int8*)0)) )
          throw lang::IllegalArgumentException(
-            rtl::OUString::createFromAscii("invalid argument type"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("invalid argument type")),
             static_cast<XFilePicker2*>(this), 1);
 
     sal_Int16 templateId = -1;
@@ -728,7 +728,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
 
     default:
         throw lang::IllegalArgumentException(
-            rtl::OUString::createFromAscii( "Unknown template" ),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Unknown template" )),
             static_cast< XFilePicker2* >( this ),
             1 );
     }
@@ -768,7 +768,7 @@ void SAL_CALL CFilePicker::cancel()
 rtl::OUString SAL_CALL CFilePicker::getImplementationName()
     throw(uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii(FILE_PICKER_IMPL_NAME);
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FILE_PICKER_IMPL_NAME));
 }
 
 // -------------------------------------------------
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 3770cdaa330c..83b040f7edff 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -92,8 +92,8 @@ namespace
     css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker_getSupportedServiceNames()
     {
         css::uno::Sequence< ::rtl::OUString > aRet(2);
-        aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.FilePicker");
-        aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.SystemFilePicker");
+        aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilePicker"));
+        aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.SystemFilePicker"));
         return aRet;
     }
 }
@@ -552,17 +552,9 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An
     throw(css::uno::Exception       ,
           css::uno::RuntimeException)
 {
-    /*
-    // called twice ?
-    if (m_pDlg)
-        throw css::uno::Exception(
-                ::rtl::OUString::createFromAscii( "XInitialization::initialize() called twice." ),
-                static_cast< css::ui::dialogs::XFilePicker* >( this ));
-    */
-
     if (lArguments.getLength() < 1)
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii( "XInitialization::initialize() called without arguments." ),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "XInitialization::initialize() called without arguments." )),
                 static_cast< css::ui::dialogs::XFilePicker2* >( this ),
                 1);
 
@@ -692,7 +684,7 @@ void SAL_CALL VistaFilePicker::cancel()
 ::rtl::OUString SAL_CALL VistaFilePicker::getImplementationName()
     throw(css::uno::RuntimeException)
 {
-    return ::rtl::OUString::createFromAscii("com.sun.star.comp.fpicker.VistaFileDialog");
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.fpicker.VistaFileDialog"));
 }
 
 // -------------------------------------------------
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 42bab08800b0..541d1a166687 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -164,7 +164,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnFolderChange(IFileDialog* /*pDialog*
 //-----------------------------------------------------------------------------------------
 void lcl_updateVersionListDirectly(IFileDialog* pDialog)
 {
-    static const ::rtl::OUString SERVICENAME_REVISIONPERSISTENCE = ::rtl::OUString::createFromAscii("com.sun.star.document.DocumentRevisionListPersistence");
+    static const ::rtl::OUString SERVICENAME_REVISIONPERSISTENCE(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.DocumentRevisionListPersistence"));
     static const ::sal_Int16     CONTROL_VERSIONLIST             = css::ui::dialogs::ExtendedFilePickerElementIds::LISTBOX_VERSION;
 
     TFileDialog          iDialog   (pDialog);
@@ -405,8 +405,8 @@ void VistaFilePickerEventHandler::stopListening()
     }
 }
 
-static const ::rtl::OUString PROP_CONTROL_ID      = ::rtl::OUString::createFromAscii("control_id");
-static const ::rtl::OUString PROP_PICKER_LISTENER = ::rtl::OUString::createFromAscii("picker_listener");
+static const ::rtl::OUString PROP_CONTROL_ID(RTL_CONSTASCII_USTRINGPARAM("control_id"));
+static const ::rtl::OUString PROP_PICKER_LISTENER(RTL_CONSTASCII_USTRINGPARAM("picker_listener"));
 
 //-----------------------------------------------------------------------------------------
 class AsyncPickerEvents : public RequestHandler
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index c07a476b3671..1149c9657f22 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -93,24 +93,24 @@ static const ::sal_Int32 FEATURE_PLAY           =  256;
 static const ::sal_Int32 FEATURE_READONLY       =  512;
 static const ::sal_Int32 FEATURE_VERSION        = 1024;
 
-static const ::rtl::OUString PROP_PICKER_LISTENER     = ::rtl::OUString::createFromAscii("picker_listener"    ); // [XFilePickerListenert]
-static const ::rtl::OUString PROP_DIALOG_SHOW_RESULT  = ::rtl::OUString::createFromAscii("dialog_show_result" ); // [sal_Bool] true=OK, false=CANCEL
-static const ::rtl::OUString PROP_SELECTED_FILES      = ::rtl::OUString::createFromAscii("selected_files"     ); // [seq< OUString >] contains all user selected files (can be empty!)
-static const ::rtl::OUString PROP_MULTISELECTION_MODE = ::rtl::OUString::createFromAscii("multiselection_mode"); // [sal_Bool] true=ON, false=OFF
-static const ::rtl::OUString PROP_TITLE               = ::rtl::OUString::createFromAscii("title"              ); // [OUString]
-static const ::rtl::OUString PROP_FILENAME            = ::rtl::OUString::createFromAscii("filename"           ); // [OUString]
-static const ::rtl::OUString PROP_DIRECTORY           = ::rtl::OUString::createFromAscii("directory"          ); // [OUString]
-static const ::rtl::OUString PROP_FEATURES            = ::rtl::OUString::createFromAscii("features"           ); // [sal_Int32]
-static const ::rtl::OUString PROP_TEMPLATE_DESCR      = ::rtl::OUString::createFromAscii("templatedescription"); // [sal_Int32]
-static const ::rtl::OUString PROP_FILTER_TITLE        = ::rtl::OUString::createFromAscii("filter_title"       ); // [OUString]
-static const ::rtl::OUString PROP_FILTER_VALUE        = ::rtl::OUString::createFromAscii("filter_value"       ); // [OUString]
-static const ::rtl::OUString PROP_FORCE               = ::rtl::OUString::createFromAscii("force"              ); // [sal_Bool]
-
-static const ::rtl::OUString PROP_CONTROL_ID          = ::rtl::OUString::createFromAscii("control_id"         ); // [sal_Int16]
-static const ::rtl::OUString PROP_CONTROL_ACTION      = ::rtl::OUString::createFromAscii("control_action"     ); // [sal_Int16]
-static const ::rtl::OUString PROP_CONTROL_VALUE       = ::rtl::OUString::createFromAscii("control_value"      ); // [Any]
-static const ::rtl::OUString PROP_CONTROL_LABEL       = ::rtl::OUString::createFromAscii("control_label"      ); // [OUString]
-static const ::rtl::OUString PROP_CONTROL_ENABLE      = ::rtl::OUString::createFromAscii("control_enable"     ); // [sal_Bool] true=ON, false=OFF
+static const ::rtl::OUString PROP_PICKER_LISTENER(RTL_CONSTASCII_USTRINGPARAM("picker_listener"   ) ); // [XFilePickerListenert]
+static const ::rtl::OUString PROP_DIALOG_SHOW_RESULT(RTL_CONSTASCII_USTRINGPARAM("dialog_show_result" )); // [sal_Bool] true=OK, false=CANCEL
+static const ::rtl::OUString PROP_SELECTED_FILES(RTL_CONSTASCII_USTRINGPARAM("selected_files"     )); // [seq< OUString >] contains all user selected files (can be empty!)
+static const ::rtl::OUString PROP_MULTISELECTION_MODE(RTL_CONSTASCII_USTRINGPARAM("multiselection_mode")); // [sal_Bool] true=ON, false=OFF
+static const ::rtl::OUString PROP_TITLE(RTL_CONSTASCII_USTRINGPARAM("title"              )); // [OUString]
+static const ::rtl::OUString PROP_FILENAME(RTL_CONSTASCII_USTRINGPARAM("filename"          ) ); // [OUString]
+static const ::rtl::OUString PROP_DIRECTORY(RTL_CONSTASCII_USTRINGPARAM("directory"          )); // [OUString]
+static const ::rtl::OUString PROP_FEATURES(RTL_CONSTASCII_USTRINGPARAM("features"           )); // [sal_Int32]
+static const ::rtl::OUString PROP_TEMPLATE_DESCR(RTL_CONSTASCII_USTRINGPARAM("templatedescription")); // [sal_Int32]
+static const ::rtl::OUString PROP_FILTER_TITLE(RTL_CONSTASCII_USTRINGPARAM("filter_title"       )); // [OUString]
+static const ::rtl::OUString PROP_FILTER_VALUE(RTL_CONSTASCII_USTRINGPARAM("filter_value"       )); // [OUString]
+static const ::rtl::OUString PROP_FORCE(RTL_CONSTASCII_USTRINGPARAM("force"              )); // [sal_Bool]
+
+static const ::rtl::OUString PROP_CONTROL_ID(RTL_CONSTASCII_USTRINGPARAM("control_id"         )); // [sal_Int16]
+static const ::rtl::OUString PROP_CONTROL_ACTION(RTL_CONSTASCII_USTRINGPARAM("control_action"     )); // [sal_Int16]
+static const ::rtl::OUString PROP_CONTROL_VALUE(RTL_CONSTASCII_USTRINGPARAM("control_value"      )); // [Any]
+static const ::rtl::OUString PROP_CONTROL_LABEL(RTL_CONSTASCII_USTRINGPARAM("control_label"      )); // [OUString]
+static const ::rtl::OUString PROP_CONTROL_ENABLE(RTL_CONSTASCII_USTRINGPARAM("control_enable"     )); // [sal_Bool] true=ON, false=OFF
 
 //-----------------------------------------------------------------------------
 /** native implementation of the file picker on Vista and upcoming windows versions.
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index b7751a6f83a4..00c41cdfe30a 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -134,7 +134,7 @@ void CWinFileOpenImpl::setDisplayDirectory(const rtl::OUString& aDirectory)
         if ( ::osl::FileBase::E_None !=
              ::osl::FileBase::getSystemPathFromFileURL(aDirectory,aSysDirectory))
             throw IllegalArgumentException(
-                rtl::OUString::createFromAscii("Invalid directory"),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid directory")),
                 static_cast<XFilePicker2*>(m_FilePicker), 1);
 
         // we ensure that there is a trailing '/' at the end of
@@ -205,7 +205,7 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::execute(  ) throw(uno::RuntimeException)
         rc = ::com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL;
     else
         throw uno::RuntimeException(
-            rtl::OUString::createFromAscii("Error executing dialog"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error executing dialog")),
             static_cast<XFilePicker2*>(m_FilePicker));
 
     return rc;
@@ -224,7 +224,7 @@ void SAL_CALL CWinFileOpenImpl::appendFilter(const rtl::OUString& aTitle, const
 
     if (!bRet)
         throw IllegalArgumentException(
-            rtl::OUString::createFromAscii("filter already exists"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filter already exists")),
             static_cast<XFilePicker2*>(m_FilePicker), 1);
 
     // #95345# see MSDN OPENFILENAME
@@ -249,7 +249,7 @@ void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const rtl::OUString& aTitle)
 
     if (filterPos < 0)
         throw IllegalArgumentException(
-            rtl::OUString::createFromAscii("filter doesn't exist"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("filter doesn't exist")),
             static_cast<XFilePicker2*>(m_FilePicker), 1);
 
     // filter index of the base class starts with 1
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 0e71ec966b3d..02805f007a8e 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -94,12 +94,12 @@ void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type&
 {
     if ( m_rBroadcastHelper.bDisposed )
         throw lang::DisposedException(
-            ::rtl::OUString::createFromAscii( "FilePicker is already disposed" ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker is already disposed" )),
             uno::Reference< uno::XInterface >() );
 
     if ( m_rBroadcastHelper.bInDispose )
         throw lang::DisposedException(
-            ::rtl::OUString::createFromAscii( "FilePicker will be disposed now." ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker will be disposed now." )),
             uno::Reference< uno::XInterface >() );
 
     m_rBroadcastHelper.aLC.addInterface( aType, xListener );
@@ -114,7 +114,7 @@ void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type&
 {
     if ( m_rBroadcastHelper.bDisposed )
         throw lang::DisposedException(
-            ::rtl::OUString::createFromAscii( "FilePicker is already disposed." ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilePicker is already disposed." )),
             uno::Reference< uno::XInterface >() );
 
     m_rBroadcastHelper.aLC.removeInterface( aType, xListener );
diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index 4047e693a50a..2c26ad2750e6 100644
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
@@ -90,11 +90,11 @@ void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const ::com::sun::s
 {
     if (aImageFormat != ::com::sun::star::ui::dialogs::FilePreviewImageFormats::BITMAP)
         throw IllegalArgumentException(
-            OUString::createFromAscii("unsupported image format"), 0, 1);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("unsupported image format")), 0, 1);
 
     if (aImage.hasValue() && (aImage.getValueType() != getCppuType((Sequence<sal_Int8>*)0)))
         throw IllegalArgumentException(
-            OUString::createFromAscii("invalid image data"), 0, 2);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("invalid image data")), 0, 2);
 
      // save the new image data and force a redraw
     m_ImageData   = aImage;
diff --git a/fpicker/source/win32/filepicker/shared.hxx b/fpicker/source/win32/filepicker/shared.hxx
index a1334518b17b..38580770515a 100644
--- a/fpicker/source/win32/filepicker/shared.hxx
+++ b/fpicker/source/win32/filepicker/shared.hxx
@@ -31,9 +31,9 @@
 
 #include <rtl/ustring.hxx>
 
-const ::rtl::OUString BACKSLASH          = ::rtl::OUString::createFromAscii( "\\" );
-const ::rtl::OUString FILTER_SEPARATOR   = ::rtl::OUString::createFromAscii( "------------------------------------------" );
-const ::rtl::OUString ALL_FILES_WILDCARD = ::rtl::OUString::createFromAscii( "*.*" );
+const ::rtl::OUString BACKSLASH(RTL_CONSTASCII_USTRINGPARAM( "\\" ));
+const ::rtl::OUString FILTER_SEPARATOR(RTL_CONSTASCII_USTRINGPARAM( "------------------------------------------" ));
+const ::rtl::OUString ALL_FILES_WILDCARD(RTL_CONSTASCII_USTRINGPARAM( "*.*" ));
 const ::sal_Bool      ALLOW_DUPLICATES   = sal_True;
 
 #endif
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index 776268b6e2d2..a0d3aa974a0b 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -98,7 +98,7 @@ void TestFilterManager( Reference< XFilePicker > xFilePicker );
 
 Reference< XMultiServiceFactory >   g_xFactory;
 
-const OUString BMP_EXTENSION = OUString::createFromAscii( "bmp" );
+const OUString BMP_EXTENSION(RTL_CONSTASCII_USTRINGPARAM( "bmp" ));
 
 //-------------------------------------------------------------------------------------------------------------------------
 // a test client
@@ -294,7 +294,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[]  )
 
     Reference< XFilePicker > xFilePicker = Reference< XFilePicker >(
         g_xFactory->createInstanceWithArguments(
-            OUString::createFromAscii( FILE_PICKER_SERVICE_NAME ), arguments ), UNO_QUERY );
+            OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_SERVICE_NAME )), arguments ), UNO_QUERY );
 
         // install a FilePicker notifier
         Reference< XFilePickerListener > xFPListener(
@@ -304,9 +304,9 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[]  )
         if ( xFPNotifier.is( ) )
             xFPNotifier->addFilePickerListener( xFPListener );
 
-        xFilePicker->setTitle( OUString::createFromAscii("FileOpen Simple..."));
+        xFilePicker->setTitle( OUString(RTL_CONSTASCII_USTRINGPARAM("FileOpen Simple...")));
         xFilePicker->setMultiSelectionMode( sal_True );
-        xFilePicker->setDefaultName( OUString::createFromAscii("d:\\test2.sxw"));
+        xFilePicker->setDefaultName( OUString(RTL_CONSTASCII_USTRINGPARAM("d:\\test2.sxw")));
 
         OUString aDirURL;
         OUString aSysPath = OStringToOUString( "d:\\ueaeoe", osl_getThreadTextEncoding( ) );