diff options
| author | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
| commit | 811d508a1790958d8b63015e7cd135c2d3168dfe (patch) | |
| tree | 1357a1db0c26a14720cb9f9687638f0aa075125f /sc/util | |
| parent | bef110689b8616e2e246c3ec02ab12d3a802cd46 (diff) | |
| parent | 22e99ad710239c0604f883f303d91b8c43a71f16 (diff) | |
sb118: merged in DEV300_m72
Diffstat (limited to 'sc/util')
| -rw-r--r-- | sc/util/createExtPackage.pl | 6 | ||||
| -rw-r--r-- | sc/util/hidother.src | 5 | ||||
| -rw-r--r-- | sc/util/makefile.mk | 11 | ||||
| -rw-r--r-- | sc/util/makefile.pmk | 6 |
4 files changed, 8 insertions, 20 deletions
diff --git a/sc/util/createExtPackage.pl b/sc/util/createExtPackage.pl index 967ef9e34d9d..06ac16673dec 100644 --- a/sc/util/createExtPackage.pl +++ b/sc/util/createExtPackage.pl @@ -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: createExtPackage.pl,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sc/util/hidother.src b/sc/util/hidother.src index 230bf06e1fbb..48dfebdf5c2c 100644 --- a/sc/util/hidother.src +++ b/sc/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.29 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 67191b94b3e8..0d10a33d0c71 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -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.mk,v $ -# -# $Revision: 1.49 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -81,8 +77,8 @@ SHL1STDLIBS= \ $(SVTOOLLIB) \ $(SVLLIB) \ $(SVXCORELIB) \ + $(EDITENGLIB) \ $(SVXLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(DRAWINGLAYERLIB) \ $(VCLLIB) \ @@ -187,6 +183,7 @@ SHL6STDLIBS= \ $(SVTOOLLIB) \ $(SVLLIB) \ $(SVXCORELIB) \ + $(EDITENGLIB) \ $(MSFILTERLIB) \ $(SVXLIB) \ $(BASEGFXLIB) \ @@ -215,6 +212,7 @@ DEF8NAME=$(SHL8TARGET) SHL8STDLIBS= \ $(ISCLIB) \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFX2LIB) \ @@ -309,6 +307,7 @@ SHL9STDLIBS= \ $(SALLIB)\ $(BASICLIB) \ $(SFXLIB) \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVTOOLLIB) \ $(SVLLIB) \ diff --git a/sc/util/makefile.pmk b/sc/util/makefile.pmk index 237d49cf8a7f..226a4dc9d811 100644 --- a/sc/util/makefile.pmk +++ b/sc/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 |