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/misc/pgfnote.cxx | |
| parent | 04d7fd9828cdb09ff190bc65975e0c51df778487 (diff) | |
| parent | 7e12418df527339d4a78416596ea12ed3cd6133a (diff) | |
chartshapes: merge with DEV300_m72
Diffstat (limited to 'sw/source/ui/misc/pgfnote.cxx')
| -rw-r--r-- | sw/source/ui/misc/pgfnote.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 3f0c634f2b248..9d940b33d3327 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.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: pgfnote.cxx,v $ - * $Revision: 1.12 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -48,11 +45,11 @@ #include <vcl/field.hxx> #include <vcl/svapp.hxx> #include <unotools/localedatawrapper.hxx> -#include <svtools/syslocale.hxx> -#include <svx/sizeitem.hxx> +#include <unotools/syslocale.hxx> +#include <editeng/sizeitem.hxx> #include <svx/pageitem.hxx> -#include <svtools/eitem.hxx> -#include <svx/ulspitem.hxx> +#include <svl/eitem.hxx> +#include <editeng/ulspitem.hxx> #include <uitool.hxx> #include <pagedesc.hxx> #include <pgfnote.hxx> |