diff options
author | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-03-10 18:46:05 +0100 |
---|---|---|
committer | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-03-10 18:46:05 +0100 |
commit | ea36eec622061f83dca479b39a4aac274e3f05d4 (patch) | |
tree | 65bae43a26ff3e8b15958972953624bdf3435a9f /sw/source/ui/shells/txtattr.cxx | |
parent | 1f38ee2d66a58331d57a5edbbec897bc2d502043 (diff) | |
parent | 6d466e187b459263b41a33122bb7cd244bd1ea1c (diff) |
sw33bf02: merge with DEV300_m74
Diffstat (limited to 'sw/source/ui/shells/txtattr.cxx')
-rw-r--r-- | sw/source/ui/shells/txtattr.cxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index 29fc07107a..0d74c930e5 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.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: txtattr.cxx,v $ - * $Revision: 1.28.140.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -44,14 +41,14 @@ #include <swmodule.hxx> #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/adjitem.hxx> -#include <svx/lspcitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/escpitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/escpitem.hxx> #include <svx/htmlmode.hxx> -#include <svx/scripttypeitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/scripttypeitem.hxx> +#include <editeng/frmdiritem.hxx> #include "paratr.hxx" #include <fmtinfmt.hxx> |