diff options
| author | Thomas Benisch <tbe@openoffice.org> | 2010-03-01 12:22:02 +0100 |
|---|---|---|
| committer | Thomas Benisch <tbe@openoffice.org> | 2010-03-01 12:22:02 +0100 |
| commit | 9894a711a7550c717381e80c38c981e6b502beb7 (patch) | |
| tree | 781477b79027c5c1101d211c79603c366a002aeb /sw/source/ui/ribbar/concustomshape.cxx | |
| parent | 04d7fd9828cdb09ff190bc65975e0c51df778487 (diff) | |
| parent | 7e12418df527339d4a78416596ea12ed3cd6133a (diff) | |
chartshapes: merge with DEV300_m72
Diffstat (limited to 'sw/source/ui/ribbar/concustomshape.cxx')
| -rw-r--r-- | sw/source/ui/ribbar/concustomshape.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/ui/ribbar/concustomshape.cxx index 809b593dec0c0..66ba929fae470 100644 --- a/sw/source/ui/ribbar/concustomshape.cxx +++ b/sw/source/ui/ribbar/concustomshape.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: concustomshape.cxx,v $ - * $Revision: 1.16 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -42,7 +39,7 @@ #include <svx/sdtaaitm.hxx> #include <svx/svdview.hxx> #include <svx/svdocapt.hxx> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #ifndef _CMDID_H #include <cmdid.h> #endif @@ -61,10 +58,10 @@ #ifndef _FM_FMMODEL_HXX #include <svx/fmmodel.hxx> #endif -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/svdpage.hxx> #include <svx/svdoashp.hxx> -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <math.h> |