diff options
author | Thomas Lange [tl] <tl@openoffice.org> | 2010-03-24 14:27:53 +0100 |
---|---|---|
committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-03-24 14:27:53 +0100 |
commit | 22b738c0da87e3976b2f6744028d476a6e44ee30 (patch) | |
tree | 1b834aec432ff08d1c11b825c1083b59d1167099 /forms/source/richtext/richtextengine.cxx | |
parent | 47d0dedc68ae532bf2e2797d16b84a9c68637ffb (diff) | |
parent | 94bf193db97db0d4ccf6491f8886fdca44e4b252 (diff) |
cws tl78: merge with DEV300_m75
Diffstat (limited to 'forms/source/richtext/richtextengine.cxx')
-rw-r--r-- | forms/source/richtext/richtextengine.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index b87d6260b723..1105f8a51c1c 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.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: richtextengine.cxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -32,14 +29,14 @@ #include "precompiled_forms.hxx" #include "richtextengine.hxx" #include <svl/itempool.hxx> -#include <svx/eeitem.hxx> -#include <svx/editobj.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editobj.hxx> #define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT -#include <svx/fhgtitem.hxx> +#include <editeng/fhgtitem.hxx> #define ITEMID_FONT EE_CHAR_FONTHEIGHT -#include <svx/fontitem.hxx> +#include <editeng/fontitem.hxx> #define ITEMID_LANGUAGE EE_CHAR_LANGUAGE -#include <svx/langitem.hxx> +#include <editeng/langitem.hxx> #include <vcl/svapp.hxx> #include <vcl/mapunit.hxx> #include <vcl/mapmod.hxx> |