diff options
author | Andre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM> | 2010-03-23 15:37:20 +0100 |
---|---|---|
committer | Andre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM> | 2010-03-23 15:37:20 +0100 |
commit | 9300afa21cbb4cd48c6cbd4fa92f206aa858329e (patch) | |
tree | c0a1e02a72a19340637f247e982b62343b4a7300 /sd/util | |
parent | renaissance1: #i107215# Fixed minor compilation problems. (diff) | |
parent | CWS-TOOLING: integrate CWS chartshapes (diff) | |
download | core-9300afa21cbb4cd48c6cbd4fa92f206aa858329e.tar.gz core-9300afa21cbb4cd48c6cbd4fa92f206aa858329e.zip |
renaissance1: merge with DEV300_m75
Diffstat (limited to 'sd/util')
-rw-r--r-- | sd/util/hidother.hrc | 5 | ||||
-rw-r--r-- | sd/util/hidother.src | 5 | ||||
-rw-r--r-- | sd/util/makefile.mk | 13 | ||||
-rw-r--r-- | sd/util/makefile.pmk | 6 |
4 files changed, 8 insertions, 21 deletions
diff --git a/sd/util/hidother.hrc b/sd/util/hidother.hrc index df1258d3fa92..5169a3c2ed07 100644 --- a/sd/util/hidother.hrc +++ b/sd/util/hidother.hrc @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hidother.hrc,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/util/hidother.src b/sd/util/hidother.src index 898079e5c762..1a15c421b419 100644 --- a/sd/util/hidother.src +++ b/sd/util/hidother.src @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hidother.src,v $ - * $Revision: 1.19 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index 9897a8d13045..715e40e252af 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.58 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -68,6 +64,7 @@ SHL1IMPLIB= sdi # dynamic libraries SHL1STDLIBS+= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFXLIB) \ @@ -75,7 +72,6 @@ SHL1STDLIBS+= \ $(CPPCANVASLIB) \ $(BASEGFXLIB) \ $(DRAWINGLAYERLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(SVTOOLLIB) \ $(TKLIB) \ @@ -200,6 +196,7 @@ LIB4FILES= \ SHL4STDLIBS= \ $(ISDLIB) \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFXLIB) \ @@ -251,12 +248,12 @@ SHL5LIBS = $(SLB)$/ppt.lib $(SLB)$/eppt.lib DEF5NAME=$(SHL5TARGET) SHL5STDLIBS = $(ISDLIB) \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(MSFILTERLIB) \ $(SFX2LIB) \ $(SVTOOLLIB) \ $(SOTLIB) \ - $(GOODIESLIB) \ $(VCLLIB) \ $(SVLLIB) \ $(SOTLIB) \ diff --git a/sd/util/makefile.pmk b/sd/util/makefile.pmk index 3300f05484aa..0ae6fe664de7 100644 --- a/sd/util/makefile.pmk +++ b/sd/util/makefile.pmk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.pmk,v $ -# -# $Revision: 1.6 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |