diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-03-12 20:13:16 +0100 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-03-12 20:13:16 +0100 |
| commit | d7e6a5284e6262f800435bcf35b8c840db63b698 (patch) | |
| tree | 6e786a728bfd1a0a2f581b5bedf91e60e90cac1c /svx/source/svdraw/svdview.cxx | |
| parent | 88635eddcd4e4d8a3eb4293cbbe055415cd147c4 (diff) | |
| parent | 344e390b9d114b3cbdd9d1b39ea44e5cdf875788 (diff) | |
renaissance2: merge to m73
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 d92e13333ffb..7a4305b9581f 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 { |