vcl/win/source/gdi/salgdi3.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit e7b4a94ad02f78993a11d73744fd537557286381 Author: Caolán McNamara <caol...@redhat.com> Date: Sun Oct 20 15:15:22 2013 +0100 flush out some windows-only String::Assigns Change-Id: Ic971825bbe7d10849718f0ad0413305dbd5547a0 diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index a642e3d..9a4779a 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -892,7 +892,7 @@ static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXW& rE aDFA.SetSymbolFlag(rLogFont.lfCharSet == SYMBOL_CHARSET); // get the font face name - aDFA.SetFamilyName( String().Assign(reinterpret_cast<const sal_Unicode*>(rLogFont.lfFaceName))); + aDFA.SetFamilyName(OUString(reinterpret_cast<const sal_Unicode*>(rLogFont.lfFaceName))); // use the face's style name only if it looks reasonable const wchar_t* pStyleName = rEnumFont.elfStyle; @@ -902,7 +902,7 @@ static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXW& rE if( *p < 0x0020 ) break; if( p < pEnd ) - aDFA.SetStyleName( String().Assign(reinterpret_cast<const sal_Unicode*>(pStyleName))); + aDFA.SetStyleName(OUString(reinterpret_cast<const sal_Unicode*>(pStyleName))); // get device specific font attributes aDFA.mbOrientation = (nFontType & RASTER_FONTTYPE) == 0; @@ -1667,7 +1667,7 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe wchar_t aFaceName[LF_FACESIZE+60]; if( ::GetTextFaceW( getHDC(), sizeof(aFaceName)/sizeof(wchar_t), aFaceName ) ) - pMetric->SetFamilyName( String().Assign( reinterpret_cast<const sal_Unicode*>(aFaceName))); + pMetric->SetFamilyName(OUString(reinterpret_cast<const sal_Unicode*>(aFaceName))); // get the font metric TEXTMETRICA aWinMetric;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits