convert vcl/font.hxx from String to OUString

Change-Id: I3df88f26516296ca8f4e81576e86372c8b499a84

4 files changed, 11 insertions, 11 deletions

diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 26a9dd41aed9..4270e9d31d6c 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -54,8 +54,8 @@ private:
     void                AskConfig();
 
     FontRefCount        mnRefCount;
-    String              maFamilyName;
-    String              maStyleName;
+    OUString            maFamilyName;
+    OUString            maStyleName;
     Size                maSize;
     Color               maColor;        // compatibility, now on output device
     Color               maFillColor;    // compatibility, now on output device
@@ -230,7 +230,7 @@ public:
 
 bool ParseCMAP( const unsigned char* pRawData, int nRawLength, CmapResult& );
 
-void UpdateAttributesFromPSName( const String& rPSName, ImplDevFontAttributes& );
+void UpdateAttributesFromPSName( const OUString& rPSName, ImplDevFontAttributes& );
 
 #endif // _SV_IMPFONT_HXX
 
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index eb678f62312a..3baff68a789c 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -249,7 +249,7 @@ Font::Font( const Font& rFont )
         mpImplFont->mnRefCount++;
 }
 
-Font::Font( const String& rFamilyName, const Size& rSize )
+Font::Font( const OUString& rFamilyName, const Size& rSize )
 {
     DBG_CTOR( Font, NULL );
 
@@ -258,7 +258,7 @@ Font::Font( const String& rFamilyName, const Size& rSize )
     mpImplFont->maSize       = rSize;
 }
 
-Font::Font( const String& rFamilyName, const String& rStyleName, const Size& rSize )
+Font::Font( const OUString& rFamilyName, const OUString& rStyleName, const Size& rSize )
 {
     DBG_CTOR( Font, NULL );
 
@@ -343,7 +343,7 @@ void Font::SetName( const OUString& rFamilyName )
     mpImplFont->maFamilyName = rFamilyName;
 }
 
-void Font::SetStyleName( const String& rStyleName )
+void Font::SetStyleName( const OUString& rStyleName )
 {
     DBG_CHKTHIS( Font, NULL );
 
@@ -618,7 +618,7 @@ sal_Bool Font::operator==( const Font& rFont ) const
 
 void Font::Merge( const Font& rFont )
 {
-    if ( rFont.GetName().Len() )
+    if ( !rFont.GetName().isEmpty() )
     {
         SetName( rFont.GetName() );
         SetStyleName( rFont.GetStyleName() );
@@ -988,9 +988,9 @@ sal_Bool Font::IsTransparent() const { return mpImplFont->mbTransparent; }
 
 FontAlign Font::GetAlign() const { return mpImplFont->meAlign; }
 
-const String& Font::GetName() const { return mpImplFont->maFamilyName; }
+const OUString& Font::GetName() const { return mpImplFont->maFamilyName; }
 
-const String& Font::GetStyleName() const { return mpImplFont->maStyleName; }
+const OUString& Font::GetStyleName() const { return mpImplFont->maStyleName; }
 
 const Size& Font::GetSize() const { return mpImplFont->maSize; }
 
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 0f61edfd07e5..33f17abac378 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -523,7 +523,7 @@ Font OutputDevice::GetDefaultFont( sal_uInt16 nType, LanguageType eLang,
         }
 
         // No Name, than set all names
-        if ( !aFont.GetName().Len() )
+        if ( aFont.GetName().isEmpty() )
         {
             if ( nFlags & DEFAULTFONT_FLAGS_ONLYONE )
             {
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index baa82e536d8d..af46ba0a6acb 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -4625,7 +4625,7 @@ Font PDFWriterImpl::replaceFont( const Font& rControlFont, const Font&  rAppSetF
     bool bAdjustSize = false;
 
     Font aFont( rControlFont );
-    if( ! aFont.GetName().Len() )
+    if( aFont.GetName().isEmpty() )
     {
         aFont = rAppSetFont;
         if( rControlFont.GetHeight() )