From f423830f657d1e0dd6ab3a27dbadd16e4c61a45d Mon Sep 17 00:00:00 2001 From: ka Date: Fri, 4 Feb 2011 14:49:25 +0100 Subject: ka102: SVG import implementation --- offapi/com/sun/star/graphic/XGraphic.idl | 2 ++ offapi/com/sun/star/graphic/makefile.mk | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/offapi/com/sun/star/graphic/XGraphic.idl b/offapi/com/sun/star/graphic/XGraphic.idl index 498bef88d..b4e86d7fb 100755 --- a/offapi/com/sun/star/graphic/XGraphic.idl +++ b/offapi/com/sun/star/graphic/XGraphic.idl @@ -63,3 +63,5 @@ published interface XGraphic : ::com::sun::star::uno::XInterface } ; } ; } ; } ; #endif + + diff --git a/offapi/com/sun/star/graphic/makefile.mk b/offapi/com/sun/star/graphic/makefile.mk index 4ee0031ab..6e4a0187c 100755 --- a/offapi/com/sun/star/graphic/makefile.mk +++ b/offapi/com/sun/star/graphic/makefile.mk @@ -42,7 +42,9 @@ IDLFILES= \ Graphic.idl \ GraphicColorMode.idl \ GraphicDescriptor.idl \ + GraphicObject.idl \ GraphicProvider.idl \ + GraphicRasterizer.idl \ GraphicRendererVCL.idl \ GraphicType.idl \ MediaProperties.idl \ @@ -51,9 +53,9 @@ IDLFILES= \ XPrimitiveFactory2D.idl \ XGraphic.idl \ XGraphicProvider.idl \ + XGraphicRasterizer.idl \ XGraphicRenderer.idl \ XGraphicObject.idl \ - GraphicObject.idl \ XGraphicTransformer.idl # --- Targets ------------------------------------------------------ -- cgit v1.2.3 From bb69eba79ed622f2b2c39bd82d8ec9ae6799f5ad Mon Sep 17 00:00:00 2001 From: ka Date: Fri, 4 Feb 2011 14:52:54 +0100 Subject: ka102: added/removed files for SVG import and module cleanup --- offapi/com/sun/star/graphic/GraphicRasterizer.idl | 52 +++++++ offapi/com/sun/star/graphic/XGraphicRasterizer.idl | 150 +++++++++++++++++++++ 2 files changed, 202 insertions(+) create mode 100644 offapi/com/sun/star/graphic/GraphicRasterizer.idl create mode 100644 offapi/com/sun/star/graphic/XGraphicRasterizer.idl diff --git a/offapi/com/sun/star/graphic/GraphicRasterizer.idl b/offapi/com/sun/star/graphic/GraphicRasterizer.idl new file mode 100644 index 000000000..ee1214f39 --- /dev/null +++ b/offapi/com/sun/star/graphic/GraphicRasterizer.idl @@ -0,0 +1,52 @@ +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef com_sun_star_graphic_GraphicRasterizer_idl +#define com_sun_star_graphic_GraphicRasterizer_idl + +#include + +module com { module sun { module star { module graphic +{ + +/** Service that describes the necessary interfaces and properties + to convert arbitrary graphic data to a XGraphic + interface containing a pixel graphic, that can be rendered the usual + ways. + */ + +service GraphicRasterizer +{ + /** Interface to initiate the rasterizing process + */ + interface ::com::sun::star::graphic::XGraphicRasterizer; + +}; + +} ; } ; } ; } ; + +#endif diff --git a/offapi/com/sun/star/graphic/XGraphicRasterizer.idl b/offapi/com/sun/star/graphic/XGraphicRasterizer.idl new file mode 100644 index 000000000..097c4fdfa --- /dev/null +++ b/offapi/com/sun/star/graphic/XGraphicRasterizer.idl @@ -0,0 +1,150 @@ +/*/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef com_sun_star_graphic_XGraphicRasterizer_idl +#define com_sun_star_graphic_XGraphicRasterizer_idl + +#include +#include +#include +#include +#include + +module com { module sun { module star { module graphic +{ + +/** This interfaces exposes the initialize and a rasterize method to + rasterize a given data stream to a pixel graphic + */ +interface XGraphicRasterizer : ::com::sun::star::uno::XInterface +{ + /** Initializing the rasterizer + +

This method could also be used to determine, if + the provided data is able to be rasterized by the + implementation. The implementation should take care of + this feature as well as setting the default image size in + pixel within the given output parameter.

+ + @param DataStream + The input stream of data that should be rasterized + + @param DPI_X + The horizontal resolution of the callers device in pixel per inch. This + value is needed to calculate the correct dimensions of the graphic to be + rasterized. If a value of 0 is given, a horizontal default + resolution of 72 DPI is used. + + @param DPI_Y + The vertical resolution of the callers device in pixel per inch. This + value is needed to calculate the correct dimensions of the graphic to be + rasterized. If a value of 0 is given, a vertical default + resolution of 72 DPI is used. + + @param DefaultSizePixel + The default rendering size in pixel of the underlying graphics + data may be available after the call via this output parameter. + + In case no default size can be determined during initialization, + a default pixel size of 0,0 is returned. In this case, the caller + needs to assume a default pixel size, appropriate for the calling + context. + + @returns + A boolean value indicating if rasterizing of the given data is + possible at all and if the initialization process happened + successfully. + + @see com::sun::star::io::XInputStream + @see com::sun::star::awt::Size + */ + boolean initializeData( [in] com::sun::star::io::XInputStream DataStream, + [in] unsigned long DPI_X, + [in] unsigned long DPI_Y, + [out] com::sun::star::awt::Size DefaultSizePixel ); + + /** Rasterizing the initialized data into a XGraphic container. + +

The XGraphic container will contain a pixel + type graphic after a successful rasterization process

+ +

In case of any fault during the rasterization process, + the XGraphic container will be empty afterwards and + the method will return false

+ + @param Width + The width in pixel of the graphic to be rasterized. + This parameter is used without taking other transformation + values into account. + + @param Height + The height in pixel of the graphic to be rasterized. + This parameter is used without taking other transformation + values into account. + + @param RotateAngle + The rotation angle of the graphic to be rasterized. + This parameter is used without taking other transformation + values into account. The rotation is applied after scaling + and shearing the original image. + + @param ShearXAngle + The horizontal shear angle of the graphic to be rasterized. + This parameter is used without taking other transformation + values into account. The shearing is applied after scaling + and before rotation of the image. + + @param ShearYAngle + The vertical shear angle of the graphic to be rasterized. + This parameter is used without taking other transformation + values into account. The shearing is applied after scaling + and before rotation of the image. + + @param RasterizeProperties + Additional properties for special needs (undefined by now) + + @param Graphic + An interface to a graphic container into which the given data + should be rasterized. + + @returns com::sun::star::graphic::XGraphic + An interface to a graphic container that holds the rasterized pixel data + + @see com::sun::star::beans::PropertyValues + @see com::sun::star::graphic::XGraphic + */ + com::sun::star::graphic::XGraphic rasterize( [in] unsigned long Width, + [in] unsigned long Height, + [in] double RotateAngle, + [in] double ShearAngle_X, + [in] double ShearAngle_Y, + [in] com::sun::star::beans::PropertyValues RasterizeProperties ); +}; + +} ; } ; } ; } ; + +#endif -- cgit v1.2.3