diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 22:30:17 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 22:30:17 +0000 |
| commit | a65e3b6718423ac4f2fd241173702d8095a9afac (patch) | |
| tree | 3809d0c2ebf51f9e2e20dcbc7002002a05187609 /svx/source/unodraw | |
| parent | 8f829ba1d9cc91ea219a0a6a83b363d4ec748342 (diff) | |
INTEGRATION: CWS aw033 (1.15.14); FILE MERGED
2008/05/27 14:50:05 aw 1.15.14.8: #i39532# changes DEV300 m12 resync corrections
2008/05/14 14:07:14 aw 1.15.14.7: RESYNC: (1.19-1.20); FILE MERGED
2007/12/03 16:41:05 aw 1.15.14.6: RESYNC: (1.18-1.19); FILE MERGED
2007/08/09 19:14:17 aw 1.15.14.5: RESYNC: (1.17-1.18); FILE MERGED
2007/06/27 18:38:15 aw 1.15.14.4: RESYNC: (1.16-1.17); FILE MERGED
2006/12/12 10:14:28 aw 1.15.14.3: #i39532# changes after resync
2006/11/28 19:50:39 aw 1.15.14.2: RESYNC: (1.15-1.16); FILE MERGED
2006/11/07 15:52:22 aw 1.15.14.1: #i39532# changed various aspevcts of XPrimitive2D implementations
Diffstat (limited to 'svx/source/unodraw')
| -rw-r--r-- | svx/source/unodraw/unoctabl.cxx | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 801e7a843d..1365babd2f 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unoctabl.cxx,v $ - * $Revision: 1.20 $ + * $Revision: 1.21 $ * * This file is part of OpenOffice.org. * @@ -245,6 +245,7 @@ uno::Reference< uno::XInterface > SAL_CALL create_EnhancedCustomShapeEngine( con #include "osl/diagnose.h" #include "cppuhelper/factory.hxx" #include "uno/lbnames.h" +#include <svx/sdr/primitive2d/primitiveFactory2d.hxx> extern "C" { @@ -285,7 +286,13 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( writeInfo( pKey, svx::GraphicExporter_getImplementationName(), svx::GraphicExporter_getSupportedServiceNames() ); #endif writeInfo( pKey, svx::FontHeightToolBoxControl::getImplementationName_Static(), svx::FontHeightToolBoxControl::getSupportedServiceNames_Static() ); - writeInfo( pKey, ::unogallery::GalleryThemeProvider_getImplementationName(),::unogallery::GalleryThemeProvider_getSupportedServiceNames() ); + writeInfo( pKey, ::unogallery::GalleryThemeProvider_getImplementationName(),::unogallery::GalleryThemeProvider_getSupportedServiceNames() ); + + // XPrimitiveFactory2D + writeInfo( pKey, + drawinglayer::primitive2d::PrimitiveFactory2D::getImplementationName_Static(), + drawinglayer::primitive2d::PrimitiveFactory2D::getSupportedServiceNames_Static() ); + writeInfo( pKey, ::svx::SvXMLGraphicImportHelper_getImplementationName(),::svx::SvXMLGraphicImportHelper_getSupportedServiceNames() ); writeInfo( pKey, ::svx::SvXMLGraphicExportHelper_getImplementationName(),::svx::SvXMLGraphicExportHelper_getSupportedServiceNames() ); } @@ -357,6 +364,14 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( ::unogallery::GalleryThemeProvider_createInstance, ::unogallery::GalleryThemeProvider_getSupportedServiceNames() ); } + else if( drawinglayer::primitive2d::PrimitiveFactory2D::getImplementationName_Static().equalsAscii( pImplName ) ) + { + // XPrimitiveFactory2D + xFactory = ::cppu::createSingleFactory( reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ), + drawinglayer::primitive2d::PrimitiveFactory2D::getImplementationName_Static(), + drawinglayer::primitive2d::XPrimitiveFactory2DProvider_createInstance, + drawinglayer::primitive2d::PrimitiveFactory2D::getSupportedServiceNames_Static() ); + } else if( ::svx::SvXMLGraphicImportHelper_getImplementationName().equalsAscii( pImplName ) ) { xFactory = ::cppu::createSingleFactory( |