diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-03-12 20:13:16 +0100 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-03-12 20:13:16 +0100 |
| commit | 1c858f73a9994340b8735fdcd5cfd018115e01cd (patch) | |
| tree | 6435d9ff657e86301c9ba47ff90795950b8a6595 /sd/util | |
| parent | 9b03159e7030963753dcc7ff82f0b49207bd42b4 (diff) | |
| parent | 2b800723513199616bb04c6bb377b685c4bde218 (diff) | |
renaissance2: merge to m73
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 cccaf572fa95..b0d0b133ab4c 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 @@ -67,6 +63,7 @@ SHL1IMPLIB= sdi # dynamic libraries SHL1STDLIBS+= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFXLIB) \ @@ -74,7 +71,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 |