diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-06-24 18:38:10 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-06-24 18:38:10 +0200 |
| commit | 70dda9d6b25d1dcdc1bc995c599ff51bfa758614 (patch) | |
| tree | 1ca2c5cb60f69931595976efa695a8ede51ced7f /sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | |
| parent | f7016dabf14874375414471571d40b1ed48700a9 (diff) | |
| parent | 3ed4c287784b42bb8ff26bcdcff1b13734815495 (diff) | |
CWS mongolianlayout: merge with m83; resolve easy conflicts
Diffstat (limited to 'sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx')
| -rw-r--r-- | sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx index 48776aeebfda..cf02ed8e45cd 100644 --- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.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: tolayoutanchoredobjectposition.cxx,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -43,8 +40,8 @@ #include <fmtsrnd.hxx> #include <IDocumentSettingAccess.hxx> #include <frmatr.hxx> -#include <svx/lrspitem.hxx> -#include <svx/ulspitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/ulspitem.hxx> using namespace objectpositioning; using namespace ::com::sun::star; |