diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-20 15:15:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-20 15:16:47 +0100 |
| commit | e7b4a94ad02f78993a11d73744fd537557286381 (patch) | |
| tree | 1499586da8cdfe74879d35e3e7d29e6b1e83b74b /vcl | |
| parent | 0bc89aac4c64bb833e387657f680e194c26aef97 (diff) | |
flush out some windows-only String::Assigns
Change-Id: Ic971825bbe7d10849718f0ad0413305dbd5547a0
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index a642e3d5b5ab..9a4779a23bdf 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; |