diff options
Diffstat (limited to 'cppcanvas/source/mtfrenderer/implrenderer.cxx')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 87 |
1 files changed, 36 insertions, 51 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 05ba6852e427..b7f1677d8682 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1,31 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * 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. - * - ************************************************************************/ - + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ #include <canvas/debug.hxx> #include <tools/diagnose_ex.h> @@ -81,7 +71,6 @@ #include <lineaction.hxx> #include <pointaction.hxx> #include <polypolyaction.hxx> -#include <rendergraphicaction.hxx> #include <textaction.hxx> #include <transparencygroupaction.hxx> #include <vector> @@ -156,6 +145,28 @@ namespace break; } + switch(rLineInfo.GetLineCap()) + { + default: /* com::sun::star::drawing::LineCap_BUTT */ + { + o_rStrokeAttributes.StartCapType = rendering::PathCapType::BUTT; + o_rStrokeAttributes.EndCapType = rendering::PathCapType::BUTT; + break; + } + case com::sun::star::drawing::LineCap_ROUND: + { + o_rStrokeAttributes.StartCapType = rendering::PathCapType::ROUND; + o_rStrokeAttributes.EndCapType = rendering::PathCapType::ROUND; + break; + } + case com::sun::star::drawing::LineCap_SQUARE: + { + o_rStrokeAttributes.StartCapType = rendering::PathCapType::SQUARE; + o_rStrokeAttributes.EndCapType = rendering::PathCapType::SQUARE; + break; + } + } + if( LINE_DASH == rLineInfo.GetStyle() ) { const ::cppcanvas::internal::OutDevState& rState( rParms.mrStates.getState() ); @@ -2663,32 +2674,6 @@ namespace cppcanvas } break; - case META_RENDERGRAPHIC_ACTION: - { - MetaRenderGraphicAction* pAct = static_cast<MetaRenderGraphicAction*>(pCurrAct); - - ActionSharedPtr pRenderGraphicAction( - internal::RenderGraphicActionFactory::createRenderGraphicAction( - pAct->GetRenderGraphic(), - rStates.getState().mapModeTransform * - ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ), - rStates.getState().mapModeTransform * - ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ), - rCanvas, - rStates.getState() ) ); - - if( pRenderGraphicAction ) - { - maActions.push_back( - MtfAction( - pRenderGraphicAction, - io_rCurrActionIndex ) ); - - io_rCurrActionIndex += pRenderGraphicAction->getActionCount()-1; - } - } - break; - default: OSL_FAIL( "Unknown meta action type encountered" ); break; |