diff options
| author | sb <sb@openoffice.org> | 2010-04-14 17:21:13 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-14 17:21:13 +0200 |
| commit | 10b1f939953d971de57c5bb20f901631ef5bfeea (patch) | |
| tree | c93247da79c85bee1f96f0b655a27f463ec640d8 /sd/source/ui/view/sdview.cxx | |
| parent | 6fc142c2e5993e1763a897186eef76a984105f5c (diff) | |
| parent | 17d0f112effa923bc6bfeb799a775b9050941573 (diff) | |
sb118: merged in backout
Diffstat (limited to 'sd/source/ui/view/sdview.cxx')
| -rw-r--r-- | sd/source/ui/view/sdview.cxx | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index d38704bd124c..813c6caba95a 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.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: sdview.cxx,v $ - * $Revision: 1.66 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -34,11 +31,11 @@ #include <com/sun/star/linguistic2/XSpellChecker1.hpp> #include "View.hxx" -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <sfx2/request.hxx> #include <svx/obj3d.hxx> #include <svx/fmview.hxx> -#include <svx/outliner.hxx> +#include <editeng/outliner.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif @@ -54,7 +51,7 @@ #include <svx/sdr/contact/displayinfo.hxx> #include <svx/svdetc.hxx> -#include <svx/editstat.hxx> +#include <editeng/editstat.hxx> #include <svx/dialogs.hrc> #include <sfx2/viewfrm.hxx> @@ -264,11 +261,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP if( !bSubContentProcessing || !pObject->IsNotVisibleAsMaster() ) { eKind = pObjectsSdPage ? pObjectsSdPage->GetPresObjKind(pObject) : PRESOBJ_NONE; - - if( eKind != PRESOBJ_BACKGROUND ) - { - bCreateOutline = true; - } + bCreateOutline = true; } } else if( ( pObject->GetObjInventor() == SdrInventor ) && ( pObject->GetObjIdentifier() == OBJ_TEXT ) ) @@ -314,7 +307,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP // create dashed border { // create object polygon - basegfx::B2DPolygon aPolygon(basegfx::tools::createPolygonFromRect(basegfx::B2DRange(0.0, 0.0, 1.0, 1.0))); + basegfx::B2DPolygon aPolygon(basegfx::tools::createUnitPolygon()); aPolygon.transform(aObjectMatrix); // create line and stroke attribute |