diff options
author | Armin Weiss <aw@openoffice.org> | 2008-05-27 13:11:34 +0000 |
---|---|---|
committer | Armin Weiss <aw@openoffice.org> | 2008-05-27 13:11:34 +0000 |
commit | 135fa74ce3c33f54b98ea7eeefd00bd6874817d2 (patch) | |
tree | a1adc81515055b78a376d9e8fab588a80e33003e /drawinglayer/source/texture | |
parent | d967787a6fa78c4a0eb6541cdecac463c5c3928e (diff) |
#i39532# changes DEV300 m12 resync corrections
Diffstat (limited to 'drawinglayer/source/texture')
-rw-r--r-- | drawinglayer/source/texture/texture.cxx | 9 | ||||
-rw-r--r-- | drawinglayer/source/texture/texture3d.cxx | 17 |
2 files changed, 4 insertions, 22 deletions
diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx index cde3b701bac8..dce24359f1a0 100644 --- a/drawinglayer/source/texture/texture.cxx +++ b/drawinglayer/source/texture/texture.cxx @@ -4,9 +4,9 @@ * * $RCSfile: texture.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: aw $ $Date: 2008-05-14 09:21:54 $ + * last change: $Author: aw $ $Date: 2008-05-27 14:11:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,13 +36,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_drawinglayer.hxx" -#ifndef INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE_HXX #include <drawinglayer/texture/texture.hxx> -#endif - -#ifndef _BGFX_NUMERIC_FTOOLS_HXX #include <basegfx/numeric/ftools.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx index e1ad4599616a..0e103ad385c9 100644 --- a/drawinglayer/source/texture/texture3d.cxx +++ b/drawinglayer/source/texture/texture3d.cxx @@ -4,9 +4,9 @@ * * $RCSfile: texture3d.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2008-04-16 04:59:59 $ + * last change: $Author: aw $ $Date: 2008-05-27 14:11:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,21 +36,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_drawinglayer.hxx" -#ifndef INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE3D_HXX #include <drawinglayer/texture/texture3d.hxx> -#endif - -#ifndef _SV_BMPACC_HXX #include <vcl/bmpacc.hxx> -#endif - -#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLATTRIBUTE_HXX #include <drawinglayer/attribute/fillattribute.hxx> -#endif - -#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HATCHTEXTUREPRIMITIVE3D_HXX #include <drawinglayer/primitive3d/hatchtextureprimitive3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// @@ -234,8 +223,6 @@ namespace drawinglayer bool GeoTexSvxMultiHatch::impIsOnHatch(const basegfx::B2DPoint& rUV) const { - double fSmallestDistance(); - if(mp0->getDistanceToHatch(rUV) < mfLogicPixelSize) { return true; |