diff options
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/factory/cf_service.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 874b1ffe68bf..9bb75d5e26b0 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -304,8 +304,6 @@ Reference<XInterface> CanvasFactory::lookupAndUse( if( OpenGLWrapper::isVCLOpenGLEnabled() ) bForceLastEntry = true; #endif - if( SkiaHelper::isVCLSkiaEnabled() ) - bForceLastEntry = true; // use anti-aliasing canvas, if config flag set (or not existing) bool bUseAAEntry(true); @@ -379,10 +377,14 @@ Reference<XInterface> CanvasFactory::lookupAndUse( if (bForceLastEntry && pCurrImpl != pEndImpl) pCurrImpl = pEndImpl-1; - while( pCurrImpl != pEndImpl ) + for(; pCurrImpl != pEndImpl; ++pCurrImpl) { const OUString aCurrName(pCurrImpl->trim()); + // Skia works only with vclcanvas. + if( SkiaHelper::isVCLSkiaEnabled() && !aCurrName.endsWith(".VCL")) + continue; + // check whether given canvas service is listed in the // sequence of "accelerated canvas implementations" const bool bIsAcceleratedImpl( @@ -426,8 +428,6 @@ Reference<XInterface> CanvasFactory::lookupAndUse( return xCanvas; } } - - ++pCurrImpl; } return Reference<XInterface>(); |