diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-04-17 20:34:49 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-04-17 20:34:49 +0200 |
| commit | 7fede8929ac21327faaf6ff874ba9d151e9c9941 (patch) | |
| tree | 86835e460bc225c527da931a820d281deee55ad2 /sw/source/ui/ribbar/concustomshape.cxx | |
| parent | 257f1ae021145a109f184cd15105e08362abf99b (diff) | |
| parent | c84af0cedc1c407d5e1a92fe172e134c08b130f6 (diff) | |
CWS gnumake2: rebase to DEV300_m76; fix build problems
Diffstat (limited to 'sw/source/ui/ribbar/concustomshape.cxx')
| -rw-r--r-- | sw/source/ui/ribbar/concustomshape.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/ui/ribbar/concustomshape.cxx index 3fc2ff816dfe..66ba929fae47 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 @@ -64,7 +61,7 @@ #include <svl/itempool.hxx> #include <svx/svdpage.hxx> #include <svx/svdoashp.hxx> -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <math.h> |