diff options
| author | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-03-10 18:46:05 +0100 |
|---|---|---|
| committer | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-03-10 18:46:05 +0100 |
| commit | 54d4353dd1981f03050886d013cbc61a1a5bbaac (patch) | |
| tree | fa4ba629cbdd3c9ffd263e557dfac17dadc55566 /sw/source/core/SwNumberTree | |
| parent | 9bba964993fe859b40a5c125406653ee3ade122e (diff) | |
| parent | 7fa96e56c6fe20ea496be40338124ba35aae9d84 (diff) | |
sw33bf02: merge with DEV300_m74
Diffstat (limited to 'sw/source/core/SwNumberTree')
| -rw-r--r-- | sw/source/core/SwNumberTree/SwNodeNum.cxx | 7 | ||||
| -rw-r--r-- | sw/source/core/SwNumberTree/SwNumberTree.cxx | 5 | ||||
| -rw-r--r-- | sw/source/core/SwNumberTree/makefile.mk | 6 |
3 files changed, 4 insertions, 14 deletions
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx index c13b396e76f4..d1113f4fb484 100644 --- a/sw/source/core/SwNumberTree/SwNodeNum.cxx +++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx @@ -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: SwNodeNum.cxx,v $ - * $Revision: 1.16 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -31,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include <numrule.hxx> #include <SwNodeNum.hxx> #include <ndtxt.hxx> diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx index 8f9caf5f022b..4d5f06ff0b8f 100644 --- a/sw/source/core/SwNumberTree/SwNumberTree.cxx +++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx @@ -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: SwNumberTree.cxx,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/sw/source/core/SwNumberTree/makefile.mk b/sw/source/core/SwNumberTree/makefile.mk index e929578e24b8..d67a3f321a01 100644 --- a/sw/source/core/SwNumberTree/makefile.mk +++ b/sw/source/core/SwNumberTree/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.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |