diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
| commit | 23fe49e15145fce54048c44c49ca0fb09f03c2c2 (patch) | |
| tree | 9f9ce34fe8626f75c6b4c6effefe1dffb95196e3 /sw/source/ui/chrdlg/chardlg.cxx | |
| parent | d2137e0c3414c5c3d1ba55569316baa4eaf99f5f (diff) | |
| parent | 7fa96e56c6fe20ea496be40338124ba35aae9d84 (diff) | |
autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore.
Diffstat (limited to 'sw/source/ui/chrdlg/chardlg.cxx')
| -rw-r--r-- | sw/source/ui/chrdlg/chardlg.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 6bd138b1e3bd..38b1ba906fdd 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.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: chardlg.cxx,v $ - * $Revision: 1.30 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -43,7 +40,7 @@ #endif #include <svl/urihelper.hxx> #include <svl/stritem.hxx> -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> #include <svx/htmlmode.hxx> #include <svl/cjkoptions.hxx> |