mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some windows only Strings

Browse Source 
Change-Id: I264bdfc3453e2b6a17397ffb27154a29394c8c1b
This commit is contained in:
Caolán McNamara
2013-10-21 14:38:42 +01:00
parent 1ba10fb55a
commit 678b260c30
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vcl/win/source/gdi/salgdi3.cxx
View File

@@ -613,7 +613,7 @@ struct ImplEnumInfo
// ======================================================================= // =======================================================================
static CharSet ImplCharSetToSal( BYTE nCharSet ) static rtl_TextEncoding ImplCharSetToSal( BYTE nCharSet )
{ {
rtl_TextEncoding eTextEncoding; rtl_TextEncoding eTextEncoding;
@@ -2060,8 +2060,10 @@ static bool ImplGetFontAttrFromFile( const String& rFontFileURL,
return false; return false;
// convert byte strings to unicode // convert byte strings to unicode
rDFA.SetFamilyName(String( aBuffer + nNameOfs, osl_getThreadTextEncoding() )); char *pName = aBuffer + nNameOfs;
rDFA.SetStyleName(String( aBuffer + nStyleOfs, osl_getThreadTextEncoding() )); 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 // byte offset 0x4C7: OS2_fsSelection
const char nFSS = aBuffer[ 0x4C7 ]; const char nFSS = aBuffer[ 0x4C7 ];
@@ -2181,12 +2183,12 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
String aEmptyString; String aEmptyString;
OUString aBootStrap; OUString aBootStrap;
rtl::Bootstrap::get( String( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aBootStrap ); rtl::Bootstrap::get( OUString("BRAND_BASE_DIR"), aBootStrap );
aBootStrap += String( RTL_CONSTASCII_USTRINGPARAM( "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ) ) ); aBootStrap += OUString("/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ) );
rtl::Bootstrap aBootstrap( aBootStrap ); rtl::Bootstrap aBootstrap( aBootStrap );
OUString aUserPath; OUString aUserPath;
aBootstrap.getFrom( OUString( "UserInstallation" ), 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 ); String aBaseURL = aPath.copy( 0, aPath.lastIndexOf('/')+1 );
mpFontAttrCache = new ImplFontAttrCache( aUserPath, aBaseURL ); mpFontAttrCache = new ImplFontAttrCache( aUserPath, aBaseURL );