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 | ce405811c11d1e7a1b0d79a74d4d003bbb8f8e09 (patch) | |
| tree | e4f8a58b2d717669a27d353d4fc842dca44cbce4 /sw/util | |
| parent | 68a9b9a3339628f2a8db8e0b430e87b88a9a1afc (diff) | |
| parent | 7e12418df527339d4a78416596ea12ed3cd6133a (diff) | |
sb118: merged in DEV300_m72
Diffstat (limited to 'sw/util')
| -rw-r--r-- | sw/util/hidother.hrc | 5 | ||||
| -rw-r--r-- | sw/util/hidother.src | 5 | ||||
| -rw-r--r-- | sw/util/makefile.mk | 16 |
3 files changed, 9 insertions, 17 deletions
diff --git a/sw/util/hidother.hrc b/sw/util/hidother.hrc index 5b7296affae0..7b3a04e0de4f 100644 --- a/sw/util/hidother.hrc +++ b/sw/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.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sw/util/hidother.src b/sw/util/hidother.src index 6c1ccae91f9a..b07855af625f 100644 --- a/sw/util/hidother.src +++ b/sw/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.18 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index c2ab9f87018b..557e871a74e7 100644 --- a/sw/util/makefile.mk +++ b/sw/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.74 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -99,11 +95,11 @@ LIB1OBJFILES= $(OUT)$/slo$/swmodule.obj \ SHL1STDLIBS+= \ $(LNGLIB) \ $(SVXCORELIB) \ + $(EDITENGLIB) \ $(SVXLIB) \ $(SFXLIB) \ $(XMLOFFLIB) \ $(BASICLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(DRAWINGLAYERLIB) \ $(SVTOOLLIB) \ @@ -179,6 +175,7 @@ DEF3NAME= $(SHL3TARGET) SHL3STDLIBS= \ $(ISWLIB) \ $(SVXCORELIB) \ + $(EDITENGLIB) \ $(SVXLIB) \ $(SFX2LIB) \ $(SVTOOLLIB) \ @@ -319,9 +316,9 @@ DEF4NAME=$(SHL4TARGET) SHL4STDLIBS= \ $(ISWLIB) \ $(SVXCORELIB) \ + $(EDITENGLIB) \ $(MSFILTERLIB) \ $(SFXLIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(SVTOOLLIB) \ $(TKLIB) \ @@ -367,8 +364,9 @@ SHL5STDLIBS= \ $(VCLLIB) \ $(TKLIB) \ $(I18NISOLANGLIB) \ + $(EDITENGLIB) \ $(SVXCORELIB) \ - $(SVXMSFILTERLIB) \ + $(SVXMSFILTERLIB) SHL5DEPN=$(SHL1TARGETN) SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib |