incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1227097 - in /incubator/ooo/trunk/main/drawinglayer: inc/drawinglayer/processor2d/canvasprocessor.hxx inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx source/processor2d/canvasprocessor.cxx source/processor2d/vclpixelprocessor2d.cxx
Date Wed, 04 Jan 2012 10:11:13 GMT
Author: alg
Date: Wed Jan  4 10:11:13 2012
New Revision: 1227097

URL: http://svn.apache.org/viewvc?rev=1227097&view=rev
Log:
fix for #118525#: removed no longer used variable maOriginalMapMode, one more exception eliminated

Modified:
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
    incubator/ooo/trunk/main/drawinglayer/source/processor2d/canvasprocessor.cxx
    incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx

Modified: incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx?rev=1227097&r1=1227096&r2=1227097&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
(original)
+++ incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
Wed Jan  4 10:11:13 2012
@@ -73,10 +73,6 @@ namespace drawinglayer
 		class DRAWINGLAYER_DLLPUBLIC canvasProcessor2D : public BaseProcessor2D
 		{
 		private:
-			// The Pixel renderer resets the original MapMode from the OutputDevice.
-			// For some situations it is necessary to get it again, so it is rescued here
-			MapMode								                    maOriginalMapMode;
-            
             // the (current) destination OutDev and canvas
 			OutputDevice*											mpOutputDevice;
             com::sun::star::uno::Reference< com::sun::star::rendering::XCanvas >	mxCanvas;

Modified: incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx?rev=1227097&r1=1227096&r2=1227097&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
(original)
+++ incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
Wed Jan  4 10:11:13 2012
@@ -43,11 +43,6 @@ namespace drawinglayer
 		class DRAWINGLAYER_DLLPUBLIC VclPixelProcessor2D : public VclProcessor2D
 		{
         private:
-			/*  The Pixel renderer resets the original MapMode from the OutputDevice.
-			    For some situations it is necessary to get it again, so it is rescued here
-             */
-			MapMode								maOriginalMapMode;
-
 		protected:
 			/*  the local processor for BasePrinitive2D-Implementation based primitives,
 			    called from the common process()-implementation
@@ -60,9 +55,6 @@ namespace drawinglayer
 				const geometry::ViewInformation2D& rViewInformation, 
 				OutputDevice& rOutDev);
 			virtual ~VclPixelProcessor2D();
-
-			/// data read access
-			const MapMode& getOriginalMapMode() const { return maOriginalMapMode; }
 		};
 	} // end of namespace processor2d
 } // end of namespace drawinglayer

Modified: incubator/ooo/trunk/main/drawinglayer/source/processor2d/canvasprocessor.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/source/processor2d/canvasprocessor.cxx?rev=1227097&r1=1227096&r2=1227097&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/source/processor2d/canvasprocessor.cxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/source/processor2d/canvasprocessor.cxx Wed Jan 
4 10:11:13 2012
@@ -2134,7 +2134,6 @@ namespace drawinglayer
 			const geometry::ViewInformation2D& rViewInformation, 
 			OutputDevice& rOutDev) 
 		:	BaseProcessor2D(rViewInformation),
-            maOriginalMapMode(rOutDev.GetMapMode()),
             mpOutputDevice(&rOutDev),
 			mxCanvas(rOutDev.GetCanvas()),
 			maViewState(),

Modified: incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx?rev=1227097&r1=1227096&r2=1227097&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx Wed Jan
 4 10:11:13 2012
@@ -70,8 +70,7 @@ namespace drawinglayer
 	namespace processor2d
 	{
 		VclPixelProcessor2D::VclPixelProcessor2D(const geometry::ViewInformation2D& rViewInformation,
OutputDevice& rOutDev)
-		:	VclProcessor2D(rViewInformation, rOutDev),
-			maOriginalMapMode(rOutDev.GetMapMode())
+		:	VclProcessor2D(rViewInformation, rOutDev)
 		{
 			// prepare maCurrentTransformation matrix with viewTransformation to target directly to
pixels
 			maCurrentTransformation = rViewInformation.getObjectToViewTransformation();



Mime
View raw message