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/shells/drawsh.cxx | |
parent | 04d7fd9828cdb09ff190bc65975e0c51df778487 (diff) | |
parent | 7e12418df527339d4a78416596ea12ed3cd6133a (diff) |
chartshapes: merge with DEV300_m72
Diffstat (limited to 'sw/source/ui/shells/drawsh.cxx')
-rw-r--r-- | sw/source/ui/shells/drawsh.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx index 4da015e2d5861..eb571036e322c 100644 --- a/sw/source/ui/shells/drawsh.cxx +++ b/sw/source/ui/shells/drawsh.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: drawsh.cxx,v $ - * $Revision: 1.20.190.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -35,13 +32,13 @@ #include <tools/shl.hxx> #include <svx/svdview.hxx> #include <svx/svdotext.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/fontwork.hxx> #include <sfx2/request.hxx> #include <sfx2/bindings.hxx> #include <sfx2/objface.hxx> -#include <svtools/itemiter.hxx> -#include <svx/srchitem.hxx> +#include <svl/itemiter.hxx> +#include <svl/srchitem.hxx> #include <svx/xftsfit.hxx> #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> |