UniString->rtl::OUString

svtools/source/edit/texteng.cxx

@@ -217,26 +217,15 @@ void TextEngine::SetFont( const Font& rFont )
         maFont.SetAlign( ALIGN_TOP );
         mpRefDev->SetFont( maFont);
         Size aTextSize;
-        aTextSize.Width() = mpRefDev->GetTextWidth( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "    " ) ) );
+        aTextSize.Width() = mpRefDev->GetTextWidth(rtl::OUString("    "));
         aTextSize.Height() = mpRefDev->GetTextHeight();
         if ( !aTextSize.Width() )
-            aTextSize.Width() = mpRefDev->GetTextWidth( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "XXXX" ) ) );
+            aTextSize.Width() = mpRefDev->GetTextWidth(rtl::OUString("XXXX"));
 
         mnDefTab = (sal_uInt16)aTextSize.Width();
         if ( !mnDefTab )
             mnDefTab = 1;
         mnCharHeight = (sal_uInt16)aTextSize.Height();
-/*
-        // #93746# Doesn't work with CJK HalfWidth/FullWidth
-        FontMetric aRealFont( mpRefDev->GetFontMetric() );
-        if ( aRealFont.GetPitch() == PITCH_FIXED )
-        {
-            String aX100;
-            aX100.Fill( 100, 'X' );
-            mnFixCharWidth100 = (sal_uInt16)mpRefDev->GetTextWidth( aX100 );
-        }
-        else
-*/
         mnFixCharWidth100 = 0;
 
         FormatFullDoc();

svtools/source/misc/embedhlp.cxx

@@ -599,7 +599,7 @@ void EmbeddedObjectRef::DrawPaintReplacement( const Rectangle &rRect, const Stri
 {
     MapMode aMM( MAP_APPFONT );
     Size aAppFontSz = pOut->LogicToLogic( Size( 0, 8 ), &aMM, NULL );
-    Font aFnt( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Helvetica" ) ), aAppFontSz );
+    Font aFnt( rtl::OUString("Helvetica"), aAppFontSz );
     aFnt.SetTransparent( sal_True );
     aFnt.SetColor( Color( COL_LIGHTRED ) );
     aFnt.SetWeight( WEIGHT_BOLD );

svtools/source/misc/templatefoldercache.cxx

@@ -480,7 +480,7 @@ namespace svt
 
         sal_Bool    implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot );
 
-        static  String      getCacheFileName();
+        static  rtl::OUString getCacheFileName();
         static  sal_Int32   getMagicNumber();
         static  void        normalize( TemplateFolderContent& _rState );
 
@@ -523,9 +523,9 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    String TemplateFolderCacheImpl::getCacheFileName()
+    rtl::OUString TemplateFolderCacheImpl::getCacheFileName()
     {
-        return String::CreateFromAscii( ".templdir.cache" );
+        return rtl::OUString(".templdir.cache");
     }