diff options
| author | sb <sb@openoffice.org> | 2010-09-10 13:10:07 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-09-10 13:10:07 +0200 |
| commit | c096e86385f35a6d8485325ad0c3ae52f70cacef (patch) | |
| tree | b722e568c4aa0b42bd429adbf0dd420f4dd6fb58 /scp2/source/canvas | |
| parent | cc1e8cca21d9dea91a0eabbaffe38d8f98173dad (diff) | |
sb129: #i113189# change UNO components to use passive registration
Diffstat (limited to 'scp2/source/canvas')
| -rw-r--r-- | scp2/source/canvas/cairocanvas.scp | 3 | ||||
| -rw-r--r-- | scp2/source/canvas/canvascommons.scp | 4 | ||||
| -rw-r--r-- | scp2/source/canvas/directxcanvas.scp | 6 | ||||
| -rw-r--r-- | scp2/source/canvas/vclcanvas.scp | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp index 435cef4304f8..2d7af5321f35 100644 --- a/scp2/source/canvas/cairocanvas.scp +++ b/scp2/source/canvas/cairocanvas.scp @@ -29,8 +29,7 @@ File gid_File_Lib_CairoCanvas TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(cairocanvas.uno,UNXSUFFIX)); diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp index f095eff9f23e..9788a90c7f3a 100644 --- a/scp2/source/canvas/canvascommons.scp +++ b/scp2/source/canvas/canvascommons.scp @@ -36,5 +36,5 @@ STD_LIB_FILE(gid_File_Lib_Agg, agg) #endif #endif -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno) -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno) diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp index febdb8428c8b..e79f711aaacd 100644 --- a/scp2/source/canvas/directxcanvas.scp +++ b/scp2/source/canvas/directxcanvas.scp @@ -29,8 +29,8 @@ #ifdef WNT # ifdef USE_DIRECTX5 -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_DirectX5Canvas,directx5canvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX5Canvas,directx5canvas.uno) # endif -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno) -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas.uno) #endif diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp index 5f69de34fee9..c17301f56d76 100644 --- a/scp2/source/canvas/vclcanvas.scp +++ b/scp2/source/canvas/vclcanvas.scp @@ -27,4 +27,4 @@ #include "macros.inc" -SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno) |