chart2/source/view/inc/DateHelper.hxx | 3 - chart2/source/view/main/OpenGLRender.cxx | 2 - drawinglayer/source/attribute/fillgraphicattribute.cxx | 2 - drawinglayer/source/primitive2d/controlprimitive2d.cxx | 4 -- drawinglayer/source/primitive2d/graphicprimitive2d.cxx | 2 - drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 16 ---------- drawinglayer/source/processor2d/processorfromoutputdevice.cxx | 5 --- drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 13 -------- drawinglayer/source/processor3d/zbufferprocessor3d.cxx | 9 ----- 9 files changed, 1 insertion(+), 55 deletions(-)
New commits: commit e5cf1d8c0352e99e13ed25b666895c21d8f1189b Author: peilin <pei...@multicorewareinc.com> Date: Tue Mar 18 16:55:03 2014 +0800 fix the scale size of bubble Change-Id: I633e2ff112e21488b9d17ffbb59a926b22b51952 diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 689925a..76c19cb 100755 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -852,7 +852,7 @@ int OpenGLRender::RenderBubble2FBO(int) Bubble2DPointList &pointList = m_Bubble2DShapePointList.front(); PosVecf3 trans = {pointList.x, pointList.y, m_fZStep}; PosVecf3 angle = {0.0f, 0.0f, 0.0f}; - PosVecf3 scale = {pointList.xScale, pointList.yScale, 1.0f}; + PosVecf3 scale = {pointList.xScale / 2, pointList.yScale / 2 , 1.0f}; MoveModelf(trans, angle, scale); m_MVP = m_Projection * m_View * m_Model; //render to fbo commit 8c347455848c9b15841b796785fc147a6e79c60b Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk> Date: Wed Mar 19 02:09:50 2014 +0100 remove empty comment Change-Id: Ie5f5e6c92845933403b2371400fcdba10eba1a42 diff --git a/chart2/source/view/inc/DateHelper.hxx b/chart2/source/view/inc/DateHelper.hxx index 3c80674..3142e90 100644 --- a/chart2/source/view/inc/DateHelper.hxx +++ b/chart2/source/view/inc/DateHelper.hxx @@ -25,9 +25,6 @@ namespace chart { -/** -*/ - class DateHelper { public: commit 092eecb7d7bf6ffc08c4d83a78ec3ed741db7162 Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk> Date: Tue Mar 18 01:22:28 2014 +0100 remove whitespace Change-Id: I81a24a7affa7dffcc3dac65248444679c3c49925 diff --git a/drawinglayer/source/attribute/fillgraphicattribute.cxx b/drawinglayer/source/attribute/fillgraphicattribute.cxx index 0e3bc2f..bd7b98e 100644 --- a/drawinglayer/source/attribute/fillgraphicattribute.cxx +++ b/drawinglayer/source/attribute/fillgraphicattribute.cxx @@ -20,8 +20,6 @@ #include <drawinglayer/attribute/fillgraphicattribute.hxx> #include <vcl/graph.hxx> - - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx index 334288e..58388e4 100644 --- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx @@ -37,12 +37,8 @@ #include <vcl/window.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> - - using namespace com::sun::star; - - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx index 2fa4a94..ab7e1e3 100644 --- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx @@ -28,8 +28,6 @@ #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> - - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx index 53d890b..7fc6426 100644 --- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx @@ -29,7 +29,6 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/numeric/ftools.hxx> - // helper class for animated graphics #include <vcl/animate.hxx> @@ -38,11 +37,6 @@ #include <vcl/svapp.hxx> #include <vcl/metaact.hxx> - -// includes for testing MetafilePrimitive2D::create2DDecomposition - - - namespace { struct animationStep @@ -195,8 +189,6 @@ namespace } } // end of anonymous namespace - - namespace drawinglayer { namespace primitive2d @@ -323,15 +315,7 @@ namespace drawinglayer return aRetval; } - } // end of namespace primitive2d -} // end of namespace drawinglayer - - -namespace drawinglayer -{ - namespace primitive2d - { Primitive2DSequence create2DColorModifierEmbeddingsAsNeeded( const Primitive2DSequence& rChildren, GraphicDrawMode aGraphicDrawMode, diff --git a/drawinglayer/source/processor2d/processorfromoutputdevice.cxx b/drawinglayer/source/processor2d/processorfromoutputdevice.cxx index 1fb2064..fe962c2 100644 --- a/drawinglayer/source/processor2d/processorfromoutputdevice.cxx +++ b/drawinglayer/source/processor2d/processorfromoutputdevice.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/outdev.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b2drange.hxx> @@ -28,12 +27,8 @@ #include "vclpixelprocessor2d.hxx" #include <vcl/window.hxx> - - using namespace com::sun::star; - - namespace drawinglayer { namespace processor2d diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 5cc7981..38248be 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -58,36 +58,25 @@ #include <basegfx/polygon/b2dlinegeometry.hxx> #include <vcl/dibtools.hxx> - // for PDFExtOutDevData Graphic support - #include <vcl/graph.hxx> #include <vcl/svapp.hxx> #include <toolkit/helper/formpdfexport.hxx> - // for Control printing - #include <com/sun/star/beans/XPropertySet.hpp> - // for StructureTagPrimitive support in sd's unomodel.cxx - #include <drawinglayer/primitive2d/structuretagprimitive2d.hxx> - - using namespace com::sun::star; - // #112245# definition for maximum allowed point count due to Metafile target. // To be on the safe side with the old tools polygon, use slightly less then // the theoretical maximum (bad experiences with tools polygon) #define MAX_POLYGON_POINT_COUNT_METAFILE (0x0000fff0) - - namespace { // #112245# helper to split line polygon in half @@ -244,8 +233,6 @@ namespace } // end of anonymous namespace - - namespace drawinglayer { namespace processor2d diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx index a78aed4..d80afc4 100644 --- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx +++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx @@ -33,12 +33,8 @@ #include <basegfx/polygon/b3dpolypolygontools.hxx> #include <drawinglayer/attribute/sdrlightingattribute3d.hxx> - - using namespace com::sun::star; - - namespace { BitmapEx BPixelRasterToBitmapEx(const basegfx::BPixelRaster& rRaster, sal_uInt16 mnAntiAlialize) @@ -133,8 +129,6 @@ namespace } } // end of anonymous namespace - - class ZBufferRasterConverter3D : public basegfx::RasterConverter3D { private: @@ -460,7 +454,6 @@ void ZBufferRasterConverter3D::processLineSpan(const basegfx::RasterConversionLi } } - // helper class to buffer output for transparent rasterprimitives (filled areas // and lines) until the end of processing. To ensure correct transparent // visualisation, ZBuffers require to not set Z and to mix with the transparent @@ -537,8 +530,6 @@ public: bool getIsLine() const { return mbIsLine; } }; - - namespace drawinglayer { namespace processor3d _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits