diff options
author | Armin Weiss <aw@openoffice.org> | 2008-02-07 12:42:32 +0000 |
---|---|---|
committer | Armin Weiss <aw@openoffice.org> | 2008-02-07 12:42:32 +0000 |
commit | 42b6b472aef0e9a7e6496979182cfaca1c597394 (patch) | |
tree | 4e029aef69c38fed26ca96ff9f7ebb698b83c08f /drawinglayer/source/primitive2d/sceneprimitive2d.cxx | |
parent | 7a7c1dcb9bfb49b38b7ea6bb276c5189262773c0 (diff) |
stable version from working GIT repository for unxlngi6 build
Diffstat (limited to 'drawinglayer/source/primitive2d/sceneprimitive2d.cxx')
-rw-r--r-- | drawinglayer/source/primitive2d/sceneprimitive2d.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx index c3db747847c7..063705323137 100644 --- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sceneprimitive2d.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: aw $ $Date: 2008-01-30 12:25:05 $ + * last change: $Author: aw $ $Date: 2008-02-07 13:41:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -113,8 +113,9 @@ namespace drawinglayer { // test visibility const basegfx::B2DRange aShadow2DRange(getB2DRangeFromPrimitive2DSequence(maShadowPrimitives, rViewInformation)); + const basegfx::B2DRange aViewRange(rViewInformation.getViewport()); - if(aShadow2DRange.overlaps(rViewInformation.getViewport())) + if(aViewRange.isEmpty() || aShadow2DRange.overlaps(aViewRange)) { // add extracted 2d shadows (before 3d scene creations itself) aRetval = maShadowPrimitives; @@ -236,8 +237,9 @@ namespace drawinglayer { // test visibility const basegfx::B2DRange aLabel2DRange(getB2DRangeFromPrimitive2DSequence(maLabelPrimitives, rViewInformation)); + const basegfx::B2DRange aViewRange(rViewInformation.getViewport()); - if(aLabel2DRange.overlaps(rViewInformation.getViewport())) + if(aViewRange.isEmpty() || aLabel2DRange.overlaps(aViewRange)) { // add extracted 2d labels (after 3d scene creations) appendPrimitive2DSequenceToPrimitive2DSequence(aRetval, maLabelPrimitives); |