diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
| commit | c73b3e8ea9e6c394d9c5c0f5cd38d010e6f6e631 (patch) | |
| tree | 96c1dc8127a79fbcd20eed2ce6dbebfead138f0f /dbaccess/util | |
| parent | 8dd0c9c3f9bc8e4d0152edfb00294c4227db4555 (diff) | |
| parent | f512282ff2fd3e55cb88dc5c94d2db91d91bd3f5 (diff) | |
autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore.
Diffstat (limited to 'dbaccess/util')
| -rw-r--r-- | dbaccess/util/dba.pmk | 8 | ||||
| -rw-r--r-- | dbaccess/util/hidother.src | 5 | ||||
| -rw-r--r-- | dbaccess/util/makefile.mk | 7 | ||||
| -rw-r--r-- | dbaccess/util/makefile.pmk | 6 |
4 files changed, 5 insertions, 21 deletions
diff --git a/dbaccess/util/dba.pmk b/dbaccess/util/dba.pmk index 75b986ccd272..91e4af5a1fa0 100644 --- a/dbaccess/util/dba.pmk +++ b/dbaccess/util/dba.pmk @@ -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: $ -# -# $Revision: $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/dbaccess/util/hidother.src b/dbaccess/util/hidother.src index 2f97d1918fd3..fd680bf6528c 100644 --- a/dbaccess/util/hidother.src +++ b/dbaccess/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.69 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk index 1426a0178f60..94152b941476 100644 --- a/dbaccess/util/makefile.mk +++ b/dbaccess/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.38.68.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -122,7 +118,6 @@ SHL2STDLIBS= \ $(FWELIB) \ $(TKLIB) \ $(VCLLIB) \ - $(GOODIESLIB) \ $(SVLLIB) \ $(SOTLIB) \ $(UNOTOOLSLIB) \ diff --git a/dbaccess/util/makefile.pmk b/dbaccess/util/makefile.pmk index bc196833c408..1860083dbbba 100644 --- a/dbaccess/util/makefile.pmk +++ b/dbaccess/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.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |