de-break published API change

Change-Id: I86c2a3d8897278b47eb6b81327469cfae2f41fd5

3 files changed, 104 insertions, 64 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 68669fc62c1b..61a25c119fcd 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1812,6 +1812,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\
 	XFont \
 	XFont2 \
 	XGraphics \
+	XGraphics2 \
 	XImageButton \
 	XImageConsumer \
 	XImageProducer \
diff --git a/offapi/com/sun/star/awt/XGraphics.idl b/offapi/com/sun/star/awt/XGraphics.idl
index 845d265d9fdb..c3311737c799 100644
--- a/offapi/com/sun/star/awt/XGraphics.idl
+++ b/offapi/com/sun/star/awt/XGraphics.idl
@@ -25,8 +25,7 @@
 #include <com/sun/star/awt/FontDescriptor.idl>
 #include <com/sun/star/awt/RasterOperation.idl>
 #include <com/sun/star/awt/Gradient.idl>
-#include <com/sun/star/awt/Rectangle.idl>
-#include <com/sun/star/graphic/XGraphic.idl>
+
 
 module com {  module sun {  module star {  module awt {
 
@@ -35,48 +34,49 @@ published interface XDisplayBitmap;
 published interface XFont;
 published interface XDevice;
 
+
 /** provides the basic output operation of a device.
  */
 published interface XGraphics: com::sun::star::uno::XInterface
 {
-    /** the device of this graphics
+    /** returns the device of this graphics.
      */
-    [attribute, readonly] XDevice Device;
+    XDevice getDevice();
 
-    /** the text color used by text operations.
+    /** returns the font metric of the current font.
      */
-    [attribute] com::sun::star::util::Color TextColor;
+    SimpleFontMetric getFontMetric();
 
-    /** the fill color used by text operations.
+    /** sets the font used by text operations.
      */
-    [attribute] com::sun::star::util::Color TextFillColor;
+    void setFont( [in] XFont xNewFont );
 
-    /** the line color.
+    /** creates a new font and sets the font.
      */
-    [attribute] com::sun::star::util::Color LineColor;
+    void selectFont( [in] FontDescriptor aDescription );
 
-    /** the fill color.
+    /** sets the text color used by text operations.
      */
-    [attribute] com::sun::star::util::Color FillColor;
-
-    /** the raster operation.
+    void setTextColor( [in] com::sun::star::util::Color nColor );
 
-        <p>If the device does not support raster operations,
-        this attribute is ignored.</p>
+    /** sets the fill color used by text operations.
      */
-    [attribute] RasterOperation RasterOp;
+    void setTextFillColor( [in] com::sun::star::util::Color nColor );
 
-    /** the font used by text operations.
+    /** sets the line color.
      */
-    [attribute] XFont Font;
+    void setLineColor( [in] com::sun::star::util::Color nColor );
 
-    /** the font metric of the current font.
+    /** sets the fill color.
      */
-    [attribute, readonly] SimpleFontMetric FontMetric;
+    void setFillColor( [in] com::sun::star::util::Color nColor );
 
-    /** creates a new font and sets the font.
+    /** sets the raster operation.
+
+        <p>If the device does not support raster operations
+        then this call is ignored.</p>
      */
-    void selectFont( [in] FontDescriptor aDescription );
+    void setRasterOp( [in] RasterOperation ROP );
 
     /** sets the clip region to specified clipping.
      */
@@ -95,12 +95,6 @@ published interface XGraphics: com::sun::star::uno::XInterface
      */
     void pop();
 
-    /** clears the given rectangle on the device
-
-        @since LibreOffice 4.1
-     */
-    void clear( [in] Rectangle aRect );
-
     /** copies a rectangle of pixels from another device into this one.
      */
     void copy( [in] XDevice xSource,
@@ -232,43 +226,9 @@ published interface XGraphics: com::sun::star::uno::XInterface
              [in] long Y,
              [in] string Text,
              [in] sequence<long> Longs );
-
-    /** draws a <type scope="com::sun::star::graphic">XGraphic</type>
-        in the output device.
-
-        <p>Note that some devices may not support this operation.</p>
-
-        @since LibreOffice 4.1
-
-        @param  nX
-            the X coordinate on the device where the graphic will be drawn
-
-        @param  nY
-            the Y coordinate on the device where the graphic will be drawn
-
-        @param  nWidth
-            the width of the region on the device
-
-        @param  nHeight
-            the height of the region on the device
-
-        @param  nStyle
-            the style used to draw the image.
-            See <type scope="com::sun::star::awt">ImageDrawMode</type>.
-
-        @param  aGraphic
-            the <type scope="com::sun::star::graphic">XGraphic</type>
-            to be drawn onto the device
-     */
-    void drawImage( [in] long nX,
-                             [in] long nY,
-                             [in] long nWidth,
-                             [in] long nHeight,
-                             [in] short nStyle,
-                             [in] ::com::sun::star::graphic::XGraphic aGraphic );
-
 };
 
+
 }; }; }; };
 
 #endif
diff --git a/offapi/com/sun/star/awt/XGraphics2.idl b/offapi/com/sun/star/awt/XGraphics2.idl
new file mode 100644
index 000000000000..b4acf557078d
--- /dev/null
+++ b/offapi/com/sun/star/awt/XGraphics2.idl
@@ -0,0 +1,79 @@
+/* -*- 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_awt_XGraphics2_idl__
+#define __com_sun_star_awt_XGraphics2_idl__
+
+#include <com/sun/star/awt/XGraphics.idl>
+#include <com/sun/star/awt/Rectangle.idl>
+#include <com/sun/star/graphic/XGraphic.idl>
+
+module com {  module sun {  module star {  module awt {
+
+/** provides the basic output operation of a device.
+ */
+published interface XGraphics2: com::sun::star::awt::XGraphics
+{
+    /** clears the given rectangle on the device
+
+        @since LibreOffice 4.1
+     */
+    void clear( [in] Rectangle aRect );
+
+
+    /** draws a <type scope="com::sun::star::graphic">XGraphic</type>
+        in the output device.
+
+        <p>Note that some devices may not support this operation.</p>
+
+        @since LibreOffice 4.1
+
+        @param  nX
+            the X coordinate on the device where the graphic will be drawn
+
+        @param  nY
+            the Y coordinate on the device where the graphic will be drawn
+
+        @param  nWidth
+            the width of the region on the device
+
+        @param  nHeight
+            the height of the region on the device
+
+        @param  nStyle
+            the style used to draw the image.
+            See <type scope="com::sun::star::awt">ImageDrawMode</type>.
+
+        @param  aGraphic
+            the <type scope="com::sun::star::graphic">XGraphic</type>
+            to be drawn onto the device
+     */
+    void drawImage( [in] long nX,
+                             [in] long nY,
+                             [in] long nWidth,
+                             [in] long nHeight,
+                             [in] short nStyle,
+                             [in] ::com::sun::star::graphic::XGraphic aGraphic );
+
+};
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */