salgdi3.cxx (248a599f) salgdi3.cxx (8a718ffc)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 1265 unchanged lines hidden (view full) ---

1274 if( mpServerFont[ nFallbackLevel ]
1275 && !(rArgs.mnFlags & SAL_LAYOUT_DISABLE_GLYPH_PROCESSING) )
1276 {
1277#ifdef ENABLE_GRAPHITE
1278 // Is this a Graphite font?
1279 if (!bDisableGraphite_ &&
1280 GraphiteFontAdaptor::IsGraphiteEnabledFont(*mpServerFont[nFallbackLevel]))
1281 {
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 1265 unchanged lines hidden (view full) ---

1274 if( mpServerFont[ nFallbackLevel ]
1275 && !(rArgs.mnFlags & SAL_LAYOUT_DISABLE_GLYPH_PROCESSING) )
1276 {
1277#ifdef ENABLE_GRAPHITE
1278 // Is this a Graphite font?
1279 if (!bDisableGraphite_ &&
1280 GraphiteFontAdaptor::IsGraphiteEnabledFont(*mpServerFont[nFallbackLevel]))
1281 {
1282 sal_Int32 xdpi, ydpi;
1282 sal_Int32 xdpi = GetDisplay()->GetResolution().A();
1283 sal_Int32 ydpi = GetDisplay()->GetResolution().B();
1283
1284
1284 xdpi = GetDisplay()->GetResolution().A();
1285 ydpi = GetDisplay()->GetResolution().B();
1286
1287 GraphiteFontAdaptor * pGrfont = new GraphiteFontAdaptor( *mpServerFont[nFallbackLevel], xdpi, ydpi);
1288 if (!pGrfont) return NULL;
1289 pLayout = new GraphiteServerFontLayout(pGrfont);
1290 }
1291 else
1292#endif
1293 pLayout = new ServerFontLayout( *mpServerFont[ nFallbackLevel ] );
1294 }

--- 385 unchanged lines hidden --- 		1285 GraphiteFontAdaptor * pGrfont = new GraphiteFontAdaptor( *mpServerFont[nFallbackLevel], xdpi, ydpi);
1286 if (!pGrfont) return NULL;
1287 pLayout = new GraphiteServerFontLayout(pGrfont);
1288 }
1289 else
1290#endif
1291 pLayout = new ServerFontLayout( *mpServerFont[ nFallbackLevel ] );
1292 }

--- 385 unchanged lines hidden ---