diff options
author | Christian Lippka <christian.lippka@sun.com> | 2010-03-09 16:44:38 +0100 |
---|---|---|
committer | Christian Lippka <christian.lippka@sun.com> | 2010-03-09 16:44:38 +0100 |
commit | f875e7d46088e85cf6eea0fb23c5884fc27ed7ad (patch) | |
tree | ea5940f810a0ebae0d88d61fd151753499adb096 /svx/source/svdraw/svdoattr.cxx | |
parent | 041cc4c8a5d07e0cca1468cc452a8bdda1a906a5 (diff) | |
parent | 3ccd714eed214d96e94e8147bd52673499cdd21d (diff) |
rebase to m73
Diffstat (limited to 'svx/source/svdraw/svdoattr.cxx')
-rw-r--r-- | svx/source/svdraw/svdoattr.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index a44d72c47123..81c1ca029ede 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.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: svdoattr.cxx,v $ - * $Revision: 1.53.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -60,11 +57,11 @@ #include <svx/xftshit.hxx> -#include <svx/colritem.hxx> -#include "fontitem.hxx" -#include <svx/fhgtitem.hxx> +#include <editeng/colritem.hxx> +#include "editeng/fontitem.hxx" +#include <editeng/fhgtitem.hxx> -//#include <svx/charscaleitem.hxx> +//#include <editeng/charscaleitem.hxx> #include <svx/xlnstcit.hxx> #include <svx/xlnwtit.hxx> #include <svl/style.hxx> @@ -75,7 +72,7 @@ #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> #include <svx/xlnedcit.hxx> -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/xflbckit.hxx> #include <svx/xtable.hxx> #include <svx/xbtmpit.hxx> |