diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-07 10:25:47 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-07 14:00:51 -0600 |
commit | 18fb67927e6d8bef59ca9e27953417efce69a2c0 (patch) | |
tree | c2744332b1eb68022c3857629ffd588e00ce0286 /offapi | |
parent | rebase XColorSpace and XBitmapCanvas (diff) | |
download | core-18fb67927e6d8bef59ca9e27953417efce69a2c0.tar.gz core-18fb67927e6d8bef59ca9e27953417efce69a2c0.zip |
split idl with multiple class into one idl per.
Change-Id: Ib80e0dde0da395c7b89dea91c40c4c7ec319b466
Diffstat (limited to 'offapi')
-rw-r--r-- | offapi/com/sun/star/rendering/ARGBColor.idl | 49 | ||||
-rw-r--r-- | offapi/com/sun/star/rendering/BitmapCanvas.idl | 52 | ||||
-rw-r--r-- | offapi/com/sun/star/rendering/Color.idl | 36 | ||||
-rw-r--r-- | offapi/com/sun/star/rendering/ColorComponent.idl | 32 | ||||
-rw-r--r-- | offapi/com/sun/star/rendering/RGBColor.idl | 44 | ||||
-rw-r--r-- | offapi/com/sun/star/rendering/XBitmapCanvas.idl | 38 | ||||
-rw-r--r-- | offapi/com/sun/star/rendering/XColorSpace.idl | 60 |
7 files changed, 226 insertions, 85 deletions
diff --git a/offapi/com/sun/star/rendering/ARGBColor.idl b/offapi/com/sun/star/rendering/ARGBColor.idl new file mode 100644 index 000000000000..815eb775fd5d --- /dev/null +++ b/offapi/com/sun/star/rendering/ARGBColor.idl @@ -0,0 +1,49 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * 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/. + * + * This file incorporates work covered by the following license notice: + * + * 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 __com_sun_star_rendering_ARGBColor_idl__ +#define __com_sun_star_rendering_ARGBColor_idl__ + +#ifndef __com_sun_star_rendering_ColorComponent_idl__ +#include <com/sun/star/rendering/ColorComponent.idl> +#endif + +module com { module sun { module star { module rendering { + +/// ARGB color quad +struct ARGBColor +{ + /** Alpha component.<p> + + Valid range is [0,1.0], with 0.0 denoting fully transparent, + and 1.0 fully opaque. + */ + ColorComponent Alpha; + /// Red component. Valid range is [0,1.0] + ColorComponent Red; + /// Green component. Valid range is [0,1.0] + ColorComponent Green; + /// Blue component. Valid range is [0,1.0] + ColorComponent Blue; +}; + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/rendering/BitmapCanvas.idl b/offapi/com/sun/star/rendering/BitmapCanvas.idl new file mode 100644 index 000000000000..c6a22e63e4f1 --- /dev/null +++ b/offapi/com/sun/star/rendering/BitmapCanvas.idl @@ -0,0 +1,52 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * 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/. + * + * This file incorporates work covered by the following license notice: + * + * 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 __com_sun_star_rendering_BitmapCanvas_idl__ +#define __com_sun_star_rendering_BitmapCanvas_idl__ + +#ifndef __com_sun_star_rendering_XBitmap_idl__ +#include <com/sun/star/rendering/XBitmap.idl> +#endif +#ifndef __com_sun_star_rendering_XBitmapCanvas_idl__ +#include <com/sun/star/rendering/XBitmapCanvas.idl> +#endif + + +module com { module sun { module star { module rendering { + +// TODO: Multiple-inheritance interfaces + +/** This service provides the interfaces for a <type>XBitmapCanvas</type> + */ +service BitmapCanvas +{ + /** Canvas interface, to issue rendering operations. + */ + interface XBitmapCanvas; + + /** Bitmap interface, to directly manipulate the pixel. + */ + interface XBitmap; +}; + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/rendering/Color.idl b/offapi/com/sun/star/rendering/Color.idl new file mode 100644 index 000000000000..e9860cd82a8f --- /dev/null +++ b/offapi/com/sun/star/rendering/Color.idl @@ -0,0 +1,36 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * 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/. + * + * This file incorporates work covered by the following license notice: + * + * 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 __com_sun_star_rendering_Color_idl__ +#define __com_sun_star_rendering_Color_idl__ + +#ifndef __com_sun_star_rendering_ColorComponent_idl__ +#include <com/sun/star/rendering/ColorComponent.idl> +#endif + +module com { module sun { module star { module rendering { + +/// Shorthand for the device-dependent color components, and easier to read +typedef sequence<ColorComponent> Color; + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/rendering/ColorComponent.idl b/offapi/com/sun/star/rendering/ColorComponent.idl new file mode 100644 index 000000000000..71a94a702323 --- /dev/null +++ b/offapi/com/sun/star/rendering/ColorComponent.idl @@ -0,0 +1,32 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * 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/. + * + * This file incorporates work covered by the following license notice: + * + * 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 __com_sun_star_rendering_ColorComponent_idl__ +#define __com_sun_star_rendering_ColorComponent_idl__ + +module com { module sun { module star { module rendering { + +/// Shorthand for the device-dependent color components, and easier to read +typedef double ColorComponent; + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/rendering/RGBColor.idl b/offapi/com/sun/star/rendering/RGBColor.idl new file mode 100644 index 000000000000..229c5011a7f4 --- /dev/null +++ b/offapi/com/sun/star/rendering/RGBColor.idl @@ -0,0 +1,44 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * 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/. + * + * This file incorporates work covered by the following license notice: + * + * 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 __com_sun_star_rendering_RGBColor_idl__ +#define __com_sun_star_rendering_RGBColor_idl__ + +#ifndef __com_sun_star_rendering_ColorComponent_idl__ +#include <com/sun/star/rendering/ColorComponent.idl> +#endif + +module com { module sun { module star { module rendering { + +/// RGB color triplet +struct RGBColor +{ + /// Red component. Valid range is [0,1.0] + ColorComponent Red; + /// Green component. Valid range is [0,1.0] + ColorComponent Green; + /// Blue component. Valid range is [0,1.0] + ColorComponent Blue; +}; + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/rendering/XBitmapCanvas.idl b/offapi/com/sun/star/rendering/XBitmapCanvas.idl index a5ec12e799aa..1ead7c07e3c8 100644 --- a/offapi/com/sun/star/rendering/XBitmapCanvas.idl +++ b/offapi/com/sun/star/rendering/XBitmapCanvas.idl @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. * @@ -15,31 +16,15 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef __com_sun_star_rendering_XBitmapCanvas_idl__ #define __com_sun_star_rendering_XBitmapCanvas_idl__ -#ifndef __com_sun_star_uno_XInterface_idl__ #include <com/sun/star/uno/XInterface.idl> -#endif -#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ #include <com/sun/star/lang/IllegalArgumentException.idl> -#endif -#ifndef __com_sun_star_geometry_RealRectangle2D_idl__ #include <com/sun/star/geometry/RealRectangle2D.idl> -#endif -#ifndef __com_sun_star_rendering_RenderState_idl__ #include <com/sun/star/rendering/RenderState.idl> -#endif -#ifndef __com_sun_star_rendering_XBitmap_idl__ -#include <com/sun/star/rendering/XBitmap.idl> -#endif -#ifndef __com_sun_star_rendering_XCanvas_idl__ #include <com/sun/star/rendering/XCanvas.idl> -#endif -#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__ #include <com/sun/star/rendering/VolatileContentDestroyedException.idl> -#endif module com { module sun { module star { module rendering { @@ -53,7 +38,7 @@ module com { module sun { module star { module rendering { @since OOo 2.0 */ -published interface XBitmapCanvas : XCanvas +interface XBitmapCanvas : XCanvas { /** This method copies a rectangular area from a place of one canvas to a place on another.<p> @@ -121,23 +106,8 @@ published interface XBitmapCanvas : XCanvas }; -//============================================================================= - -// TODO: Multiple-inheritance interfaces - -/** This service provides the interfaces for a <type>XBitmapCanvas</type> - */ -service BitmapCanvas -{ - /** Canvas interface, to issue rendering operations. - */ - interface XBitmapCanvas; - - /** Bitmap interface, to directly manipulate the pixel. - */ - interface XBitmap; -}; - }; }; }; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/rendering/XColorSpace.idl b/offapi/com/sun/star/rendering/XColorSpace.idl index dbd731979039..32152e1aa957 100644 --- a/offapi/com/sun/star/rendering/XColorSpace.idl +++ b/offapi/com/sun/star/rendering/XColorSpace.idl @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. * @@ -15,69 +16,25 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef __com_sun_star_rendering_XColorSpace_idl__ #define __com_sun_star_rendering_XColorSpace_idl__ -#ifndef __com_sun_star_uno_XInterface_idl__ #include <com/sun/star/uno/XInterface.idl> -#endif -#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ #include <com/sun/star/lang/IllegalArgumentException.idl> -#endif -#ifndef __com_sun_star_beans_PropertyValue_idl__ #include <com/sun/star/beans/PropertyValue.idl> -#endif -#ifndef __com_sun_star_rendering_ColorProfile_idl__ #include <com/sun/star/rendering/ColorProfile.idl> -#endif +#include <com/sun/star/rendering/ColorComponent.idl> +#include <com/sun/star/rendering/RGBColor.idl> +#include <com/sun/star/rendering/ARGBColor.idl> module com { module sun { module star { module rendering { -/// Shorthand for the device-dependent color components, and easier to read -published typedef double ColorComponent; -published typedef sequence<ColorComponent> Color; - -//============================================================================= - -/// RGB color triplet -published struct RGBColor -{ - /// Red component. Valid range is [0,1.0] - ColorComponent Red; - /// Green component. Valid range is [0,1.0] - ColorComponent Green; - /// Blue component. Valid range is [0,1.0] - ColorComponent Blue; -}; - -//============================================================================= - -/// ARGB color quad -published struct ARGBColor -{ - /** Alpha component.<p> - - Valid range is [0,1.0], with 0.0 denoting fully transparent, - and 1.0 fully opaque. - */ - ColorComponent Alpha; - /// Red component. Valid range is [0,1.0] - ColorComponent Red; - /// Green component. Valid range is [0,1.0] - ColorComponent Green; - /// Blue component. Valid range is [0,1.0] - ColorComponent Blue; -}; - -//============================================================================= - /** Information how to interpret certain color data.<p> This interface encapsulates all information that is necessary to interpret color data, by defining a describing color space, like for example CMYK or sRGB. You can either convert between this and - an arbitrary other colorspace, or into the standard RGB or ARGB + an arbitrary other color space, or into the standard RGB or ARGB formats (because those are so overwhelmingly common in computer graphics).<p> @@ -87,7 +44,7 @@ published struct ARGBColor e.g. <type>XIntegerBitmapColorSpace</type>, which use sequences of integers for color representation.<p> */ -published interface XColorSpace +interface XColorSpace { /** Query type of this color space.<p> @@ -133,7 +90,6 @@ published interface XColorSpace sequence< ::com::sun::star::beans::PropertyValue > getProperties(); - //============================================================================= /** Convert to color of another color space.<p> @@ -224,7 +180,7 @@ published interface XColorSpace /** Convert sRGB color to a representation in this color space.<p> If this color space conveys alpha information, it is assumed - be fully opaque for the given rgb color value. + be fully opaque for the given RGB color value. @param deviceColor Sequence of sRGB color components. Is permitted to contain more than one color element, therefore, @@ -282,3 +238,5 @@ published interface XColorSpace }; }; }; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |