diff options
Diffstat (limited to 'vcl/inc/impgraph.hxx')
| -rw-r--r-- | vcl/inc/impgraph.hxx | 59 |
1 files changed, 27 insertions, 32 deletions
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index 359b999e03f2..0b09c1261452 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -1,30 +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 . + */ #ifndef _SV_IMPGRAPH_HXX #define _SV_IMPGRAPH_HXX @@ -33,8 +24,8 @@ #include <vcl/bitmapex.hxx> #include <vcl/animate.hxx> #include <vcl/gdimtf.hxx> -#include <vcl/rendergraphic.hxx> #include <vcl/graph.h> +#include <vcl/svgdata.hxx> // --------------- // - ImpSwapInfo - @@ -70,11 +61,14 @@ private: GfxLink* mpGfxLink; GraphicType meType; String maDocFileURLStr; - sal_uLong mnDocFilePos; - mutable sal_uLong mnSizeBytes; - sal_uLong mnRefCount; - sal_Bool mbSwapOut; - sal_Bool mbSwapUnderway; + sal_uLong mnDocFilePos; + mutable sal_uLong mnSizeBytes; + sal_uLong mnRefCount; + sal_Bool mbSwapOut; + sal_Bool mbSwapUnderway; + + // SvgData support + SvgDataPtr maSvgData; private: @@ -82,6 +76,7 @@ private: ImpGraphic( const ImpGraphic& rImpGraphic ); ImpGraphic( const Bitmap& rBmp ); ImpGraphic( const BitmapEx& rBmpEx ); + ImpGraphic(const SvgDataPtr& rSvgDataPtr); ImpGraphic( const Animation& rAnimation ); ImpGraphic( const GDIMetaFile& rMtf ); virtual ~ImpGraphic(); @@ -101,14 +96,11 @@ private: sal_Bool ImplIsAlpha() const; sal_Bool ImplIsAnimated() const; sal_Bool ImplIsEPS() const; - sal_Bool ImplIsRenderGraphic() const; - sal_Bool ImplHasRenderGraphic() const; Bitmap ImplGetBitmap(const GraphicConversionParameters& rParameters) const; BitmapEx ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const; Animation ImplGetAnimation() const; const GDIMetaFile& ImplGetGDIMetaFile() const; - ::vcl::RenderGraphic ImplGetRenderGraphic() const; Size ImplGetPrefSize() const; @@ -170,6 +162,9 @@ private: friend SvStream& operator<<( SvStream& rOStm, const ImpGraphic& rImpGraphic ); friend SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ); + + // SvgData support + const SvgDataPtr& getSvgData() const; }; #endif // _SV_IMPGRAPH_HXX |