diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-21 14:38:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-21 14:38:42 +0100 |
| commit | 678b260c30ffd06d6c5ae94d81e5d9f738c2b8a7 (patch) | |
| tree | 5cf48de80de7a0395493f74148992a92c7c0439d | |
| parent | 1ba10fb55a854d1eb8541a6866eb5250abf21f67 (diff) | |
some windows only Strings
Change-Id: I264bdfc3453e2b6a17397ffb27154a29394c8c1b
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index a9efe50bf508..7bbb009f9298 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -613,7 +613,7 @@ struct ImplEnumInfo // ======================================================================= -static CharSet ImplCharSetToSal( BYTE nCharSet ) +static rtl_TextEncoding ImplCharSetToSal( BYTE nCharSet ) { rtl_TextEncoding eTextEncoding; @@ -2060,8 +2060,10 @@ static bool ImplGetFontAttrFromFile( const String& rFontFileURL, return false; // convert byte strings to unicode - rDFA.SetFamilyName(String( aBuffer + nNameOfs, osl_getThreadTextEncoding() )); - rDFA.SetStyleName(String( aBuffer + nStyleOfs, osl_getThreadTextEncoding() )); + char *pName = aBuffer + nNameOfs; + rDFA.SetFamilyName(OUString(pName, strlen(pName), osl_getThreadTextEncoding())); + char *pStyle = aBuffer + nStyleOfs; + rDFA.SetStyleName(OUString(pStyle, strlen(pStyle), osl_getThreadTextEncoding() )); // byte offset 0x4C7: OS2_fsSelection const char nFSS = aBuffer[ 0x4C7 ]; @@ -2181,12 +2183,12 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) String aEmptyString; OUString aBootStrap; - rtl::Bootstrap::get( String( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aBootStrap ); - aBootStrap += String( RTL_CONSTASCII_USTRINGPARAM( "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ) ) ); + rtl::Bootstrap::get( OUString("BRAND_BASE_DIR"), aBootStrap ); + aBootStrap += OUString("/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ) ); rtl::Bootstrap aBootstrap( aBootStrap ); OUString aUserPath; aBootstrap.getFrom( OUString( "UserInstallation" ), aUserPath ); - aUserPath += String( RTL_CONSTASCII_USTRINGPARAM("/user/config/fontnames.dat") ); + aUserPath += "/user/config/fontnames.dat"; String aBaseURL = aPath.copy( 0, aPath.lastIndexOf('/')+1 ); mpFontAttrCache = new ImplFontAttrCache( aUserPath, aBaseURL ); |