diff options
Diffstat (limited to 'canvas/source/factory/cf_service.cxx')
| -rw-r--r-- | canvas/source/factory/cf_service.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index d7e612cb6ca9..94f7069e267a 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -36,9 +36,9 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <o3tl/functional.hxx> -#include <config_features.h> +#include <o3tl/string_view.hxx> #include <vcl/skia/SkiaHelper.hxx> -#include <unotools/configmgr.hxx> +#include <comphelper/configuration.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -113,7 +113,7 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) : m_bCacheHasUseAcceleratedEntry(), m_bCacheHasUseAAEntry() { - if (!utl::ConfigManager::IsFuzzing()) + if (!comphelper::IsFuzzing()) { try { @@ -185,13 +185,11 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) : { // Ugh. Looks like configuration is borked. Fake minimal // setup. - Sequence<OUString> aServices { "com.sun.star.comp.rendering.Canvas.VCL" }; m_aAvailableImplementations.emplace_back(OUString("com.sun.star.rendering.Canvas"), - aServices ); + Sequence<OUString>{ "com.sun.star.comp.rendering.Canvas.VCL" } ); - aServices[0] = "com.sun.star.comp.rendering.SpriteCanvas.VCL"; m_aAvailableImplementations.emplace_back(OUString("com.sun.star.rendering.SpriteCanvas"), - aServices ); + Sequence<OUString>{ "com.sun.star.comp.rendering.SpriteCanvas.VCL" } ); } } @@ -375,7 +373,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse( const bool bIsAcceleratedImpl( std::any_of(aAccelImpls.begin(), aAccelImpls.end(), [&aCurrName](OUString const& src) - { return aCurrName == src.trim(); } + { return aCurrName == o3tl::trim(src); } )); // check whether given canvas service is listed in the @@ -383,7 +381,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse( const bool bIsAAImpl( std::any_of(aAAImpls.begin(), aAAImpls.end(), [&aCurrName](OUString const& src) - { return aCurrName == src.trim(); } + { return aCurrName == o3tl::trim(src); } )); // try to instantiate canvas *only* if either accel and AA |