diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-02-26 08:13:29 +0100 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-02-26 08:13:29 +0100 |
| commit | f3f9bbf544328823c6816bcc6e9afecc886c18ab (patch) | |
| tree | ef19e016bd5efea85f5e82ea265fd5a9531407c3 /svx/source/svdraw/svdattr.cxx | |
| parent | 97d964702b7d8a9814a52b974505603ffba2e6c6 (diff) | |
| parent | 4d8175599b8d193aba6eef89ef905c830b87d7e7 (diff) | |
cws tl74: merge with DEV300_m72
Diffstat (limited to 'svx/source/svdraw/svdattr.cxx')
| -rw-r--r-- | svx/source/svdraw/svdattr.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 356546e409a0..d831906fa94c 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.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: svdattr.cxx,v $ - * $Revision: 1.34.212.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -53,7 +50,7 @@ #include <svx/svdpool.hxx> #include <svl/solar.hrc> -#include "xmlcnitm.hxx" +#include "editeng/xmlcnitm.hxx" #include <svx/svxids.hrc> #include <svx/xtable.hxx> // fuer RGB_Color() @@ -63,9 +60,9 @@ #include "svdglob.hxx" // Stringcache #include "svdstr.hrc" #include <svx/sdgcpitm.hxx> -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/sdtfchim.hxx> -#include <svx/writingmodeitem.hxx> +#include <editeng/writingmodeitem.hxx> #include <tools/bigint.hxx> #include <tools/stream.hxx> @@ -76,13 +73,13 @@ #define ITEMID_BOX SDRATTR_TABLE_BORDER #define ITEMID_BOXINFO SDRATTR_TABLE_BORDER_INNER -#include "svx/boxitem.hxx" +#include "editeng/boxitem.hxx" #define ITEMID_SHADOW SDRATTR_TABLE_BORDER_SHADOW -#include "svx/shaditem.hxx" +#include "editeng/shaditem.hxx" #define ITEMID_LINE 0 -#include "bolnitem.hxx" +#include "editeng/bolnitem.hxx" using namespace ::rtl; using namespace ::com::sun::star; |