diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-02-28 09:40:38 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-02-28 09:40:38 +0000 |
| commit | 84e00b67d307e0a177ce2a1f3d5bc06e05fcb0f9 (patch) | |
| tree | e1dcc8165d75f3f0c2f91c67a0ba998a2985eff0 /canvas | |
| parent | aa31964754c34f18ccfead6247da9187bd42af63 (diff) | |
INTEGRATION: CWS cairocanvas (1.5.14); FILE MERGED
2005/11/04 14:26:03 thb 1.5.14.3: RESYNC: (1.5-1.7); FILE MERGED
2005/07/08 10:41:18 thb 1.5.14.2: #i51657# Reverted getenv() to osl function
2005/07/07 07:58:08 radekdoulik 1.5.14.1: Issue number: 51657
Submitted by: radekdoulik
Reviewed by: radekdoulik
initial import of cairo canvas code
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/factory/cf_service.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 0c25d3dc9e13..159ce12c5aca 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -4,9 +4,9 @@ * * $RCSfile: cf_service.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: kz $ $Date: 2005-11-02 12:46:34 $ + * last change: $Author: kz $ $Date: 2006-02-28 10:40:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,6 +33,7 @@ * ************************************************************************/ #include "osl/mutex.hxx" +#include "osl/process.h" #include "cppuhelper/implementationentry.hxx" #include "cppuhelper/factory.hxx" #include "cppuhelper/implbase3.hxx" @@ -172,13 +173,14 @@ CanvasFactory::CanvasFactory( // append the usual preferred ones: sal_Int32 pos = m_services.getLength(); #if defined WNT - m_services.realloc( pos + 4 ); + m_services.realloc( pos + 5 ); m_services[ pos++ ] = OUSTR("com.sun.star.rendering.DXCanvas"); m_services[ pos++ ] = OUSTR("com.sun.star.rendering.GLCanvas"); #else - m_services.realloc( pos + 3 ); + m_services.realloc( pos + 4 ); m_services[ pos++ ] = OUSTR("com.sun.star.rendering.GLCanvas"); #endif + m_services[ pos++ ] = OUSTR("com.sun.star.rendering.CairoCanvas"); m_services[ pos++ ] = OUSTR("com.sun.star.rendering.JavaCanvas"); m_services[ pos ] = OUSTR("com.sun.star.rendering.VCLCanvas"); } |