diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-05-19 12:45:03 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-05-19 12:45:03 +0000 |
| commit | 34502cafedebed07b7ceb0406bea5cd8fc8797e1 (patch) | |
| tree | 1a220bd4827df840203805f16aa485f1b05e73e5 /toolkit/source/helper/registerservices.cxx | |
| parent | 9b609913c1d3b437bf1bc98b7e9e1cc70f229c9b (diff) | |
INTEGRATION: CWS qwizards1 (1.8.92); FILE MERGED
2004/01/06 16:12:56 tv 1.8.92.4: fixed another merge conflict problem
2004/01/06 16:01:38 tv 1.8.92.3: fixed conflict solving error
2004/01/05 12:52:08 tv 1.8.92.2: RESYNC: (1.8-1.9); FILE MERGED
2003/11/07 15:27:14 bc 1.8.92.1: #111603# roadmapcontrol added
Diffstat (limited to 'toolkit/source/helper/registerservices.cxx')
| -rw-r--r-- | toolkit/source/helper/registerservices.cxx | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx index 914a8a5038e5..97c448c945e4 100644 --- a/toolkit/source/helper/registerservices.cxx +++ b/toolkit/source/helper/registerservices.cxx @@ -2,9 +2,9 @@ * * $RCSfile: registerservices.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: kz $ $Date: 2003-12-11 12:00:10 $ + * last change: $Author: kz $ $Date: 2004-05-19 13:45:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -122,6 +122,9 @@ #ifndef TOOLKIT_FORMATTED_CONTROL_HXX #include <toolkit/controls/formattedcontrol.hxx> #endif +#ifndef TOOLKIT_ROADMAP_CONTROL_HXX +#include <toolkit/controls/roadmapcontrol.hxx> +#endif #ifndef TOOLKIT_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX #include <toolkit/controls/tkscrollbar.hxx> #endif @@ -265,6 +268,8 @@ IMPL_CREATEINSTANCE( VCLXMenuBar ) IMPL_CREATEINSTANCE( VCLXPointer ) IMPL_CREATEINSTANCE( VCLXPopupMenu ) IMPL_CREATEINSTANCE( VCLXPrinterServer ) +IMPL_CREATEINSTANCE( UnoRoadmapControl ) +IMPL_CREATEINSTANCE( UnoControlRoadmapModel ) extern "C" @@ -330,11 +335,14 @@ sal_Bool SAL_CALL component_writeInfo( void* _pServiceManager, void* _pRegistryK registerServices( xRegistryKey, "UnoControlProgressBarModel", szServiceName_UnoControlProgressBarModel, szServiceName2_UnoControlProgressBarModel ); registerServices( xRegistryKey, "UnoScrollBarControl", szServiceName_UnoControlScrollBar, szServiceName2_UnoControlScrollBar ); registerServices( xRegistryKey, "UnoControlScrollBarModel", szServiceName_UnoControlScrollBarModel, szServiceName2_UnoControlScrollBarModel ); - registerServices( xRegistryKey, "UnoSpinButtonModel", szServiceName_UnoSpinButtonModel ); + registerServices( xRegistryKey, "UnoSpinButtonModel", szServiceName_UnoSpinButtonModel ); registerServices( xRegistryKey, "UnoSpinButtonControl", szServiceName_UnoSpinButtonControl ); - registerServices( xRegistryKey, "UnoFixedLineControl", szServiceName_UnoControlFixedLine, szServiceName2_UnoControlFixedLine ); + registerServices( xRegistryKey, "UnoFixedLineControl", szServiceName_UnoControlFixedLine, szServiceName2_UnoControlFixedLine ); registerServices( xRegistryKey, "UnoControlFixedLineModel", szServiceName_UnoControlFixedLineModel, szServiceName2_UnoControlFixedLineModel ); registerServices( xRegistryKey, "VCLXPrinterServer", szServiceName_PrinterServer, szServiceName2_PrinterServer ); + registerServices( xRegistryKey, "UnoRoadmapControl", szServiceName_UnoControlRoadmap, szServiceName2_UnoControlRoadmap ); + registerServices( xRegistryKey, "UnoControlRoadmapModel", szServiceName_UnoControlRoadmapModel, szServiceName2_UnoControlRoadmapModel ); + return sal_True; } return sal_False; @@ -400,6 +408,8 @@ void* SAL_CALL component_getFactory( const sal_Char* sImplementationName, void* CHECKANDCREATEFACTORY( UnoFixedLineControl, szServiceName_UnoControlFixedLine, szServiceName2_UnoControlFixedLine ) CHECKANDCREATEFACTORY( UnoControlFixedLineModel, szServiceName_UnoControlFixedLineModel, szServiceName2_UnoControlFixedLineModel ) CHECKANDCREATEFACTORY( VCLXPrinterServer, szServiceName_PrinterServer, szServiceName2_PrinterServer ) + CHECKANDCREATEFACTORY( UnoRoadmapControl, szServiceName_UnoControlRoadmap, szServiceName2_UnoControlRoadmap ) + CHECKANDCREATEFACTORY( UnoControlRoadmapModel, szServiceName_UnoControlRoadmapModel, szServiceName2_UnoControlRoadmapModel ) CHECKANDCREATEFACTORY( UnoSpinButtonModel, szServiceName_UnoSpinButtonModel, NULL ) CHECKANDCREATEFACTORY( UnoSpinButtonControl, szServiceName_UnoSpinButtonControl, NULL ) } |