split idl with multiple class into one idl per.

Change-Id: I81e9968a5cf7f0045dfd5e6733ad395539e54f90

2 files changed, 120 insertions, 137 deletions

diff --git a/offapi/com/sun/star/rendering/Canvas.idl b/offapi/com/sun/star/rendering/Canvas.idl
new file mode 100644
index 000000000000..3e747a5b675c
--- /dev/null
+++ b/offapi/com/sun/star/rendering/Canvas.idl
@@ -0,0 +1,37 @@
+/* -*- 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_Canvas_idl__
+#define __com_sun_star_rendering_Canvas_idl__
+
+#ifndef __com_sun_star_rendering_XCanvas_idl__
+#include <com/sun/star/rendering/XCanvas.idl>
+#endif
+
+
+module com { module sun { module star { module rendering {
+
+/// Service providing an <type>XCanvas</type> interface
+service Canvas: XCanvas;
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/rendering/XCanvas.idl b/offapi/com/sun/star/rendering/XCanvas.idl
index c0ed955afa74..749bbed47e1a 100644
--- a/offapi/com/sun/star/rendering/XCanvas.idl
+++ b/offapi/com/sun/star/rendering/XCanvas.idl
@@ -1,88 +1,53 @@
-/**************************************************************
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
  *
- * 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
+ * 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/.
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * This file incorporates work covered by the following license notice:
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the 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 __com_sun_star_rendering_XCanvas_idl__
 #define __com_sun_star_rendering_XCanvas_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_RealPoint2D_idl__
 #include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealBezierSegment2D_idl__
 #include <com/sun/star/geometry/RealBezierSegment2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
 #include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_geometry_Matrix2D_idl__
 #include <com/sun/star/geometry/Matrix2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_ViewState_idl__
 #include <com/sun/star/rendering/ViewState.idl>
-#endif
-#ifndef __com_sun_star_rendering_RenderState_idl__
 #include <com/sun/star/rendering/RenderState.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontRequest_idl__
 #include <com/sun/star/rendering/FontRequest.idl>
-#endif
-#ifndef __com_sun_star_rendering_FontInfo_idl__
 #include <com/sun/star/rendering/FontInfo.idl>
-#endif
-#ifndef __com_sun_star_rendering_Texture_idl__
 #include <com/sun/star/rendering/Texture.idl>
-#endif
-#ifndef __com_sun_star_rendering_StringContext_idl__
 #include <com/sun/star/rendering/StringContext.idl>
-#endif
-#ifndef __com_sun_star_rendering_StrokeAttributes_idl__
 #include <com/sun/star/rendering/StrokeAttributes.idl>
-#endif
-#ifndef __com_sun_star_rendering_VolatileContentDestroyedException_idl__
 #include <com/sun/star/rendering/VolatileContentDestroyedException.idl>
-#endif
-
-#ifndef __com_sun_star_beans_PropertyValue_idl__
 #include <com/sun/star/beans/PropertyValue.idl>
-#endif
 
 
 module com {  module sun {  module star {  module geometry {
-    published interface XMapping2D;
+    interface XMapping2D;
 }; }; }; };
 
 module com { module sun { module star { module rendering {
 
-published interface XCanvasFont;
-published interface XPolyPolygon2D;
-published interface XCachedPrimitive;
-published interface XBitmap;
-published interface XGraphicDevice;
-published interface XTextLayout;
+interface XCanvasFont;
+interface XPolyPolygon2D;
+interface XCachedPrimitive;
+interface XBitmap;
+interface XGraphicDevice;
+interface XTextLayout;
 
 /** Central interface for rendering.<p>
 
@@ -116,7 +81,7 @@ published interface XTextLayout;
     <type>RenderState</type> containing only the local offset (and no
     extra clipping).<p>
 
-    Furtheron, this stateless nature provides easy ways for
+    Further on, this stateless nature provides easy ways for
     caching. Every non-trivial operation on <type>XCanvas</type> can
     return a cache object, which, when called to redraw, renders the
     primitive usually much more quickly than the original method. Note
@@ -146,7 +111,7 @@ published interface XTextLayout;
 
     @since OOo 2.0
  */
-published interface XCanvas : ::com::sun::star::uno::XInterface
+interface XCanvas : ::com::sun::star::uno::XInterface
 {
     /** Clear the whole canvas area.<p>
 
@@ -162,19 +127,18 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The point to draw.
 
         @param aViewState
-        The viewstate to be used when drawing this point.
+        The view state to be used when drawing this point.
 
         @param aRenderState
-        The renderstate to be used when drawing this point.
+        The render state to be used when drawing this point.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     void                drawPoint( [in] ::com::sun::star::geometry::RealPoint2D aPoint, [in] ViewState aViewState, [in] RenderState aRenderState )
         raises (com::sun::star::lang::IllegalArgumentException);
 
-    //-------------------------------------------------------------------------
 
     /** Draw a line in device resolution width (i.e. one device pixel
         wide).
@@ -186,43 +150,41 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The end point of the line to draw.
 
         @param aViewState
-        The viewstate to be used when drawing this line.
+        The view state to be used when drawing this line.
 
         @param aRenderState
-        The renderstate to be used when drawing this line.
+        The render state to be used when drawing this line.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     void                drawLine( [in] ::com::sun::star::geometry::RealPoint2D aStartPoint, [in] ::com::sun::star::geometry::RealPoint2D aEndPoint, [in] ViewState aViewState, [in] RenderState aRenderState )
         raises (com::sun::star::lang::IllegalArgumentException);
 
-    //-------------------------------------------------------------------------
 
-    /** Draw a cubic bezier curve in device resolution width (i.e. one
+    /** Draw a cubic Bezier curve in device resolution width (i.e. one
         device pixel wide).
 
         @param aBezierSegment
-        The start and the two control points of the bezier curve.
+        The start and the two control points of the Bezier curve.
 
         @param aEndPoint
-        The end point of the bezier curve.
+        The end point of the Bezier curve.
 
         @param aViewState
-        The viewstate to be used when drawing this curve.
+        The view state to be used when drawing this curve.
 
         @param aRenderState
-        The renderstate to be used when drawing this curve.
+        The render state to be used when drawing this curve.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     void                drawBezier( [in] ::com::sun::star::geometry::RealBezierSegment2D aBezierSegment, [in] ::com::sun::star::geometry::RealPoint2D aEndPoint, [in] ViewState aViewState, [in] RenderState aRenderState )
         raises (com::sun::star::lang::IllegalArgumentException);
 
-    //-------------------------------------------------------------------------
 
     /** Draw a poly-polygon in device resolution line width (i.e. the
         lines are one device pixel wide).
@@ -231,21 +193,20 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to draw.
 
         @param aViewState
-        The viewstate to be used when drawing this polygon.
+        The view state to be used when drawing this polygon.
 
         @param aRenderState
-        The renderstate to be used when drawing this polygon.
+        The render state to be used when drawing this polygon.
 
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     XCachedPrimitive    drawPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState )
         raises (com::sun::star::lang::IllegalArgumentException);
 
-    //-------------------------------------------------------------------------
 
     /** Stroke each polygon of the provided poly-polygon with the
         specified stroke attributes.<p>
@@ -261,10 +222,10 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to render.
 
         @param aViewState
-        The viewstate to be used when stroking this polygon.
+        The view state to be used when stroking this polygon.
 
         @param aRenderState
-        The renderstate to be used when stroking this polygon.
+        The render state to be used when stroking this polygon.
 
         @param aStrokeAttributes
         Further attributes used to parameterize the stroking.
@@ -272,13 +233,12 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     XCachedPrimitive    strokePolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] StrokeAttributes aStrokeAttributes )
         raises (com::sun::star::lang::IllegalArgumentException);
 
-    //-------------------------------------------------------------------------
 
     /** Stroke each polygon of the provided poly-polygon with the
         specified stroke attributes, fill the stroked outline
@@ -295,10 +255,10 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to render.
 
         @param aViewState
-        The viewstate to be used when strokes this polygon.
+        The view state to be used when strokes this polygon.
 
         @param aRenderState
-        The renderstate to be used when stroking this polygon.
+        The render state to be used when stroking this polygon.
 
         @param aTextures
         A sequence of texture definitions, with which to fill the
@@ -310,7 +270,7 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
@@ -321,7 +281,6 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         raises (com::sun::star::lang::IllegalArgumentException,
                 VolatileContentDestroyedException);
 
-    //-------------------------------------------------------------------------
 
     /** Stroke each polygon of the provided poly-polygon with the
         specified stroke attributes, fill the stroked outline
@@ -339,10 +298,10 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to render.
 
         @param aViewState
-        The viewstate to be used when stroking this polygon.
+        The view state to be used when stroking this polygon.
 
         @param aRenderState
-        The renderstate to be used when stroking this polygon.
+        The render state to be used when stroking this polygon.
 
         @param aTextures
         A sequence of texture definitions, with which to fill the
@@ -358,7 +317,7 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
@@ -369,7 +328,6 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         raises (com::sun::star::lang::IllegalArgumentException,
                 VolatileContentDestroyedException);
 
-    //-------------------------------------------------------------------------
 
     //  [TODO: Method misplaced at this interface?]
 
@@ -383,10 +341,10 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to render.
 
         @param aViewState
-        The viewstate to be used when generating the outline.
+        The view state to be used when generating the outline.
 
         @param aRenderState
-        The renderstate to be used when generating the outline.
+        The render state to be used when generating the outline.
 
         @param aStrokeAttributes
         Further attributes used to parameterize the stroking.
@@ -395,13 +353,12 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         area.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
-    XPolyPolygon2D          queryStrokeShapes( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] StrokeAttributes aStrokeAttributes )
+    XPolyPolygon2D      queryStrokeShapes( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState, [in] StrokeAttributes aStrokeAttributes )
         raises (com::sun::star::lang::IllegalArgumentException);
 
-    //-------------------------------------------------------------------------
 
     /** Fill the given poly-polygon.<p>
 
@@ -413,21 +370,20 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to render.
 
         @param aViewState
-        The viewstate to be used when filling this polygon.
+        The view state to be used when filling this polygon.
 
         @param aRenderState
-        The renderstate to be used when filling this polygon.
+        The render state to be used when filling this polygon.
 
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
     XCachedPrimitive    fillPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState )
         raises (com::sun::star::lang::IllegalArgumentException);
 
-    //-------------------------------------------------------------------------
 
     /** Fill the given poly-polygon with a texture.<p>
 
@@ -439,10 +395,10 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to render.
 
         @param aViewState
-        The viewstate to be used when filling this polygon.
+        The view state to be used when filling this polygon.
 
         @param aRenderState
-        The renderstate to be used when filling this polygon.
+        The render state to be used when filling this polygon.
 
         @param aTextures
         A sequence of texture definitions, with which to fill the
@@ -451,7 +407,7 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
@@ -462,7 +418,6 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         raises (com::sun::star::lang::IllegalArgumentException,
                 VolatileContentDestroyedException);
 
-    //-------------------------------------------------------------------------
 
     /** Fill the given poly-polygon with a mapped texture.<p>
 
@@ -475,10 +430,10 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The poly-polygon to render.
 
         @param aViewState
-        The viewstate to be used when filling this polygon.
+        The view state to be used when filling this polygon.
 
         @param aRenderState
-        The renderstate to be used when filling this polygon.
+        The render state to be used when filling this polygon.
 
         @param aTextures
         A sequence of texture definitions, with which to fill the
@@ -491,7 +446,7 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
@@ -502,7 +457,6 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         raises (com::sun::star::lang::IllegalArgumentException,
                 VolatileContentDestroyedException);
 
-    //-------------------------------------------------------------------------
 
     /** Create a suitable font for the specified font description.
 
@@ -545,10 +499,9 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
         if one of the parameters is not within the allowed range.
      */
-    XCanvasFont             createFont( [in] FontRequest aFontRequest, [in] sequence< ::com::sun::star::beans::PropertyValue > aExtraFontProperties, [in] ::com::sun::star::geometry::Matrix2D aFontMatrix )
+    XCanvasFont         createFont( [in] FontRequest aFontRequest, [in] sequence< ::com::sun::star::beans::PropertyValue > aExtraFontProperties, [in] ::com::sun::star::geometry::Matrix2D aFontMatrix )
         raises (com::sun::star::lang::IllegalArgumentException);
 
-    //-------------------------------------------------------------------------
 
     /** Query font information, specific to this canvas.<p>
 
@@ -569,10 +522,9 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         or if one of the <type>FontInfo</type> members is not within
         the permitted range.
      */
-    sequence< FontInfo >    queryAvailableFonts( [in] FontInfo aFilter, [in] sequence< ::com::sun::star::beans::PropertyValue > aFontProperties )
+    sequence< FontInfo > queryAvailableFonts( [in] FontInfo aFilter, [in] sequence< ::com::sun::star::beans::PropertyValue > aFontProperties )
         raises (com::sun::star::lang::IllegalArgumentException);
 
-    //-------------------------------------------------------------------------
 
     /** Draw the text given by the substring of the specified string
         with the given font.<p>
@@ -590,10 +542,10 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         the text.
 
         @param aViewState
-        The viewstate to be used when drawing this text.
+        The view state to be used when drawing this text.
 
         @param aRenderState
-        The renderstate to be used when drawing this text.
+        The render state to be used when drawing this text.
 
         @param nTextDirection
         A value from the <type>TextDirection</type> collection,
@@ -605,13 +557,12 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
-    XCachedPrimitive        drawText( [in] StringContext aText, [in] XCanvasFont xFont, [in] ViewState aViewState, [in] RenderState aRenderState, [in] byte nTextDirection )
+    XCachedPrimitive    drawText( [in] StringContext aText, [in] XCanvasFont xFont, [in] ViewState aViewState, [in] RenderState aRenderState, [in] byte nTextDirection )
         raises (com::sun::star::lang::IllegalArgumentException);
 
-    //-------------------------------------------------------------------------
 
     /** Draw the formatted text given by the text layout.<p>
 
@@ -620,7 +571,7 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         layout object's baseline. If the layout contains more than one
         baseline, the baseline of the first strong character in
         logical order is used here (strong in this context means that
-        the character can be unambiguously assigned to a unicode
+        the character can be unambiguously assigned to a Unicode
         script).<p>
 
         @param xLayoutetText
@@ -629,21 +580,20 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         layout already carries intrinsic font information.
 
         @param aViewState
-        The viewstate to be used when drawing this text.
+        The view state to be used when drawing this text.
 
         @param aRenderState
-        The renderstate to be used when drawing this text.
+        The render state to be used when drawing this text.
 
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
      */
-    XCachedPrimitive        drawTextLayout( [in] XTextLayout xLayoutetText, [in] ViewState aViewState, [in] RenderState aRenderState )
+    XCachedPrimitive    drawTextLayout( [in] XTextLayout xLayoutetText, [in] ViewState aViewState, [in] RenderState aRenderState )
         raises (com::sun::star::lang::IllegalArgumentException);
 
-    //-------------------------------------------------------------------------
 
     /** Render the given bitmap.<p>
 
@@ -658,22 +608,22 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The bitmap to render.
 
         @param aViewState
-        The viewstate to be used when drawing this text.
+        The view state to be used when drawing this text.
 
         @param aRenderState
-        The renderstate to be used when drawing this text.
+        The render state to be used when drawing this text.
 
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
         if a texture bitmap was volatile, and the content was
         destroyed before the rendering could take place.
      */
-    XCachedPrimitive        drawBitmap( [in] XBitmap xBitmap, [in] ViewState aViewState, [in] RenderState aRenderState )
+    XCachedPrimitive    drawBitmap( [in] XBitmap xBitmap, [in] ViewState aViewState, [in] RenderState aRenderState )
         raises (com::sun::star::lang::IllegalArgumentException,
                 VolatileContentDestroyedException);
 
@@ -691,11 +641,11 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         The bitmap to render.
 
         @param aViewState
-        The viewstate to be used when drawing this text.
+        The view state to be used when drawing this text.
 
         @param aRenderState
-        The renderstate to be used when drawing this text. The device
-        color entry in the renderstate is multiplied with every pixel
+        The render state to be used when drawing this text. The device
+        color entry in the render state is multiplied with every pixel
         color value, and only the result is rendered into the
         canvas. If, for example, the bitmap should be rendered with
         increased global transparency, set all device color channels
@@ -705,18 +655,17 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
         @return a handle to the cached rendering output.
 
         @throws <type>com::sun::star::lang::IllegalArgumentException</type>
-        if one of the view and renderstate parameters are outside the
+        if one of the view and render state parameters are outside the
         specified range.
 
         @throws <type>VolatileContentDestroyedException</type>
         if a texture bitmap was volatile, and the content was
         destroyed before the rendering could take place.
      */
-    XCachedPrimitive        drawBitmapModulated( [in] XBitmap xBitmap, [in] ViewState aViewState, [in] RenderState aRenderState )
+    XCachedPrimitive    drawBitmapModulated( [in] XBitmap xBitmap, [in] ViewState aViewState, [in] RenderState aRenderState )
         raises (com::sun::star::lang::IllegalArgumentException,
                 VolatileContentDestroyedException);
 
-    //-------------------------------------------------------------------------
 
     /** Request the associated graphic device for this canvas.<p>
 
@@ -730,11 +679,8 @@ published interface XCanvas : ::com::sun::star::uno::XInterface
     XGraphicDevice          getDevice();
 };
 
-//=============================================================================
-
-/// Service providing an <type>XCanvas</type> interface
-service Canvas: XCanvas;
-
 }; }; }; };
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */