[Libreoffice-commits] core.git: vcl/aqua

[Stephan Bergmann]

 vcl/aqua/source/gdi/salgdicommon.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 3391f02e1a4c19101a08a1061bfb6ef47100f281
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 21 17:39:29 2013 +0200

    String -> OUString
    
    Change-Id: Iabb80c72f9e6aab3b58590299ce9f22e0ae1a5fa

diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx b/vcl/aqua/source/gdi/salgdicommon.cxx
index d9c54d9..eedf607 100644
--- a/vcl/aqua/source/gdi/salgdicommon.cxx
+++ b/vcl/aqua/source/gdi/salgdicommon.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "sal/config.h"
+
+#include <cstring>
+
 #include <sal/types.h>
 #include <osl/endian.h>
 #include <osl/file.hxx>
@@ -195,7 +199,8 @@ sal_Bool AquaSalGraphics::CreateFontSubset( const OUString& rToFile,
     TTGlobalFontInfo aTTInfo;
     ::GetTTGlobalFontInfo( pSftFont, &aTTInfo );
     rInfo.m_nFontType   = FontSubsetInfo::SFNT_TTF;
-    rInfo.m_aPSName     = String( aTTInfo.psname, RTL_TEXTENCODING_UTF8 );
+    rInfo.m_aPSName     = OUString(
+        aTTInfo.psname, std::strlen(aTTInfo.psname), RTL_TEXTENCODING_UTF8 );
     rInfo.m_aFontBBox   = Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ),
                                     Point( aTTInfo.xMax, aTTInfo.yMax ) );
     rInfo.m_nCapHeight  = aTTInfo.yMax; // Well ...