diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-01 13:20:55 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-01 13:20:55 +0000 |
| commit | 069554851043b414d94e2b0aa692842a2d33587d (patch) | |
| tree | 0ac8ce7b939f5cfb29ea2f07e5304239b56c7351 /toolkit | |
| parent | a7571a96c307b85349eaadf0d5d9c777c7881137 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes56
2009-03-26 14:46:13 +0100 cmc r270080 : #i100517# merge changes of locales32 to match
2009-03-26 14:31:32 +0100 cmc r270079 : #i100517# add some brackets and remove stray ;
2009-03-25 13:30:36 +0100 cmc r270021 : #i100503# make tralay work again
2009-03-25 10:13:35 +0100 cmc r269999 : #i100536# remove last unused method
2009-03-24 15:13:50 +0100 cmc r269955 : #i100517# fix straight-forward warnings
2009-03-24 14:36:37 +0100 cmc r269947 : #i100469# keep ia64 and arm alignments after fork-exec to signal change, but hackaround for arm to keep userlevel qemu-arm working
2009-03-24 14:02:27 +0100 cmc r269943 : #i100223# make stl headers warning free for extra gcc 4.3 warnings
2009-03-24 13:58:15 +0100 cmc r269942 : #i100504# drawinglayer is warning free on ix86 linux
2009-03-24 13:56:15 +0100 cmc r269940 : #i100469# keep ia64 and arm alignments after fork-exec to signal change
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/workben/layout/editor.cxx | 1 | ||||
| -rw-r--r-- | toolkit/workben/layout/makefile.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/toolkit/workben/layout/editor.cxx b/toolkit/workben/layout/editor.cxx index c8e44a9c9180..0ef31560b69f 100644 --- a/toolkit/workben/layout/editor.cxx +++ b/toolkit/workben/layout/editor.cxx @@ -34,6 +34,7 @@ #undef NDEBUG #include <assert.h> #include <stdio.h> +#include <string.h> #include <vector> #include <list> diff --git a/toolkit/workben/layout/makefile.mk b/toolkit/workben/layout/makefile.mk index 8612992303d8..a7f1a8dfcb97 100644 --- a/toolkit/workben/layout/makefile.mk +++ b/toolkit/workben/layout/makefile.mk @@ -89,7 +89,7 @@ XML_FILES=\ wordcount.xml\ zoom.xml\ -TRALAY=tralay +TRALAY=$(AUGMENT_LIBRARY_PATH) tralay XML_LANGS=$(alllangiso) #ALL_XMLS=$(foreach,i,$(XML_LANGS) $(foreach,j,$(XML_FILES) $i/$j)) |