Some removal/replacement of the String/UniString with OUString

27 files changed, 188 insertions, 201 deletions

diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index ee146dbc25ea..931f5b7fa1a8 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -20,7 +20,6 @@
 
 #include <stdio.h>
 
-//
 #include <tools/solar.h>
 #include <vcl/svapp.hxx>
 #include <vcl/bitmap.hxx>
@@ -480,7 +479,7 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead,
         if ( nCount && ( (sal_uInt32)nNumber < 10 ) )
         {
             aString.AppendAscii( " LanguageLevel:" );
-            aString.Append( UniString::CreateFromInt32( nNumber ) );
+            aString.Append( OUString::valueOf( nNumber ) );
         }
     }
     aVDev.DrawText( aRect, aString, TEXT_DRAW_CLIP | TEXT_DRAW_MULTILINE );
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index 63d787e4e12f..857f6633d662 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -177,7 +177,7 @@ rtl::OString OutputFile(const rtl::OString &rInput, const char * pExt)
     rtl::OUString aUniInput(rtl::OStringToOUString(rInput, RTL_TEXTENCODING_ASCII_US));
     DirEntry aFileName(aUniInput);
 
-    UniString aExt( pExt, RTL_TEXTENCODING_ASCII_US );
+    OUString aExt = OStringToOUString( pExt, RTL_TEXTENCODING_ASCII_US );
     aFileName.SetExtension( aExt );
 
     return rtl::OUStringToOString(aFileName.GetFull(), RTL_TEXTENCODING_ASCII_US);
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index 1452d42d177c..d77fe9074b5e 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -117,20 +117,20 @@ private:
             comphelper::getProcessComponentContext() );
         static uno::Reference<lang::XMultiComponentFactory > xServiceManager(
             xContext->getServiceManager() );
-        static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString(  "com.sun.star.sheet.GlobalSheetSettings"  ) ,xContext ), uno::UNO_QUERY_THROW );
+        static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( OUString(  "com.sun.star.sheet.GlobalSheetSettings"  ) ,xContext ), uno::UNO_QUERY_THROW );
         return xProps;
     }
 
     bool getReplaceCellsWarning() throw ( uno::RuntimeException )
     {
         sal_Bool res = false;
-        getGlobalSheetSettings()->getPropertyValue( rtl::OUString(REPLACE_CELLS_WARNING) ) >>= res;
+        getGlobalSheetSettings()->getPropertyValue( OUString(REPLACE_CELLS_WARNING) ) >>= res;
         return ( res == sal_True );
     }
 
     void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException )
     {
-        getGlobalSheetSettings()->setPropertyValue( rtl::OUString(REPLACE_CELLS_WARNING), uno::makeAny( bState ) );
+        getGlobalSheetSettings()->setPropertyValue( OUString(REPLACE_CELLS_WARNING), uno::makeAny( bState ) );
     }
 public:
     PasteCellsWarningReseter() throw ( uno::RuntimeException )
@@ -260,7 +260,7 @@ getCurrentDocument() throw (uno::RuntimeException)
 
 
     uno::Any aModel;
-    SbxVariable *pCompVar = basicChosen->Find(  UniString("ThisComponent"), SbxCLASS_OBJECT );
+    SbxVariable *pCompVar = basicChosen->Find( "ThisComponent", SbxCLASS_OBJECT );
 
     if ( pCompVar )
     {
@@ -275,14 +275,14 @@ getCurrentDocument() throw (uno::RuntimeException)
             if ( !xModel.is() )
             {
                 throw uno::RuntimeException(
-                    rtl::OUString( "Can't extract model from basic ( its obviously not set yet  therefore don't know the currently selected document)" ), uno::Reference< uno::XInterface >() );
+                    "Can't extract model from basic ( its obviously not set yet  therefore don't know the currently selected document)", uno::Reference< uno::XInterface >() );
             }
             return xModel;
         }
         else
         {
             OSL_TRACE("Have model ThisComponent points to url %s",
-            ::rtl::OUStringToOString( xModel->getURL(),
+            OUStringToOString( xModel->getURL(),
                 RTL_TEXTENCODING_ASCII_US ).pData->buffer );
         }
     }
@@ -290,7 +290,7 @@ getCurrentDocument() throw (uno::RuntimeException)
     {
         OSL_TRACE("Failed to get ThisComponent");
         throw uno::RuntimeException(
-            rtl::OUString( "Can't determine the currently selected document" ),
+            OUString( "Can't determine the currently selected document" ),
             uno::Reference< uno::XInterface >() );
     }
     return xModel;
@@ -393,15 +393,15 @@ void PrintOutHelper( const uno::Any& From, const uno::Any& To, const uno::Any& C
     if ( nCopies > 1 ) // Collate only useful when more that 1 copy
         Collate >>= bCollate;
 
-    rtl::OUString sRange(   "-"  );
-    rtl::OUString sFileName;
+    OUString sRange(   "-"  );
+    OUString sFileName;
 
     if (( nFrom || nTo ) )
     {
         if ( nFrom )
-            sRange = ( ::rtl::OUString::valueOf( nFrom ) + sRange );
+            sRange = OUString::valueOf( nFrom ) + sRange;
         if ( nTo )
-            sRange += ::rtl::OUString::valueOf( nTo );
+            sRange += OUString::valueOf( nTo );
     }
 
     if (  PrToFileName.getValue() )
@@ -471,18 +471,18 @@ void PrintOutHelper( const uno::Any& From, const uno::Any& To, const uno::Any& C
     dispatchExecute( xModel, SID_VIEWSHELL1 );
 }
 
-rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeException )
+OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeException )
 {
     uno::Type aType = pvargItem.getValueType();
     uno::TypeClass eTypeClass = aType.getTypeClass();
-    rtl::OUString sString;
+    OUString sString;
     switch ( eTypeClass )
     {
         case uno::TypeClass_BOOLEAN:
         {
             sal_Bool bBool = false;
             pvargItem >>= bBool;
-            sString = rtl::OUString::valueOf( bBool );
+            sString = OUString::valueOf( bBool );
             break;
         }
         case uno::TypeClass_STRING:
@@ -492,14 +492,14 @@ rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeEx
             {
                 float aFloat = 0;
                 pvargItem >>= aFloat;
-                sString = rtl::OUString::valueOf( aFloat );
+                sString = OUString::valueOf( aFloat );
                 break;
             }
         case uno::TypeClass_DOUBLE:
             {
                 double aDouble = 0;
                 pvargItem >>= aDouble;
-                sString = rtl::OUString::valueOf( aDouble );
+                sString = OUString::valueOf( aDouble );
                 break;
             }
         case uno::TypeClass_SHORT:
@@ -508,7 +508,7 @@ rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeEx
             {
                 sal_Int32 aNum = 0;
                 pvargItem >>= aNum;
-                sString = rtl::OUString::valueOf( aNum );
+                sString = OUString::valueOf( aNum );
                 break;
             }
 
@@ -516,27 +516,27 @@ rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeEx
             {
                 sal_Int64 aHyper = 0;
                 pvargItem >>= aHyper;
-                sString = rtl::OUString::valueOf( aHyper );
+                sString = OUString::valueOf( aHyper );
                 break;
             }
         default:
-                   throw uno::RuntimeException( rtl::OUString(  "Invalid type, can't convert"  ), uno::Reference< uno::XInterface >() );
+                   throw uno::RuntimeException( OUString(  "Invalid type, can't convert"  ), uno::Reference< uno::XInterface >() );
     }
     return sString;
 }
 
 
-rtl::OUString
-ContainerUtilities::getUniqueName( const uno::Sequence< ::rtl::OUString >&  _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator)
+OUString
+ContainerUtilities::getUniqueName( const uno::Sequence< OUString >&  _slist, const OUString& _sElementName, const OUString& _sSuffixSeparator)
 {
     return getUniqueName(_slist, _sElementName, _sSuffixSeparator, sal_Int32(2));
 }
 
-rtl::OUString
-ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix)
+OUString
+ContainerUtilities::getUniqueName( const uno::Sequence< OUString >& _slist, const OUString _sElementName, const OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix)
 {
     sal_Int32 a = _nStartSuffix;
-    rtl::OUString scompname = _sElementName;
+    OUString scompname = _sElementName;
     bool bElementexists = true;
     sal_Int32 nLen = _slist.getLength();
     if ( nLen == 0 )
@@ -551,13 +551,13 @@ ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist,
                 return scompname;
             }
         }
-        scompname = _sElementName + _sSuffixSeparator + rtl::OUString::valueOf( a++ );
+        scompname = _sElementName + _sSuffixSeparator + OUString::valueOf( a++ );
     }
-    return rtl::OUString();
+    return OUString();
 }
 
 sal_Int32
-ContainerUtilities::FieldInList( const uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString )
+ContainerUtilities::FieldInList( const uno::Sequence< OUString >& SearchList, const OUString& SearchString )
 {
     sal_Int32 FieldLen = SearchList.getLength();
     sal_Int32 retvalue = -1;
@@ -581,9 +581,9 @@ bool NeedEsc(sal_Unicode cCode)
     return (STRING_NOTFOUND != sEsc.Search(cCode));
 }
 
-rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike )
+OUString VBAToRegexp(const OUString &rIn, bool bForLike )
 {
-    rtl::OUStringBuffer sResult;
+    OUStringBuffer sResult;
     const sal_Unicode *start = rIn.getStr();
     const sal_Unicode *end = start + rIn.getLength();
 
@@ -600,11 +600,11 @@ rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike )
                 start++;
                 break;
             case '*':
-                sResult.append(rtl::OUString(".*"));
+                sResult.append(OUString(".*"));
                 start++;
                 break;
             case '#':
-                sResult.append(rtl::OUString("[0-9]"));
+                sResult.append(OUString("[0-9]"));
                 start++;
                 break;
             case '~':
@@ -698,42 +698,42 @@ UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComp
     double UserFormGeometryHelper::getLeft()
     {
     sal_Int32 nLeft = 0;
-    mxModel->getPropertyValue( rtl::OUString(  VBA_LEFT  ) ) >>= nLeft;
+    mxModel->getPropertyValue( OUString(  VBA_LEFT  ) ) >>= nLeft;
     return Millimeter::getInPoints( nLeft );
     }
     void UserFormGeometryHelper::setLeft( double nLeft )
     {
-        mxModel->setPropertyValue( rtl::OUString(  VBA_LEFT  ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nLeft ) ) );
+        mxModel->setPropertyValue( OUString(  VBA_LEFT  ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nLeft ) ) );
     }
     double UserFormGeometryHelper::getTop()
     {
     sal_Int32 nTop = 0;
-    mxModel->getPropertyValue( rtl::OUString(   VBA_TOP  ) ) >>= nTop;
+    mxModel->getPropertyValue( OUString(   VBA_TOP  ) ) >>= nTop;
     return Millimeter::getInPoints( nTop );
     }
     void UserFormGeometryHelper::setTop( double nTop )
     {
-    mxModel->setPropertyValue( rtl::OUString(   VBA_TOP  ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nTop ) ) );
+    mxModel->setPropertyValue( OUString(   VBA_TOP  ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nTop ) ) );
     }
     double UserFormGeometryHelper::getHeight()
     {
     sal_Int32 nHeight = 0;
-    mxModel->getPropertyValue( rtl::OUString(   SC_UNONAME_CELLHGT  ) ) >>= nHeight;
+    mxModel->getPropertyValue( OUString(   SC_UNONAME_CELLHGT  ) ) >>= nHeight;
     return Millimeter::getInPoints( nHeight );
     }
     void UserFormGeometryHelper::setHeight( double nHeight )
     {
-    mxModel->setPropertyValue( rtl::OUString(   SC_UNONAME_CELLHGT  ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nHeight ) ) );
+    mxModel->setPropertyValue( OUString(   SC_UNONAME_CELLHGT  ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nHeight ) ) );
     }
     double UserFormGeometryHelper::getWidth()
     {
     sal_Int32 nWidth = 0;
-    mxModel->getPropertyValue( rtl::OUString(   SC_UNONAME_CELLWID  ) ) >>= nWidth;
+    mxModel->getPropertyValue( OUString(   SC_UNONAME_CELLWID  ) ) >>= nWidth;
     return Millimeter::getInPoints( nWidth );
     }
     void UserFormGeometryHelper::setWidth( double nWidth)
     {
-    mxModel->setPropertyValue( rtl::OUString(   SC_UNONAME_CELLWID  ), uno::makeAny(  Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) );
+    mxModel->setPropertyValue( OUString(   SC_UNONAME_CELLWID  ), uno::makeAny(  Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) );
     }
 
 SfxItemSet*
diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx
index f6fc76effd5c..815b8b7bb9b9 100644
--- a/sc/source/ui/vba/vbaname.cxx
+++ b/sc/source/ui/vba/vbaname.cxx
@@ -57,28 +57,26 @@ ScVbaName::getWorkSheet() throw (css::uno::RuntimeException)
     return xApplication->getActiveSheet();
 }
 
-::rtl::OUString
+OUString
 ScVbaName::getName() throw (css::uno::RuntimeException)
 {
-    String sName;
-    sName += UniString ( mxNamedRange->getName() );
-    return ::rtl::OUString( sName );
+    return mxNamedRange->getName();
 }
 
 void
-ScVbaName::setName( const ::rtl::OUString & rName ) throw (css::uno::RuntimeException)
+ScVbaName::setName( const OUString & rName ) throw (css::uno::RuntimeException)
 {
     mxNamedRange->setName( rName );
 }
 
-::rtl::OUString
+OUString
 ScVbaName::getNameLocal() throw (css::uno::RuntimeException)
 {
     return getName();
 }
 
 void
-ScVbaName::setNameLocal( const ::rtl::OUString & rName ) throw (css::uno::RuntimeException)
+ScVbaName::setNameLocal( const OUString & rName ) throw (css::uno::RuntimeException)
 {
     setName( rName );
 }
@@ -94,127 +92,127 @@ ScVbaName::setVisible( sal_Bool /*bVisible*/ ) throw (css::uno::RuntimeException
 {
 }
 
-::rtl::OUString
+OUString
 ScVbaName::getValue() throw (css::uno::RuntimeException)
 {
-    ::rtl::OUString sValue = mxNamedRange->getContent();
-    ::rtl::OUString sSheetName = getWorkSheet()->getName();
-    ::rtl::OUString sSegmentation = ::rtl::OUString::createFromAscii( ";" );
-    ::rtl::OUString sNewSegmentation = ::rtl::OUString::createFromAscii( "," );
-    ::rtl::OUString sResult;
+    OUString sValue = mxNamedRange->getContent();
+    OUString sSheetName = getWorkSheet()->getName();
+    OUString sSegmentation = OUString::createFromAscii( ";" );
+    OUString sNewSegmentation = OUString::createFromAscii( "," );
+    OUString sResult;
     sal_Int32 nFrom = 0;
     sal_Int32 nTo = 0;
     nTo = sValue.indexOf( sSegmentation, nFrom );
     while ( nTo != -1 )
     {
-        ::rtl::OUString sTmpValue = sValue.copy( nFrom, nTo - nFrom );
+        OUString sTmpValue = sValue.copy( nFrom, nTo - nFrom );
         if ( sTmpValue.toChar() == '$' )
         {
-            ::rtl::OUString sTmp = sTmpValue.copy( 1 );
-            sTmp = sTmp.replaceAt(0, OUString(sSheetName + ::rtl::OUString::createFromAscii(".")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("!"));
+            OUString sTmp = sTmpValue.copy( 1 );
+            sTmp = sTmp.replaceAt(0, OUString(sSheetName + OUString::createFromAscii(".")).getLength(), sSheetName + OUString::createFromAscii("!"));
             sResult += sTmp;
             sResult += sNewSegmentation;
         }
         nFrom = nTo + 1;
         nTo = sValue.indexOf( sSegmentation, nFrom );
     }
-    ::rtl::OUString sTmpValue = sValue.copy( nFrom );
+    OUString sTmpValue = sValue.copy( nFrom );
     if ( sTmpValue.toChar() == '$' )
     {
-        ::rtl::OUString sTmp = sTmpValue.copy(1);
-        sTmp = sTmp.replaceAt(0, OUString(sSheetName + ::rtl::OUString::createFromAscii(".")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("!"));
+        OUString sTmp = sTmpValue.copy(1);
+        sTmp = sTmp.replaceAt(0, OUString(sSheetName + OUString::createFromAscii(".")).getLength(), sSheetName + OUString::createFromAscii("!"));
         sResult += sTmp;
     }
     if (sResult.indexOf('=') != 0)
     {
-        sResult = ::rtl::OUString::createFromAscii("=") + sResult;
+        sResult = OUString::createFromAscii("=") + sResult;
     }
     return sResult;
 }
 
 void
-ScVbaName::setValue( const ::rtl::OUString & rValue ) throw (css::uno::RuntimeException)
+ScVbaName::setValue( const OUString & rValue ) throw (css::uno::RuntimeException)
 {
-    ::rtl::OUString sSheetName = getWorkSheet()->getName();
-    ::rtl::OUString sValue = rValue;
-    ::rtl::OUString sSegmentation = ::rtl::OUString::createFromAscii( "," );
-    ::rtl::OUString sNewSegmentation = ::rtl::OUString::createFromAscii( ";" );
-    ::rtl::OUString sResult;
+    OUString sSheetName = getWorkSheet()->getName();
+    OUString sValue = rValue;
+    OUString sSegmentation = OUString::createFromAscii( "," );
+    OUString sNewSegmentation = OUString::createFromAscii( ";" );
+    OUString sResult;
     sal_Int32 nFrom = 0;
     sal_Int32 nTo = 0;
     if (sValue.indexOf('=') == 0)
     {
-        ::rtl::OUString sTmp = sValue.copy(1);
+        OUString sTmp = sValue.copy(1);
         sValue = sTmp;
     }
     nTo = sValue.indexOf( sSegmentation, nFrom );
     while ( nTo != -1 )
     {
-        ::rtl::OUString sTmpValue = sValue.copy( nFrom, nTo - nFrom );
-        sTmpValue = sTmpValue.replaceAt(0, OUString(sSheetName + ::rtl::OUString::createFromAscii("!")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("."));
+        OUString sTmpValue = sValue.copy( nFrom, nTo - nFrom );
+        sTmpValue = sTmpValue.replaceAt(0, OUString(sSheetName + OUString::createFromAscii("!")).getLength(), sSheetName + OUString::createFromAscii("."));
         if (sTmpValue.copy(0, sSheetName.getLength()).equals(sSheetName))
         {
-            sTmpValue = ::rtl::OUString::createFromAscii("$") + sTmpValue;
+            sTmpValue = OUString::createFromAscii("$") + sTmpValue;
         }
         sTmpValue += sNewSegmentation;
         sResult += sTmpValue;
         nFrom = nTo + 1;
         nTo = sValue.indexOf( sSegmentation, nFrom );
     }
-    ::rtl::OUString sTmpValue = sValue.copy( nFrom );
-    sTmpValue = sTmpValue.replaceAt(0, OUString(sSheetName + ::rtl::OUString::createFromAscii("!")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("."));
+    OUString sTmpValue = sValue.copy( nFrom );
+    sTmpValue = sTmpValue.replaceAt(0, OUString(sSheetName + OUString::createFromAscii("!")).getLength(), sSheetName + OUString::createFromAscii("."));
     if (sTmpValue.copy(0, sSheetName.getLength()).equals(sSheetName))
     {
-        sTmpValue = ::rtl::OUString::createFromAscii("$") + sTmpValue;
+        sTmpValue = OUString::createFromAscii("$") + sTmpValue;
     }
     sResult += sTmpValue;
     mxNamedRange->setContent(sResult);
 }
 
-::rtl::OUString
+OUString
 ScVbaName::getRefersTo() throw (css::uno::RuntimeException)
 {
     return getValue();
 }
 
 void
-ScVbaName::setRefersTo( const ::rtl::OUString & rRefersTo ) throw (css::uno::RuntimeException)
+ScVbaName::setRefersTo( const OUString & rRefersTo ) throw (css::uno::RuntimeException)
 {
     setValue( rRefersTo );
 }
 
-::rtl::OUString
+OUString
 ScVbaName::getRefersToLocal() throw (css::uno::RuntimeException)
 {
     return getRefersTo();
 }
 
 void
-ScVbaName::setRefersToLocal( const ::rtl::OUString & rRefersTo ) throw (css::uno::RuntimeException)
+ScVbaName::setRefersToLocal( const OUString & rRefersTo ) throw (css::uno::RuntimeException)
 {
     setRefersTo( rRefersTo );
 }
 
-::rtl::OUString
+OUString
 ScVbaName::getRefersToR1C1() throw (css::uno::RuntimeException)
 {
     return getRefersTo();
 }
 
 void
-ScVbaName::setRefersToR1C1( const ::rtl::OUString & rRefersTo ) throw (css::uno::RuntimeException)
+ScVbaName::setRefersToR1C1( const OUString & rRefersTo ) throw (css::uno::RuntimeException)
 {
     setRefersTo( rRefersTo );
 }
 
-::rtl::OUString
+OUString
 ScVbaName::getRefersToR1C1Local() throw (css::uno::RuntimeException)
 {
     return getRefersTo();
 }
 
 void
-ScVbaName::setRefersToR1C1Local( const ::rtl::OUString & rRefersTo ) throw (css::uno::RuntimeException)
+ScVbaName::setRefersToR1C1Local( const OUString & rRefersTo ) throw (css::uno::RuntimeException)
 {
     setRefersTo( rRefersTo );
 }
@@ -238,20 +236,20 @@ ScVbaName::Delete() throw (css::uno::RuntimeException)
     mxNames->removeByName( mxNamedRange->getName() );
 }
 
-rtl::OUString
+OUString
 ScVbaName::getServiceImplName()
 {
-    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaName"));
+    return OUString( "ScVbaName" );
 }
 
-uno::Sequence< rtl::OUString >
+uno::Sequence< OUString >
 ScVbaName::getServiceNames()
 {
-    static uno::Sequence< rtl::OUString > aServiceNames;
+    static uno::Sequence< OUString > aServiceNames;
     if ( aServiceNames.getLength() == 0 )
     {
         aServiceNames.realloc( 1 );
-        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Name" ) );
+        aServiceNames[ 0 ] = OUString( "ooo.vba.excel.Name" );
     }
     return aServiceNames;
 }
diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx
index 5f1ea723da1c..5c44fbb9fd03 100644
--- a/sc/source/ui/vba/vbanames.cxx
+++ b/sc/source/ui/vba/vbanames.cxx
@@ -72,10 +72,10 @@ ScVbaNames::getScDocument()
     uno::Reference< frame::XModel > xModel( getModel() , uno::UNO_QUERY_THROW );
     ScTabViewShell * pTabViewShell = excel::getBestViewShell( xModel );
     if ( !pTabViewShell )
-        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No ViewShell available")), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( "No ViewShell available", uno::Reference< uno::XInterface >() );
     ScViewData* pViewData = pTabViewShell->GetViewData();
     if ( !pViewData )
-        throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No ViewData available")), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( "No ViewData available", uno::Reference< uno::XInterface >() );
     return pViewData->GetDocument();
 }
 
@@ -93,7 +93,7 @@ ScVbaNames::Add( const css::uno::Any& Name ,
                                         const css::uno::Any& RefersToR1C1,
                                         const css::uno::Any& RefersToR1C1Local ) throw (css::uno::RuntimeException)
 {
-    rtl::OUString sName;
+    OUString sName;
     uno::Reference< excel::XRange > xRange;
     if ( Name.hasValue() )
         Name >>= sName;
@@ -103,7 +103,7 @@ ScVbaNames::Add( const css::uno::Any& Name ,
     {
         if ( !ScRangeData::IsNameValid( sName , getScDocument() ) )
         {
-            ::rtl::OUString sResult ;
+            OUString sResult ;
             sal_Int32 nToken = 0;
             sal_Int32 nIndex = 0;
             sResult = sName.getToken( nToken , '!' , nIndex );
@@ -139,18 +139,14 @@ ScVbaNames::Add( const css::uno::Any& Name ,
         ScAddress aPos( static_cast< SCCOL >( aAddr.StartColumn ) , static_cast< SCROW >( aAddr.StartRow ) , static_cast< SCTAB >(aAddr.Sheet ) );
         uno::Any xAny2 ;
         String sRangeAdd = xRange->Address( xAny2, xAny2 , xAny2 , xAny2, xAny2 );
-        String sTmp;
-        sTmp += "$";
-        sTmp += UniString(xRange->getWorksheet()->getName());
-        sTmp += ".";
-        sTmp += sRangeAdd;
         if ( mxNames.is() )
         {
             RangeType nType = RT_NAME;
             table::CellAddress aCellAddr( aAddr.Sheet , aAddr.StartColumn , aAddr.StartRow );
             if ( mxNames->hasByName( sName ) )
                 mxNames->removeByName(sName);
-            mxNames->addNewByName( sName , rtl::OUString(sTmp) , aCellAddr , (sal_Int32)nType);
+            OUString sTmp = "$" + xRange->getWorksheet()->getName() + "." + sRangeAdd;
+            mxNames->addNewByName( sName , sTmp , aCellAddr , (sal_Int32)nType);
         }
     }
     return css::uno::Any();
@@ -177,20 +173,20 @@ ScVbaNames::createCollectionObject( const uno::Any& aSource )
     return uno::makeAny( uno::Reference< excel::XName > ( new ScVbaName( getParent(), mxContext, xName, mxNames , mxModel ) ) );
 }
 
-rtl::OUString
+OUString
 ScVbaNames::getServiceImplName()
 {
-    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaNames"));
+    return OUString( "ScVbaNames" );
 }
 
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<OUString>
 ScVbaNames::getServiceNames()
 {
-    static uno::Sequence< rtl::OUString > aServiceNames;
+    static uno::Sequence< OUString > aServiceNames;
     if ( aServiceNames.getLength() == 0 )
     {
         aServiceNames.realloc( 1 );
-        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.NamedRanges" ) );
+        aServiceNames[ 0 ] = "ooo.vba.excel.NamedRanges";
     }
     return aServiceNames;
 }
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 6376827fa7b7..71fb02415349 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -147,7 +147,7 @@ SdPublishingDesign::SdPublishingDesign()
     String  aFilterConfigPath( "Office.Common/Filter/Graphic/Export/JPG" );
     FilterConfigItem aFilterConfigItem( aFilterConfigPath );
     sal_Int32 nCompression = aFilterConfigItem.ReadInt32( OUString( KEY_QUALITY ), 75 );
-    m_aCompression = UniString::CreateFromInt32( nCompression );
+    m_aCompression = OUString::valueOf( nCompression );
     m_aCompression.Append( sal_Unicode('%') );
 
     SvtUserOptions aUserOptions;
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 6f311e77ef78..fd5aa1eb1fb5 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -120,9 +120,9 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     }
 
     // Welches Oject wird gerade angezeigt?
-    String info = UniString::CreateFromInt32( pProgrInfo->GetCurObj() );
-    info.Append( sal_Unicode('/') );
-    info.Append( UniString::CreateFromInt32( pProgrInfo->GetObjCount() ) );
+    OUString info = OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetCurObj() ) )
+            + "/"
+            + OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetObjCount() ) );
     aFiObjInfo.SetText(info);
 
     // Wieviele Actions sind schon aufgebrochen?
@@ -132,9 +132,9 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     }
     else
     {
-        info = UniString::CreateFromInt32( pProgrInfo->GetCurAction() );
-        info.Append( sal_Unicode('/') );
-        info.Append( UniString::CreateFromInt32( pProgrInfo->GetActionCount() ) );
+        info = OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetCurAction() ) )
+            + "/"
+            + OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetActionCount() ) );
         aFiActInfo.SetText(info);
     }
 
@@ -145,9 +145,9 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit )
     }
     else
     {
-        info = UniString::CreateFromInt32( pProgrInfo->GetCurInsert() );
-        info.Append( sal_Unicode('/') );
-        info.Append( UniString::CreateFromInt32( pProgrInfo->GetInsertCount() ) );
+        info = OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetCurInsert() ) )
+            + "/"
+            + OUString::valueOf( static_cast<sal_Int32>( pProgrInfo->GetInsertCount() ) );
         aFiInsInfo.SetText(info);
     }
 
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index aed9b5dbb03d..7fc0c58e55a9 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -124,28 +124,28 @@ CopyDlg::~CopyDlg()
 {
     String& rStr = GetExtraData();
 
-    rStr = rtl::OUString::valueOf(static_cast<sal_Int64>(maNumFldCopies.GetValue()));
+    rStr = OUString::valueOf(static_cast<sal_Int64>(maNumFldCopies.GetValue()));
     rStr.Append( TOKEN );
 
-    rStr += rtl::OUString::valueOf(static_cast<sal_Int64>(maMtrFldMoveX.GetValue()));
+    rStr += OUString::valueOf(static_cast<sal_Int64>(maMtrFldMoveX.GetValue()));
     rStr.Append( TOKEN );
 
-    rStr += rtl::OUString::valueOf(static_cast<sal_Int64>(maMtrFldMoveY.GetValue()));
+    rStr += OUString::valueOf(static_cast<sal_Int64>(maMtrFldMoveY.GetValue()));
     rStr.Append( TOKEN );
 
-    rStr += rtl::OUString::valueOf(static_cast<sal_Int64>(maMtrFldAngle.GetValue()));
+    rStr += OUString::valueOf(static_cast<sal_Int64>(maMtrFldAngle.GetValue()));
     rStr.Append( TOKEN );
 
-    rStr += rtl::OUString::valueOf(static_cast<sal_Int64>(maMtrFldWidth.GetValue()));
+    rStr += OUString::valueOf(static_cast<sal_Int64>(maMtrFldWidth.GetValue()));
     rStr.Append( TOKEN );
 
-    rStr += rtl::OUString::valueOf(static_cast<sal_Int64>(maMtrFldHeight.GetValue()));
+    rStr += OUString::valueOf(static_cast<sal_Int64>(maMtrFldHeight.GetValue()));
     rStr.Append( TOKEN );
 
-    rStr += UniString::CreateFromInt32( (long)maLbStartColor.GetSelectEntryColor().GetColor() );
+    rStr += OUString::valueOf( (long)maLbStartColor.GetSelectEntryColor().GetColor() );
     rStr.Append( TOKEN );
 
-    rStr += UniString::CreateFromInt32( (long)maLbEndColor.GetSelectEntryColor().GetColor() );
+    rStr += OUString::valueOf( (long)maLbEndColor.GetSelectEntryColor().GetColor() );
 }
 
 /*************************************************************************
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 7ea9c52f3a27..bb7841137733 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -195,25 +195,21 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
         {
             SdCustomShow* pShow = new SdCustomShow( *(*pCustomShowList)[nPos] );
-            String aStr( pShow->GetName() );
-            String aStrCopy( SdResId( STR_COPY_CUSTOMSHOW ) );
+            OUString aStr( pShow->GetName() );
+            OUString aStrCopy( SdResId( STR_COPY_CUSTOMSHOW ) );
 
-            sal_uInt16 nStrPos = aStr.Search( aStrCopy );
+            sal_uInt16 nStrPos = aStr.indexOf( aStrCopy );
             sal_uInt16 nNum = 1;
             if( nStrPos == STRING_NOTFOUND )
             {
-                aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) );
-                aStr.Append( aStrCopy );
-                aStr.Append( UniString::CreateFromInt32( nNum ) );
-                aStr.Append( sal_Unicode(')') );
-                nStrPos = aStr.Search( aStrCopy );
+                aStr = aStr + " ("  + aStrCopy + OUString::valueOf( nNum ) + ")";
+                nStrPos = aStr.indexOf( aStrCopy );
             }
-            nStrPos = nStrPos + (sal_uInt16)aStrCopy.Len();
+            nStrPos = nStrPos + (sal_uInt16)aStrCopy.getLength();
             // Um nicht ins Nirvana zu greifen (--> Endlosschleife)
-            if( nStrPos >= aStr.Len() )
+            if( nStrPos >= aStr.getLength() )
             {
-                aStr.Append( sal_Unicode(' ') );
-                aStr.Append( UniString::CreateFromInt32( nNum ) );
+                aStr = aStr + " " + OUString::valueOf( nNum );
             }
 
             // Name ueberpruefen...
@@ -226,7 +222,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
                      pCustomShow != NULL && bDifferent;
                      pCustomShow = (SdCustomShow*) pCustomShowList->Next() )
                 {
-                    if( aStr == pCustomShow->GetName() )
+                    if( aStr == OUString( pCustomShow->GetName() ) )
                         bDifferent = sal_False;
                 }
                 if( !bDifferent )
@@ -235,8 +231,8 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
 
                     const CharClass* pCharClass = rDoc.GetCharClass();
                     while( pCharClass->isDigit( aStr, nStrPos ) )
-                        aStr.Erase( nStrPos, 1 );
-                    aStr.Insert( UniString::CreateFromInt32( ++nNum ), nStrPos);
+                        aStr = aStr.replaceAt( nStrPos, 1, "" );
+                    aStr = aStr.copy( 0, nStrPos) + OUString::valueOf( ++nNum ) + aStr.copy( nStrPos);
                 }
 
             }
@@ -338,7 +334,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow,
          nPage++ )
     {
         pPage = rDoc.GetSdPage( (sal_uInt16) nPage, PK_STANDARD );
-        String aStr( pPage->GetName() );
+        OUString aStr( pPage->GetName() );
         aLbPages.InsertEntry( aStr );
     }
     //aLbPages.SelectEntryPos( 0 );
@@ -359,7 +355,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow,
     else
     {
         rpCustomShow = new SdCustomShow( &rDoc );
-        aEdtName.SetText( String( SdResId( STR_NEW_CUSTOMSHOW ) ) );
+        aEdtName.SetText( OUString( SdResId( STR_NEW_CUSTOMSHOW ) ) );
         aEdtName.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
         rpCustomShow->SetName( aEdtName.GetText() );
     }
@@ -412,7 +408,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p )
 
             for( sal_uInt16 i = 0; i < nCount; i++ )
             {
-                String aStr = aLbPages.GetSelectEntry( i );
+                OUString aStr = aLbPages.GetSelectEntry( i );
                 pEntry = aLbCustomPages.InsertEntry( aStr,
                                             0, sal_False, nPosCP );
 
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 9103971cfa1a..787d717f47f7 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -184,24 +184,24 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
 
     // Titel setzen und
     // entsprechende Seiten zum Dialog hinzufuegen
-    String aTitle;
+    OUString aTitle;
 
     switch( ePO )
     {
         case PO_TITLE:
-            aTitle = String(SdResId( STR_PSEUDOSHEET_TITLE ));
+            aTitle = OUString(SdResId( STR_PSEUDOSHEET_TITLE ));
         break;
 
         case PO_SUBTITLE:
-            aTitle = String(SdResId( STR_PSEUDOSHEET_SUBTITLE ));
+            aTitle = OUString(SdResId( STR_PSEUDOSHEET_SUBTITLE ));
         break;
 
         case PO_BACKGROUND:
-            aTitle = String(SdResId( STR_PSEUDOSHEET_BACKGROUND ));
+            aTitle = OUString(SdResId( STR_PSEUDOSHEET_BACKGROUND ));
         break;
 
         case PO_BACKGROUNDOBJECTS:
-            aTitle = String(SdResId( STR_PSEUDOSHEET_BACKGROUNDOBJECTS ));
+            aTitle = OUString(SdResId( STR_PSEUDOSHEET_BACKGROUNDOBJECTS ));
         break;
 
         case PO_OUTLINE_1:
@@ -213,13 +213,11 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
         case PO_OUTLINE_7:
         case PO_OUTLINE_8:
         case PO_OUTLINE_9:
-            aTitle = String(SdResId( STR_PSEUDOSHEET_OUTLINE ));
-            aTitle.Append( sal_Unicode(' ') );
-            aTitle.Append( UniString::CreateFromInt32( ePO - PO_OUTLINE_1 + 1 ) );
+            aTitle = OUString(SdResId( STR_PSEUDOSHEET_OUTLINE )) + " " + OUString::valueOf( ePO - PO_OUTLINE_1 + 1 );
         break;
 
         case PO_NOTES:
-            aTitle = String(SdResId( STR_PSEUDOSHEET_NOTES ));
+            aTitle = OUString(SdResId( STR_PSEUDOSHEET_NOTES ));
         break;
     }
     SetText( aTitle );
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index e92b1ae2e98e..01c04d7984e9 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -837,7 +837,7 @@ String SdTPAction::GetEditText( sal_Bool bFullDocDestination )
             {
                 const sal_uInt16 nPos = aLbOLEAction.GetSelectEntryPos();
                 if( nPos < aVerbVector.size() )
-                    aStr = UniString::CreateFromInt32( aVerbVector[ nPos ] );
+                    aStr = OUString::valueOf( aVerbVector[ nPos ] );
                 return aStr;
             }
         case presentation::ClickAction_DOCUMENT:
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index ecb7d9efa5e6..77960f056cc0 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -679,9 +679,9 @@ void    SdTpOptionsMisc::SetDrawMode()
 
 String SdTpOptionsMisc::GetScale( sal_Int32 nX, sal_Int32 nY )
 {
-    String aScale( UniString::CreateFromInt32( nX ) );
+    String aScale( OUString::valueOf( nX ) );
     aScale.Append( TOKEN );
-    aScale.Append( UniString::CreateFromInt32( nY ) );
+    aScale.Append( OUString::valueOf( nY ) );
 
     return( aScale );
 }
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index 14b2b51f33f4..5d13cc7238d6 100644
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -112,7 +112,7 @@ void FuLineEnd::DoExecute( SfxRequest& )
         {
             aName = aNewName;
             aName.Append( sal_Unicode(' ') );
-            aName.Append( UniString::CreateFromInt32( j++ ) );
+            aName.Append( OUString::valueOf( j++ ) );
             bDifferent = sal_True;
             for( long i = 0; i < nCount && bDifferent; i++ )
             {
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index cfb3f2f7a44d..0f465660d402 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -138,7 +138,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
             String aStr(SdResId( STR_LAYOUT_OUTLINE ));
             aStyleName.Append( aStr );
             aStyleName.Append( sal_Unicode(' ') );
-            aStyleName.Append( UniString::CreateFromInt32( nDepth ) );
+            aStyleName.Append( OUString::valueOf( nDepth ) );
         }
 
         SfxStyleSheetBasePool* pStyleSheetPool = mpDocSh->GetStyleSheetPool();
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index bb17fd4ac00f..d933768a4454 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -83,7 +83,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
         if ( !aStr.Len() )
         {
             aStr = String( SdResId( STR_PAGE ) );
-            aStr.Append( UniString::CreateFromInt32( nPage + 1 ) );
+            aStr.Append( OUString::valueOf( nPage + 1 ) );
         }
 
         aPageNameList[ nPage ] = aStr;
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index 5986bafe3b1a..b70c84345cae 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -75,9 +75,9 @@ SfxItemPresentation SfxPointItem::GetPresentation
 )   const
 {
     DBG_CHKTHIS(SfxPointItem, 0);
-    rText = UniString::CreateFromInt32(aVal.X());
+    rText = OUString::valueOf(aVal.X());
     rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-    rText += UniString::CreateFromInt32(aVal.Y());
+    rText += OUString::valueOf(aVal.Y());
     rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index 991fbc20c710..5c096a1fe3ca 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
@@ -72,13 +72,13 @@ SfxItemPresentation SfxRectangleItem::GetPresentation
 )   const
 {
     DBG_CHKTHIS(SfxRectangleItem, 0);
-    rText = UniString::CreateFromInt32(aVal.Top());
+    rText = OUString::valueOf(aVal.Top());
     rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-    rText += UniString::CreateFromInt32(aVal.Left());
+    rText += OUString::valueOf(aVal.Left());
     rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-    rText += UniString::CreateFromInt32(aVal.Bottom());
+    rText += OUString::valueOf(aVal.Bottom());
     rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-    rText += UniString::CreateFromInt32(aVal.Right());
+    rText += OUString::valueOf(aVal.Right());
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index 4660a1f794ee..4e6d3d512a84 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -71,9 +71,9 @@ SfxItemPresentation SfxSizeItem::GetPresentation
 )   const
 {
     DBG_CHKTHIS(SfxSizeItem, 0);
-    rText = UniString::CreateFromInt32(aVal.Width());
+    rText = OUString::valueOf(aVal.Width());
     rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-    rText += UniString::CreateFromInt32(aVal.Height());
+    rText += OUString::valueOf(aVal.Height());
     rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index ab827f0c9f77..6a8b4661a393 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -109,9 +109,9 @@ void CompressGraphicsDialog::Update()
     aBitmapSizeString += String( " x " ) ;
     aBitmapSizeString += GetUnitString( aOriginalSize100mm.Height(), eFieldUnit, cSeparator );
     aBitmapSizeString += String( " ( " ) ;
-    aBitmapSizeString += UniString::CreateFromInt32(aPixelSize.Width());
+    aBitmapSizeString += OUString::valueOf(aPixelSize.Width());
     aBitmapSizeString += String( " x " ) ;
-    aBitmapSizeString += UniString::CreateFromInt32(aPixelSize.Height());
+    aBitmapSizeString += OUString::valueOf(aPixelSize.Height());
     aBitmapSizeString += String( " px )" ) ;
     m_pFixedText2->SetText(aBitmapSizeString);
 
@@ -123,7 +123,7 @@ void CompressGraphicsDialog::Update()
     aViewSizeString += String( " x " ) ;
     aViewSizeString += GetUnitString( m_aViewSize100mm.Height(), eFieldUnit, cSeparator );
     aViewSizeString += ( " at " ) ;
-    aViewSizeString += UniString::CreateFromInt32(aValX);
+    aViewSizeString += OUString::valueOf(aValX);
     aViewSizeString += ( " DPI" ) ;
     m_pFixedText3->SetText(aViewSizeString);
 
@@ -134,7 +134,7 @@ void CompressGraphicsDialog::Update()
     sal_Int32 aNativeSize = aMemStream.Tell();
 
     String aNativeSizeString;
-    aNativeSizeString += UniString::CreateFromInt32(aNativeSize / 1024);
+    aNativeSizeString += OUString::valueOf(aNativeSize / 1024);
     aNativeSizeString += String( " kiB" ) ;
 
     m_pFixedText5->SetText(aNativeSizeString);
@@ -144,18 +144,18 @@ void CompressGraphicsDialog::Update()
 void CompressGraphicsDialog::UpdateNewWidthMF()
 {
     int nPixelX = (sal_Int32)( GetViewWidthInch() * m_dResolution );
-    m_pMFNewWidth->SetText( UniString::CreateFromInt32( nPixelX ) );
+    m_pMFNewWidth->SetText( OUString::valueOf( nPixelX ) );
 }
 
 void CompressGraphicsDialog::UpdateNewHeightMF()
 {
     int nPixelY = (sal_Int32)( GetViewHeightInch() * m_dResolution );
-    m_pMFNewHeight->SetText( UniString::CreateFromInt32( nPixelY ) );
+    m_pMFNewHeight->SetText( OUString::valueOf( nPixelY ) );
 }
 
 void CompressGraphicsDialog::UpdateResolutionLB()
 {
-    m_pResolutionLB->SetText( UniString::CreateFromInt32( (sal_Int32) m_dResolution ) );
+    m_pResolutionLB->SetText( OUString::valueOf( (sal_Int32) m_dResolution ) );
 }
 
 double CompressGraphicsDialog::GetViewWidthInch()
@@ -280,7 +280,7 @@ IMPL_LINK_NOARG( CompressGraphicsDialog, CalculateClickHdl )
     if ( aSize > 0 )
     {
         String aNewSizeString;
-        aNewSizeString += UniString::CreateFromInt32(aSize / 1024);
+        aNewSizeString += OUString::valueOf(aSize / 1024);
         aNewSizeString += String( " kiB" ) ;
         m_pFixedText6->SetText(aNewSizeString);
     }
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 8d61882eb17d..3df20db880ac 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -81,7 +81,7 @@ SfxItemPresentation SvxRotateModeItem::GetPresentation(
 //          break; // DURCHFALLEN!!!
 
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += UniString::CreateFromInt32( GetValue() );
+            rText += OUString::valueOf( GetValue() );
             break;
         default: ;//prevent warning
     }
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 63e553a5ee1e..614651552e52 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -638,12 +638,12 @@ SfxItemPresentation SdrFractionItem::GetPresentation(
     if(nValue.IsValid())
     {
         sal_Int32 nDiv = nValue.GetDenominator();
-        rText = UniString::CreateFromInt32(nValue.GetNumerator());
+        rText = OUString::valueOf(nValue.GetNumerator());
 
         if(nDiv != 1)
         {
             rText += sal_Unicode('/');
-            rText += UniString::CreateFromInt32(nDiv);
+            rText += OUString::valueOf(nDiv);
         }
     }
     else
@@ -695,9 +695,9 @@ SfxItemPresentation SdrScaleItem::GetPresentation(
     {
         sal_Int32 nDiv = GetValue().GetDenominator();
 
-        rText = UniString::CreateFromInt32(GetValue().GetNumerator());
+        rText = OUString::valueOf(GetValue().GetNumerator());
         rText += sal_Unicode(':');
-        rText += UniString::CreateFromInt32(nDiv);
+        rText += OUString::valueOf(nDiv);
     }
     else
     {
@@ -817,7 +817,7 @@ SfxItemPresentation SdrPercentItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/,
     SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
 {
-    rText = UniString::CreateFromInt32(GetValue());
+    rText = OUString::valueOf(GetValue());
     rText += sal_Unicode('%');
 
     if(ePres == SFX_ITEM_PRESENTATION_COMPLETE)
@@ -858,7 +858,7 @@ SfxItemPresentation SdrAngleItem::GetPresentation(
     if(bNeg)
         nValue = -nValue;
 
-    rText = UniString::CreateFromInt32(nValue);
+    rText = OUString::valueOf(nValue);
 
     if(nValue)
     {
@@ -1301,7 +1301,7 @@ SfxItemPresentation SdrTextAniDelayItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
     XubString& rText, const IntlWrapper *) const
 {
-    rText = UniString::CreateFromInt32(GetValue());
+    rText = OUString::valueOf(GetValue());
     rText += sal_Unicode('m');
     rText += sal_Unicode('s');
 
@@ -1351,7 +1351,7 @@ SfxItemPresentation SdrTextAniAmountItem::GetPresentation(
 
     if(nValue < 0)
     {
-        rText = UniString::CreateFromInt32(-nValue);
+        rText = OUString::valueOf(-nValue);
         rText += UniString(RTL_CONSTASCII_USTRINGPARAM("pixel"));
     }
     else
@@ -1489,11 +1489,11 @@ SfxItemPresentation SdrCustomShapeAdjustmentItem::GetPresentation(
     SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const
 {
     sal_uInt32 i, nCount = GetCount();
-    rText.Append( UniString::CreateFromInt32( nCount ) );
+    rText.Append( OUString::valueOf( static_cast<sal_Int32>( nCount ) ) );
     for ( i = 0; i < nCount; i++ )
     {
         rText += sal_Unicode( ' ' );
-        rText.Append( UniString::CreateFromInt32( GetValue( i ).nValue ) );
+        rText.Append( OUString::valueOf( static_cast<sal_Int32>( GetValue( i ).nValue ) ) );
     }
     if ( ePresentation == SFX_ITEM_PRESENTATION_COMPLETE )
     {
@@ -2058,7 +2058,7 @@ SfxItemPresentation SdrSignedPercentItem::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
     XubString& rText, const IntlWrapper *) const
 {
-    rText = UniString::CreateFromInt32(GetValue());
+    rText = OUString::valueOf(GetValue());
     rText += sal_Unicode('%');
 
     if(ePres == SFX_ITEM_PRESENTATION_COMPLETE)
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 7333a36331b6..b78f71c37926 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1249,13 +1249,13 @@ XubString SdrView::GetStatusText()
             if (nLen==0) bBrk=sal_True; // to be sure
         }
 
-        aStr.SearchAndReplaceAscii("%1", UniString::CreateFromInt32(nPar + 1));
-        aStr.SearchAndReplaceAscii("%2", UniString::CreateFromInt32(nLin + 1));
-        aStr.SearchAndReplaceAscii("%3", UniString::CreateFromInt32(nCol + 1));
+        aStr.SearchAndReplaceAscii("%1", OUString::valueOf(nPar + 1));
+        aStr.SearchAndReplaceAscii("%2", OUString::valueOf(nLin + 1));
+        aStr.SearchAndReplaceAscii("%3", OUString::valueOf(nCol + 1));
 
 #ifdef DBG_UTIL
         aStr += UniString( RTL_CONSTASCII_USTRINGPARAM( ", Level " ) );
-        aStr += UniString::CreateFromInt32( pTextEditOutliner->GetDepth( aSel.nEndPara ) );
+        aStr += OUString::valueOf( pTextEditOutliner->GetDepth( aSel.nEndPara ) );
 #endif
     }
 
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 581bcd0104cd..d7b04d513b45 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -99,7 +99,7 @@ SfxItemPresentation XLineTransparenceItem::GetPresentation
             rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
             rText.AppendAscii(": ");
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue()) );
+            rText += OUString::valueOf((sal_uInt16) GetValue());
             rText += sal_Unicode('%');
             return ePres;
         default:
@@ -495,7 +495,7 @@ SfxItemPresentation XFillTransparenceItem::GetPresentation
             rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
             rText.AppendAscii(": ");
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() ));
+            rText += OUString::valueOf((sal_uInt16) GetValue() );
             rText += sal_Unicode('%');
             return ePres;
         default:
@@ -622,7 +622,7 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation
 //          rText = XubString( ResId( RID_SVXSTR_GRADIENTSTEPCOUNT, DIALOG_MGR() ) );
 //          rText += ": ";
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() ));
+            rText += OUString::valueOf((sal_uInt16) GetValue() );
             return ePres;
         default:
             return SFX_ITEM_PRESENTATION_NONE;
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index fe1c414960d9..5a07ccff4dc1 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -80,8 +80,8 @@ const SwTwips lMinBorder = 1134;
 #define GAPBETWEENPAGES 284L
 
 // Constant strings.
-SW_DLLPUBLIC extern UniString aEmptyStr;    // ""
-SW_DLLPUBLIC extern rtl::OUString aDotStr;      // '.'
+SW_DLLPUBLIC extern String aEmptyStr;    // ""
+SW_DLLPUBLIC extern OUString aDotStr;      // '.'
 
 // For inserting of captions (what and where to insert).
 // It's here because it is not big enough to justify its own hxx
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index 8452a3daa5db..97329e9a7131 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -47,8 +47,8 @@
 
 using namespace com::sun::star;
 
-UniString aEmptyStr;    // constant string
-rtl::OUString aDotStr('.'); // constant string
+String aEmptyStr;    // constant string
+OUString aDotStr('.'); // constant string
 
 IMPL_FIXEDMEMPOOL_NEWDEL( SwAttrSet )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwStartNode )
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index e6ac2a2eea83..527a6ce44156 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -194,7 +194,7 @@ uno::Reference< text::XAutoTextGroup >  SwXAutoTextContainer::insertNewByName(
     if(STRING_NOTFOUND == sGroup.Search(GLOS_DELIM))
     {
         sGroup += GLOS_DELIM;
-        sGroup += UniString::CreateFromInt32(0);
+        sGroup += OUString::valueOf(0);
     }
     pGlossaries->NewGroupDoc(sGroup, sGroup.GetToken(0, GLOS_DELIM));
 
@@ -396,7 +396,7 @@ uno::Reference< text::XAutoTextEntry >  SwXAutoTextGroup::insertNewByName(const
         sal_Bool bNoAttr = !pxCursor && !pxRange;
         if(bNoAttr)
         {
-            sOnlyTxt = UniString(xTextRange->getString());
+            sOnlyTxt = OUString(xTextRange->getString());
             pOnlyTxt = &sOnlyTxt;
         }
 
@@ -494,7 +494,7 @@ void SwXAutoTextGroup::setName(const OUString& rName) throw( uno::RuntimeExcepti
     if(STRING_NOTFOUND == sNewGroup.Search(GLOS_DELIM))
     {
         sNewGroup += GLOS_DELIM;
-        sNewGroup += UniString::CreateFromInt32(0);
+        sNewGroup += OUString::valueOf(0);
     }
 
     //the name must be saved, the group may be invalidated while in RenameGroupDoc()
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index 7dee04c34f1f..ee63cd70e3b2 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -1095,7 +1095,7 @@ SfxItemPresentation SwRotationGrf::GetPresentation(
             rText = SW_RESSTR( STR_ROTATION );
         else if( rText.Len() )
             rText.Erase();
-        ( rText += UniString::CreateFromInt32( GetValue() )) += '\xB0';
+        ( rText += OUString::valueOf( GetValue() )) += '\xB0';
         break;
 
     default:
@@ -1118,7 +1118,7 @@ SfxItemPresentation SwLuminanceGrf::GetPresentation(
             rText = SW_RESSTR( STR_LUMINANCE );
         else if( rText.Len() )
             rText.Erase();
-        ( rText += UniString::CreateFromInt32( GetValue() )) += '%';
+        ( rText += OUString::valueOf( GetValue() )) += '%';
         break;
 
     default:
@@ -1141,7 +1141,7 @@ SfxItemPresentation SwContrastGrf::GetPresentation(
             rText = SW_RESSTR( STR_CONTRAST );
         else if( rText.Len() )
             rText.Erase();
-        ( rText += UniString::CreateFromInt32( GetValue() )) += '%';
+        ( rText += OUString::valueOf( GetValue() )) += '%';
         break;
 
     default:
@@ -1177,7 +1177,7 @@ SfxItemPresentation SwChannelGrf::GetPresentation(
         }
         else if( rText.Len() )
             rText.Erase();
-        ( rText += UniString::CreateFromInt32( GetValue() )) += '%';
+        ( rText += OUString::valueOf( GetValue() )) += '%';
         break;
 
     default:
@@ -1245,7 +1245,7 @@ SfxItemPresentation SwTransparencyGrf::GetPresentation(
             rText = SW_RESSTR( STR_TRANSPARENCY );
         else if( rText.Len() )
             rText.Erase();
-        ( rText += UniString::CreateFromInt32( GetValue() )) += '%';
+        ( rText += OUString::valueOf( GetValue() )) += '%';
         break;
 
     default: