summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-09-16 11:45:54 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-09-16 11:45:54 +0000
commitac50212447a13d13e3fa0520792bb48ba0223837 (patch)
treeb304260873912f1f0a7e6affc3aca569b8f60e0a /sd
parent941085c6b2752b6a10d50caf67221ef736d9d175 (diff)
CWS-TOOLING: integrate CWS l10nframework01
Diffstat (limited to 'sd')
-rw-r--r--sd/sdi/makefile.mk3
-rw-r--r--sd/source/ui/app/app.src8
-rw-r--r--sd/source/ui/app/makefile.mk2
3 files changed, 3 insertions, 10 deletions
diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk
index a442c65e8..f49d5103e 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 d787e526c..320f4a8c3 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 f9db62ee7..af9e23070 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