diff options
author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-04-12 20:04:24 +0200 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-04-12 20:04:24 +0200 |
commit | bec2d48753200fbd99a138908157a4294fbfb118 (patch) | |
tree | 573df4aa535541b714d810c34d074abf113dea52 /sd/source/ui/view/drviewse.cxx | |
parent | 409b6bcfcc3c8baa285d1bcb16f8063682a952a9 (diff) | |
parent | c88455c9782248b48bf897aa66cb5c1a4a4e3bfb (diff) |
slidecopy: merge
Diffstat (limited to 'sd/source/ui/view/drviewse.cxx')
-rw-r--r-- | sd/source/ui/view/drviewse.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 1dbfa7211a76..1a667b28f6d4 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.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: drviewse.cxx,v $ - * $Revision: 1.77 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -41,7 +38,7 @@ #include "undo/undomanager.hxx" #include <vcl/waitobj.hxx> #include <svl/aeitem.hxx> -#include <svx/editstat.hxx> +#include <editeng/editstat.hxx> #include <vcl/msgbox.hxx> #include <svl/urlbmk.hxx> #include <svx/svdpagv.hxx> @@ -52,12 +49,12 @@ #include <svx/svdorect.hxx> #include <svx/svdograf.hxx> #include <svl/eitem.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/request.hxx> #include <svx/svxids.hrc> -#include <svx/flditem.hxx> +#include <editeng/flditem.hxx> #include <svx/ruler.hxx> #include <svx/obj3d.hxx> #include <svx/fmglob.hxx> @@ -69,7 +66,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <avmedia/mediawindow.hxx> #include <svl/urihelper.hxx> -#include <sfx2/topfrm.hxx> #include <sfx2/docfile.hxx> #include "DrawViewShell.hxx" |