diff options
| author | Ingrid Halama <iha@openoffice.org> | 2010-03-17 18:25:05 +0100 |
|---|---|---|
| committer | Ingrid Halama <iha@openoffice.org> | 2010-03-17 18:25:05 +0100 |
| commit | db73d5d67968a583afe248ee495336129a4e010a (patch) | |
| tree | f25b972ff3502fa0c199f7cab3b0ddab05627356 /chart2/source/view/diagram | |
| parent | ee881a1df6f332ba60fac4f9f50073a17951c12f (diff) | |
| parent | f2cf0b3fde3d8577260c8b12e380d23a27dbae17 (diff) | |
chartpositioning: merge with DEV300_m75
Diffstat (limited to 'chart2/source/view/diagram')
| -rw-r--r-- | chart2/source/view/diagram/VDiagram.cxx | 7 | ||||
| -rw-r--r-- | chart2/source/view/diagram/makefile.mk | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index 65d603aaf05f..27946ce7dcdd 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.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: VDiagram.cxx,v $ - * $Revision: 1.18.60.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -41,7 +38,7 @@ #include "CommonConverters.hxx" #include "ChartTypeHelper.hxx" #include "ThreeDHelper.hxx" -#include <svx/unoprnms.hxx> +#include <editeng/unoprnms.hxx> #include <tools/color.hxx> #include <tools/debug.hxx> #include <com/sun/star/drawing/FillStyle.hpp> diff --git a/chart2/source/view/diagram/makefile.mk b/chart2/source/view/diagram/makefile.mk index 0be65486a0c5..652f203b2267 100644 --- a/chart2/source/view/diagram/makefile.mk +++ b/chart2/source/view/diagram/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.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |