diff options
Diffstat (limited to 'sd/source/ui/view/drawview.cxx')
| -rw-r--r-- | sd/source/ui/view/drawview.cxx | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index dfbd76e4a3b6..81e69f36300c 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.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: drawview.cxx,v $ - * $Revision: 1.52 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -37,7 +34,7 @@ #include <svx/svdpagv.hxx> #include <sfx2/request.hxx> #include <svl/style.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #ifndef _VIEW3D_HXX //autogen #include <svx/view3d.hxx> #endif @@ -49,10 +46,10 @@ #include <svx/svdogrp.hxx> #include <svx/svdorect.hxx> #include <svl/poolitem.hxx> -#include <svx/eeitem.hxx> -#include <svx/bulitem.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/bulitem.hxx> #include <svl/itempool.hxx> -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> #include <svl/whiter.hxx> #include <sfx2/viewfrm.hxx> @@ -306,8 +303,7 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet, String aTemplateName(aLayoutName); if (ePresObjKind == PRESOBJ_TITLE || - ePresObjKind == PRESOBJ_NOTES || - ePresObjKind == PRESOBJ_BACKGROUND) + ePresObjKind == PRESOBJ_NOTES) { // Presentation object (except outline) SfxStyleSheet* pSheet = rPage.GetStyleSheetForPresObj( ePresObjKind ); @@ -580,17 +576,6 @@ void DrawView::HideSdrPage() ::sd::View::HideSdrPage(); } -SdrObject* DrawView::GetMaxToBtmObj(SdrObject* pObj) const -{ - if( pObj ) - { - SdPage* pPage = (SdPage*)pObj->GetPage(); - if( pPage && pPage->IsMasterPage() ) - return pPage->GetPresObj( PRESOBJ_BACKGROUND ) ; - } - return NULL; -} - void DrawView::DeleteMarked() { sd::UndoManager* pUndoManager = mpDoc->GetUndoManager(); |