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/svdview.cxx | |
| parent | 97d964702b7d8a9814a52b974505603ffba2e6c6 (diff) | |
| parent | 4d8175599b8d193aba6eef89ef905c830b87d7e7 (diff) | |
cws tl74: merge with DEV300_m72
Diffstat (limited to 'svx/source/svdraw/svdview.cxx')
| -rw-r--r-- | svx/source/svdraw/svdview.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index edda4b700e29..856820b6d864 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.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: svdview.cxx,v $ - * $Revision: 1.29.18.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -30,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include "svdstr.hrc" // Namen aus der Resource #include "svdglob.hxx" // StringCache @@ -49,8 +46,8 @@ #include "svx/svdoutl.hxx" #include "svx/svdview.hxx" -#include "svx/editview.hxx" // fuer GetField -#include "svx/flditem.hxx" // fuer URLField +#include "editeng/editview.hxx" // fuer GetField +#include "editeng/flditem.hxx" // fuer URLField #include "svx/obj3d.hxx" #include "svx/svddrgmt.hxx" #include "svx/svdoutl.hxx" @@ -977,7 +974,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } return bRet; } -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nModifier, BOOL bLeftDown) const { |