Svg: Reintegrated Svg replacement from /branches/alg/svgreplavement to trunk, first version of Svg stable and done

5 files changed, 0 insertions, 307 deletions

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 96ce84546cb2..a395092f1ad3 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -79,7 +79,6 @@
 #include <lineaction.hxx>
 #include <pointaction.hxx>
 #include <polypolyaction.hxx>
-#include <rendergraphicaction.hxx>
 #include <textaction.hxx>
 #include <transparencygroupaction.hxx>
 #include <vector>
@@ -2650,32 +2649,6 @@ namespace cppcanvas
                     }
                     break;
 
-                    case META_RENDERGRAPHIC_ACTION:
-                    {
-                        MetaRenderGraphicAction* pAct = static_cast<MetaRenderGraphicAction*>(pCurrAct);
-
-                        ActionSharedPtr pRenderGraphicAction(
-                                internal::RenderGraphicActionFactory::createRenderGraphicAction(
-                                    pAct->GetRenderGraphic(),
-                                    getState( rStates ).mapModeTransform *
-                                    ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
-                                    getState( rStates ).mapModeTransform *
-                                    ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
-                                    rCanvas,
-                                    getState( rStates ) ) );
-
-                        if( pRenderGraphicAction )
-                        {
-                            maActions.push_back(
-                                MtfAction(
-                                    pRenderGraphicAction,
-                                    io_rCurrActionIndex ) );
-
-                            io_rCurrActionIndex += pRenderGraphicAction->getActionCount()-1;
-                        }
-                    }
-                    break;
-
                     default:
                         OSL_ENSURE( false,
                                     "Unknown meta action type encountered" );
diff --git a/cppcanvas/source/mtfrenderer/makefile.mk b/cppcanvas/source/mtfrenderer/makefile.mk
index 92ae7e1200bc..d142731f81af 100644
--- a/cppcanvas/source/mtfrenderer/makefile.mk
+++ b/cppcanvas/source/mtfrenderer/makefile.mk
@@ -48,7 +48,6 @@ SLOFILES =	$(SLO)$/cachedprimitivebase.obj \
             $(SLO)$/lineaction.obj \
             $(SLO)$/pointaction.obj \
             $(SLO)$/polypolyaction.obj \
-            $(SLO)$/rendergraphicaction.obj \
             $(SLO)$/textaction.obj \
             $(SLO)$/transparencygroupaction.obj \
             $(SLO)$/mtftools.obj
diff --git a/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx b/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
deleted file mode 100644
index 764d3eabc6af..000000000000
--- a/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
+++ /dev/null
@@ -1,201 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_cppcanvas.hxx"
-
-#include <rtl/logfile.hxx>
-#include <com/sun/star/rendering/XBitmap.hpp>
-#include <com/sun/star/rendering/RepaintResult.hpp>
-#include <com/sun/star/rendering/XCachedPrimitive.hpp>
-#include <vcl/rendergraphicrasterizer.hxx>
-#include <tools/gen.hxx>
-#include <vcl/canvastools.hxx>
-#include <canvas/canvastools.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/vector/b2dsize.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/range/b2drange.hxx>
-#include <basegfx/tools/canvastools.hxx>
-#include <boost/utility.hpp>
-#include "cachedprimitivebase.hxx"
-#include "rendergraphicaction.hxx"
-#include "outdevstate.hxx"
-#include "mtftools.hxx"
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
-
-
-using namespace ::com::sun::star;
-
-namespace cppcanvas
-{
-    namespace internal
-    {
-        namespace
-        {
-
-            class RenderGraphicAction : public CachedPrimitiveBase
-            {
-            public:
-                RenderGraphicAction( const ::vcl::RenderGraphic& rRenderGraphic,
-                              const ::basegfx::B2DPoint& rDstPoint,
-                              const ::basegfx::B2DVector& rDstSize,
-                              const CanvasSharedPtr&,
-                              const OutDevState& );
-
-                virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
-                                     const Subset& rSubset ) const;
-
-                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
-                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
-                                                       const Subset& rSubset ) const;
-
-                virtual sal_Int32 getActionCount() const;
-
-            private:
-                using Action::render;
-                virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
-                                     const ::basegfx::B2DHomMatrix& rTransformation ) const;
-
-                ::vcl::RenderGraphic                    maRenderGraphic;
-                uno::Reference< rendering::XBitmap >    mxBitmap;
-                CanvasSharedPtr                         mpCanvas;
-                rendering::RenderState                  maState;
-            };
-
-            RenderGraphicAction::RenderGraphicAction( const ::vcl::RenderGraphic& rRenderGraphic,
-                                                      const ::basegfx::B2DPoint& rDstPoint,
-                                                      const ::basegfx::B2DVector& rDstSize,
-                                                      const CanvasSharedPtr& rCanvas,
-                                                      const OutDevState& rState ) :
-                CachedPrimitiveBase( rCanvas, true ),
-                maRenderGraphic( rRenderGraphic ),
-                mpCanvas( rCanvas )
-            {
-                tools::initRenderState( maState,rState );
-
-                const ::vcl::RenderGraphicRasterizer aRasterizer( rRenderGraphic );
-                const BitmapEx aBmpEx( aRasterizer.Rasterize( ::vcl::unotools::sizeFromB2DSize( rDstSize ) ) );
-                const Size aRasteredSizePixel( aBmpEx.GetSizePixel() );
-
-                if( aRasteredSizePixel.Width() && aRasteredSizePixel.Height() )
-                {
-                    const ::basegfx::B2DVector aScale( rDstSize.getX() / aRasteredSizePixel.Width(),
-                                                       rDstSize.getY() / aRasteredSizePixel.Height() );
-                    const basegfx::B2DHomMatrix aLocalTransformation(
-                        basegfx::tools::createScaleTranslateB2DHomMatrix( aScale, rDstPoint)) ;
-
-                    ::canvas::tools::appendToRenderState( maState, aLocalTransformation );
-
-                    // correct clip (which is relative to original transform)
-                    tools::modifyClip( maState, rState, rCanvas, rDstPoint, &aScale, NULL );
-
-                    mxBitmap = ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), aBmpEx );
-                }
-            }
-
-            bool RenderGraphicAction::render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
-                                       const ::basegfx::B2DHomMatrix&                 rTransformation ) const
-            {
-                RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::RenderGraphicAction::render()" );
-                RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::RenderGraphicAction: 0x%X", this );
-
-                if( mxBitmap.is() )
-                {
-                    rendering::RenderState aLocalState( maState );
-                    ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
-
-                    rCachedPrimitive = mpCanvas->getUNOCanvas()->drawBitmap( mxBitmap,
-                                                                             mpCanvas->getViewState(),
-                                                                             aLocalState );
-                }
-
-                return true;
-            }
-
-            bool RenderGraphicAction::render( const ::basegfx::B2DHomMatrix&    rTransformation,
-                                       const Subset&                    rSubset ) const
-            {
-                // rendergraphic only contains a single action, fail if subset
-                // requests different range
-                if( rSubset.mnSubsetBegin != 0 ||
-                    rSubset.mnSubsetEnd != 1 )
-                    return false;
-
-                return CachedPrimitiveBase::render( rTransformation );
-            }
-
-            ::basegfx::B2DRange RenderGraphicAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const
-            {
-                ::basegfx::B2DRange aRet;
-
-                if( mxBitmap.is() )
-                {
-                    rendering::RenderState aLocalState( maState );
-                    ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
-
-                    geometry::IntegerSize2D aSize( mxBitmap->getSize() );
-
-                    aRet = tools::calcDevicePixelBounds( ::basegfx::B2DRange( 0, 0, aSize.Width, aSize.Height ),
-                                                         mpCanvas->getViewState(), aLocalState );
-                }
-
-                return( aRet );
-            }
-
-            ::basegfx::B2DRange RenderGraphicAction::getBounds( const ::basegfx::B2DHomMatrix&  rTransformation,
-                                                         const Subset&                  rSubset ) const
-            {
-                // rendergraphic only contains a single action, empty bounds
-                // if subset requests different range
-                if( rSubset.mnSubsetBegin != 0 ||
-                    rSubset.mnSubsetEnd != 1 )
-                    return ::basegfx::B2DRange();
-
-                return getBounds( rTransformation );
-            }
-
-            sal_Int32 RenderGraphicAction::getActionCount() const
-            {
-                return 1;
-            }
-        }
-
-        ActionSharedPtr RenderGraphicActionFactory::createRenderGraphicAction( const ::vcl::RenderGraphic& rRenderGraphic,
-                                                                 const ::basegfx::B2DPoint&  rDstPoint,
-                                                                 const ::basegfx::B2DVector& rDstSize,
-                                                                 const CanvasSharedPtr&      rCanvas,
-                                                                 const OutDevState&          rState )
-        {
-            return ActionSharedPtr( new RenderGraphicAction(rRenderGraphic,
-                                                     rDstPoint,
-                                                     rDstSize,
-                                                     rCanvas,
-                                                     rState ) );
-        }
-    }
-}
diff --git a/cppcanvas/source/mtfrenderer/rendergraphicaction.hxx b/cppcanvas/source/mtfrenderer/rendergraphicaction.hxx
deleted file mode 100644
index f1e2dccdfe0d..000000000000
--- a/cppcanvas/source/mtfrenderer/rendergraphicaction.hxx
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CPPCANVAS_RENDERGRAPHICACTION_HXX
-#define _CPPCANVAS_RENDERGRAPHICACTION_HXX
-
-#include <cppcanvas/canvas.hxx>
-#include <action.hxx>
-
-namespace basegfx {
-    class B2DPoint;
-    class B2DVector;
-}
-namespace vcl {
-    class RenderGraphic;
-}
-
-/* Definition of internal::RenderGraphicActionFactory class */
-
-namespace cppcanvas
-{
-    namespace internal
-    {
-        struct OutDevState;
-
-        /** Creates encapsulated converters between GDIMetaFile and
-            XCanvas. The Canvas argument is deliberately placed at the
-            constructor, to force reconstruction of this object for a
-            new canvas. This considerably eases internal state
-            handling, since a lot of the internal state (e.g. fonts,
-            text layout) is Canvas-dependent.
-         */
-        class RenderGraphicActionFactory
-        {
-        public:
-            /// Scaled rendergraphic action, dest point and dest size
-            static ActionSharedPtr createRenderGraphicAction( const ::vcl::RenderGraphic& rRenderGraphic,
-                                                       const ::basegfx::B2DPoint&  rDstPoint,
-                                                       const ::basegfx::B2DVector& rDstSize,
-                                                       const CanvasSharedPtr&,
-                                                       const OutDevState& );
-
-        private:
-            // static factory, disable big four
-            RenderGraphicActionFactory();
-            ~RenderGraphicActionFactory();
-            RenderGraphicActionFactory(const RenderGraphicActionFactory&);
-            RenderGraphicActionFactory& operator=( const RenderGraphicActionFactory& );
-        };
-    }
-}
-
-#endif /*_CPPCANVAS_RENDERGRAPHICACTION_HXX */
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 3d62fb64fe24..a3229f7e8cf9 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -387,7 +387,6 @@ namespace cppcanvas
                                 case META_TEXTLINE_ACTION:
                                 case META_TEXTRECT_ACTION:
                                 case META_STRETCHTEXT_ACTION:
-                                case META_RENDERGRAPHIC_ACTION:
                                     // output-generating action - only
                                     // copy, if we're within the
                                     // requested subset