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 | 54d4353dd1981f03050886d013cbc61a1a5bbaac (patch) | |
| tree | fa4ba629cbdd3c9ffd263e557dfac17dadc55566 /sw/source/core/layout/layact.cxx | |
| parent | 9bba964993fe859b40a5c125406653ee3ade122e (diff) | |
| parent | 7fa96e56c6fe20ea496be40338124ba35aae9d84 (diff) | |
sw33bf02: merge with DEV300_m74
Diffstat (limited to 'sw/source/core/layout/layact.cxx')
| -rw-r--r-- | sw/source/core/layout/layact.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index b187db871eb7..14bc23bb97a4 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.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: layact.cxx,v $ - * $Revision: 1.75 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -64,8 +61,8 @@ #include <ftnidx.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> -#include <svx/opaqitem.hxx> -#include <svx/brshitem.hxx> +#include <editeng/opaqitem.hxx> +#include <editeng/brshitem.hxx> #include <SwSmartTagMgr.hxx> #define _SVSTDARR_BOOLS |