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 | b2efce8cfc2126f9fa43cfe807de3b3fc748fef5 (patch) | |
| tree | e4963170e5490d1a99dd8abc0fd55e129c25ca7d /reportdesign/util | |
| parent | 7985a63fa7c807a5b54c4a1b34da10730ca788a8 (diff) | |
| parent | f512282ff2fd3e55cb88dc5c94d2db91d91bd3f5 (diff) | |
sb118: merged in DEV300_m72
Diffstat (limited to 'reportdesign/util')
| -rw-r--r-- | reportdesign/util/dll.pmk | 6 | ||||
| -rw-r--r-- | reportdesign/util/hidother.src | 5 | ||||
| -rw-r--r-- | reportdesign/util/makefile.mk | 9 |
3 files changed, 6 insertions, 14 deletions
diff --git a/reportdesign/util/dll.pmk b/reportdesign/util/dll.pmk index 583b009b6d74..c2ce7d89d88f 100644 --- a/reportdesign/util/dll.pmk +++ b/reportdesign/util/dll.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: dll.pmk,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/reportdesign/util/hidother.src b/reportdesign/util/hidother.src index 15cc051a5193..f7e08f34442e 100644 --- a/reportdesign/util/hidother.src +++ b/reportdesign/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.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk index 505f0940a816..32fe4eb2a5d6 100644 --- a/reportdesign/util/makefile.mk +++ b/reportdesign/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.21.2.2 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -56,6 +52,7 @@ LIB1FILES=\ SHL1TARGET=$(TARGET)$(DLLPOSTFIX) SHL1STDLIBS= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(FWELIB) \ @@ -115,6 +112,7 @@ LIB2FILES=\ SHL2TARGET=$(TARGET2)$(DLLPOSTFIX) SHL2STDLIBS= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFXLIB) \ @@ -190,6 +188,7 @@ LIB3FILES=\ SHL3TARGET=$(TARGET3)$(DLLPOSTFIX) SHL3STDLIBS=\ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(XMLOFFLIB) \ $(VCLLIB) \ |