diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
commit | 83d7b776fba6a9b6be8e52f221b237b49ff7612d (patch) | |
tree | 204f94243b92698fa07d3859d7336a3730f626fd /svx/util | |
parent | e02ccd1ae444b8bd21e963adc9f368c462fc3609 (diff) | |
parent | da622616ce54d5c5b4e2e299fbf0a8ae527fd413 (diff) |
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'svx/util')
-rw-r--r-- | svx/util/gal.dxp | 1 | ||||
-rw-r--r-- | svx/util/hidother.src | 5 | ||||
-rw-r--r-- | svx/util/makefile.mk | 14 | ||||
-rw-r--r-- | svx/util/svx.component | 76 | ||||
-rw-r--r-- | svx/util/svx.dxp | 1 | ||||
-rw-r--r-- | svx/util/svxcore.component | 49 | ||||
-rw-r--r-- | svx/util/svxpch.cxx | 2 |
7 files changed, 140 insertions, 8 deletions
diff --git a/svx/util/gal.dxp b/svx/util/gal.dxp index 227006cc4e9f..e8f2e0a94819 100644 --- a/svx/util/gal.dxp +++ b/svx/util/gal.dxp @@ -17,5 +17,4 @@ Gallery_InsertSdrObj Gallery_GetThemeNameFromId Gallery_BeginLocking Gallery_EndLocking -component_writeInfo component_getFactory diff --git a/svx/util/hidother.src b/svx/util/hidother.src index dd566cf9abdc..e3c1f72cce4d 100644 --- a/svx/util/hidother.src +++ b/svx/util/hidother.src @@ -25,8 +25,6 @@ * ************************************************************************/ #include "../inc/helpid.hrc" // HID_XXX -#include "hidother.hrc" -#include <svx/svxids.hrc> #include "../inc/fmhelp.hrc" /* #define HID_AUTOCORR_HELP_CHGNONBRKSPACE HID_AUTOCORR_HELP_START+20 */ @@ -54,7 +52,6 @@ hidspecial HID_GRID_TRAVEL_LAST { HelpID = HID_GRID_TRAVEL_LAST ;}; hidspecial HID_GRID_TRAVEL_NEW { HelpID = HID_GRID_TRAVEL_NEW ;}; hidspecial HID_GRID_TRAVEL_NEXT { HelpID = HID_GRID_TRAVEL_NEXT ;}; hidspecial HID_GRID_TRAVEL_PREV { HelpID = HID_GRID_TRAVEL_PREV ;}; -hidspecial HID_INTERFACE_BASIDE_VIEWSH { HelpID = HID_INTERFACE_BASIDE_VIEWSH; }; hidspecial HID_POPUP_COLOR { HelpID = HID_POPUP_COLOR; }; hidspecial HID_POPUP_COLOR_CTRL { HelpID = HID_POPUP_COLOR_CTRL; }; hidspecial HID_POPUP_FRAME { HelpID = HID_POPUP_FRAME; }; @@ -74,6 +71,4 @@ hidspecial HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL { HelpId = HI hidspecial HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS { HelpId = HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS; }; hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED; }; hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL; }; -hidspecial SID_DSBROWSER_EXPLORER { HelpID = SID_DSBROWSER_EXPLORER ;}; -hidspecial SID_GALLERY_IMPORTTHEME { HelpID = SID_GALLERY_IMPORTTHEME; }; hidspecial UID_FORMPROPBROWSER_FRAME { HelpID = UID_FORMPROPBROWSER_FRAME ;}; diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk index b5359d74f538..277581a4a7a7 100644 --- a/svx/util/makefile.mk +++ b/svx/util/makefile.mk @@ -200,3 +200,17 @@ RESLIB1SRSFILES= $(SRSFILELIST) .INCLUDE : target.mk + +ALLTAR : $(MISC)/svx.component $(MISC)/svxcore.component + +$(MISC)/svx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + svx.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt svx.component + +$(MISC)/svxcore.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + svxcore.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt svxcore.component diff --git a/svx/util/svx.component b/svx/util/svx.component new file mode 100644 index 000000000000..5907d69fef50 --- /dev/null +++ b/svx/util/svx.component @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.Draw.GraphicExporter"> + <service name="com.sun.star.drawing.GraphicExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.Svx.GraphicExportHelper"> + <service name="com.sun.star.document.BinaryStreamResolver"/> + <service name="com.sun.star.document.GraphicObjectResolver"/> + </implementation> + <implementation name="com.sun.star.comp.Svx.GraphicImportHelper"> + <service name="com.sun.star.document.BinaryStreamResolver"/> + <service name="com.sun.star.document.GraphicObjectResolver"/> + </implementation> + <implementation name="com.sun.star.comp.gallery.GalleryThemeProvider"> + <service name="com.sun.star.gallery.GalleryThemeProvider"/> + </implementation> + <implementation name="com.sun.star.comp.graphic.PrimitiveFactory2D"> + <service name="com.sun.star.graphic.PrimitiveFactory2D"/> + </implementation> + <implementation name="com.sun.star.comp.svx.Impl.FindbarDispatcher"> + <service name="com.sun.star.comp.svx.FindbarDispatcher"/> + <service name="com.sun.star.frame.ProtocolHandler"/> + </implementation> + <implementation name="com.sun.star.comp.svx.RecoveryUI"> + <service name="com.sun.star.dialog.RecoveryUI"/> + </implementation> + <implementation name="com.sun.star.drawing.EnhancedCustomShapeEngine"> + <service name="com.sun.star.drawing.CustomShapeEngine"/> + </implementation> + <implementation name="com.sun.star.drawing.SvxShapeCollection"> + <service name="com.sun.star.drawing.ShapeCollection"/> + </implementation> + <implementation name="com.sun.star.drawing.SvxUnoColorTable"> + <service name="com.sun.star.drawing.ColorTable"/> + </implementation> + <implementation name="com.sun.star.svx.DownSearchToolboxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.svx.FindTextToolboxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.svx.FontHeightToolBoxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.svx.UpSearchToolboxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> +</component> diff --git a/svx/util/svx.dxp b/svx/util/svx.dxp index 9630d7e06768..f0e1c69934bc 100644 --- a/svx/util/svx.dxp +++ b/svx/util/svx.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component new file mode 100644 index 000000000000..2f829cb52a77 --- /dev/null +++ b/svx/util/svxcore.component @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.svx.ExtrusionDepthController"> + <service name="com.sun.star.frame.PopupMenuController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.ExtrusionDirectionController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.ExtrusionLightingController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.ExtrusionSurfaceController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.FontWorkAlignmentController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.FontWorkCharacterSpacingController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> +</component> diff --git a/svx/util/svxpch.cxx b/svx/util/svxpch.cxx index a59ef4b90a74..b8f6b92b38db 100644 --- a/svx/util/svxpch.cxx +++ b/svx/util/svxpch.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #include <thread.hxx> #include <sysdep.hxx> -#if defined(WNT) || defined (WIN) +#if defined(WNT) #include <svwin.h> #endif #include <tlintl.hxx> |