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/drviews5.cxx | |
| parent | 409b6bcfcc3c8baa285d1bcb16f8063682a952a9 (diff) | |
| parent | c88455c9782248b48bf897aa66cb5c1a4a4e3bfb (diff) | |
slidecopy: merge
Diffstat (limited to 'sd/source/ui/view/drviews5.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews5.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 3f8973fbcd64..18ff686fc612 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.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: drviews5.cxx,v $ - * $Revision: 1.55 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -33,7 +30,7 @@ #include "DrawViewShell.hxx" #include "PresentationViewShell.hxx" -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #ifndef _SVXIDS_HXX #include <svx/svxids.hrc> #endif @@ -43,7 +40,7 @@ #include <vcl/scrbar.hxx> #include <tools/poly.hxx> #include <svx/fmshell.hxx> -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svtools/colorcfg.hxx> #include "AccessibleDrawDocumentView.hxx" @@ -156,7 +153,7 @@ void DrawViewShell::ArrangeGUIElements (void) if ( pIPClient && pIPClient->IsObjectInPlaceActive() ) bClientActive = TRUE; - BOOL bInPlaceActive = GetViewFrame()->GetFrame()->IsInPlace(); + BOOL bInPlaceActive = GetViewFrame()->GetFrame().IsInPlace(); if ( mbZoomOnPage && !bInPlaceActive && !bClientActive ) { |