diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-16 11:45:54 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-16 11:45:54 +0000 |
| commit | da3ef3a27296d643bd489592fa09f54b1802f902 (patch) | |
| tree | 1984573fc90a55b23184c37e2151086628b468ff | |
| parent | 67769eca16d81cd52ec3288e5f36e8117bd38a45 (diff) | |
CWS-TOOLING: integrate CWS l10nframework01
| -rw-r--r-- | animations/source/animcore/makefile.mk | 2 | ||||
| -rw-r--r-- | sd/sdi/makefile.mk | 3 | ||||
| -rw-r--r-- | sd/source/ui/app/app.src | 8 | ||||
| -rw-r--r-- | sd/source/ui/app/makefile.mk | 2 |
4 files changed, 5 insertions, 10 deletions
diff --git a/animations/source/animcore/makefile.mk b/animations/source/animcore/makefile.mk index 2a4cb1702301..b68f0299a53c 100644 --- a/animations/source/animcore/makefile.mk +++ b/animations/source/animcore/makefile.mk @@ -39,6 +39,7 @@ NO_BSYMBOLIC=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.IF "$(L10N_framework)"=="" # --- Files -------------------------------------------------------- #UNOUCRDEP=$(SOLARBINDIR)$/offapi.rdb #UNOUCRRDB=$(SOLARBINDIR)$/offapi.rdb @@ -66,6 +67,7 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) +.ENDIF # L10N_framework # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk index a442c65e8d64..f49d5103e2f5 100644 --- a/sd/sdi/makefile.mk +++ b/sd/sdi/makefile.mk @@ -41,6 +41,7 @@ SVSDIINC=$(PRJ)$/source$/ui$/inc # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.IF "$(L10N_framework)"=="" # --- Files -------------------------------------------------------- @@ -86,5 +87,5 @@ SVSDI2DEPEND= \ $(PRJ)$/inc$/app.hrc # --- Targets ------------------------------------------------------- - +.ENDIF .INCLUDE : target.mk diff --git a/sd/source/ui/app/app.src b/sd/source/ui/app/app.src index 02ae0e937828..c8991caffd51 100644 --- a/sd/source/ui/app/app.src +++ b/sd/source/ui/app/app.src @@ -40,14 +40,6 @@ // Acceleratorn // -// Impress -#include "accel.src" - -// Draw (Graphic) -#undef SD_ACCELERATOR -#define SD_ACCELERATOR RID_GRAPHIC_DEFAULTACCEL -#include "accel.src" - // // Menu // diff --git a/sd/source/ui/app/makefile.mk b/sd/source/ui/app/makefile.mk index f9db62ee70df..af9e230704cb 100644 --- a/sd/source/ui/app/makefile.mk +++ b/sd/source/ui/app/makefile.mk @@ -106,7 +106,7 @@ $(INCCOM)$/sddll0.hxx: makefile.mk .ENDIF # "$(USE_SHELL)"!="4nt" .ENDIF # "$(GUI)"=="UNX" -LOCALIZE_ME = tbxids_tmpl.src menuids2_tmpl.src accel_tmpl.src menu_tmpl.src menuids_tmpl.src menuids4_tmpl.src popup2_tmpl.src toolbox2_tmpl.src accelids_tmpl.src menuportal_tmpl.src menuids3_tmpl.src +LOCALIZE_ME = tbxids_tmpl.src menuids2_tmpl.src menu_tmpl.src menuids_tmpl.src menuids4_tmpl.src popup2_tmpl.src toolbox2_tmpl.src menuportal_tmpl.src menuids3_tmpl.src .INCLUDE : target.mk |