6 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index cbee3dfdc90c..d98787cc5974 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2225,7 +2225,7 @@ namespace svxform
         if ( sInstName.isEmpty() )
         {
             SAL_WARN( "svx.form", "DataNavigatorWindow::CreateInstancePage(): instance without name" );
-            String sTemp = String::CreateFromAscii( "untitled" );
+            String sTemp = rtl::OUString("untitled");
             sTemp += String::CreateFromInt32( nPageId );
             sInstName = sTemp;
         }
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index fc1b92c23e2f..24a0b87d6a95 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -130,7 +130,7 @@ sal_uInt32 OFilterItemExchange::getFormatId()
     static sal_uInt32 s_nFormat = (sal_uInt32)-1;
     if ((sal_uInt32)-1 == s_nFormat)
     {
-        s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"form.FilterControlExchange\""));
+        s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"form.FilterControlExchange\""));
         DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OFilterExchangeHelper::getFormatId: bad exchange id!");
     }
     return s_nFormat;
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index c13198482aa8..1d9be6d061d6 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -343,7 +343,7 @@ namespace svxform
         static sal_uInt32 s_nFormat = (sal_uInt32)-1;
         if ((sal_uInt32)-1 == s_nFormat)
         {
-            s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"svxform.ControlPathExchange\""));
+            s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.ControlPathExchange\""));
             DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getControlPathFormatId: bad exchange id!");
         }
         return s_nFormat;
@@ -355,7 +355,7 @@ namespace svxform
         static sal_uInt32 s_nFormat = (sal_uInt32)-1;
         if ((sal_uInt32)-1 == s_nFormat)
         {
-            s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"svxform.HiddenControlModelsExchange\""));
+            s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.HiddenControlModelsExchange\""));
             DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getHiddenControlModelsFormatId: bad exchange id!");
         }
         return s_nFormat;
@@ -367,7 +367,7 @@ namespace svxform
         static sal_uInt32 s_nFormat = (sal_uInt32)-1;
         if ((sal_uInt32)-1 == s_nFormat)
         {
-            s_nFormat = SotExchange::RegisterFormatName(String::CreateFromAscii("application/x-openoffice;windows_formatname=\"svxform.FieldNameExchange\""));
+            s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.FieldNameExchange\""));
             DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getFieldExchangeFormatId: bad exchange id!");
         }
         return s_nFormat;
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index ab4189f9c2ba..a39bb920a9c3 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -233,7 +233,7 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView )
 {
     m_pImpl->acquire();
     SetPool( &SFX_APP()->GetPool() );
-    SetName( String::CreateFromAscii( "Form" ) );
+    SetName( rtl::OUString("Form") );
 
     SetView(m_pFormView);
 }
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index ddf5f46f8305..e59f6bd83700 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -1000,8 +1000,8 @@ void FmSearchEngine::SearchNextImpl()
         {   // da natuerlich in allen anderen Faellen auch * und ? im Suchstring erlaubt sind, aber nicht als WildCards zaehlen
             // sollen, muss ich normieren
             UniString aTmp(strSearchExpression);
-            static const UniString s_sStar = UniString::CreateFromAscii("\\*");
-            static const UniString s_sQuotation = UniString::CreateFromAscii("\\?");
+            const rtl::OUString s_sStar("\\*");
+            const rtl::OUString s_sQuotation("\\?");
             aTmp.SearchAndReplaceAll('*', s_sStar);
             aTmp.SearchAndReplaceAll('?', s_sQuotation);
             strSearchExpression = aTmp;
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index ca621e899835..195b47eb892a 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1090,7 +1090,7 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ )
 
         if ( !xWizard.is() )
         {
-            ShowServiceNotAvailableError( NULL, String::CreateFromAscii( pWizardAsciiName ), sal_True );
+            ShowServiceNotAvailableError( NULL, rtl::OUString::createFromAscii(pWizardAsciiName), sal_True );
         }
         else
         {