INTEGRATION: CWS presfixes01 (1.3.10); FILE MERGED

2005/02/16 11:13:51 fs 1.3.10.1: #i42558# drafts.com.sun.star.drawing/rendering/geometry moved to com.sun.star.*

2 files changed, 19 insertions, 19 deletions

diff --git a/canvas/source/java/CanvasFont.java b/canvas/source/java/CanvasFont.java
index dd65c7e132c3..cede00b7f3be 100644
--- a/canvas/source/java/CanvasFont.java
+++ b/canvas/source/java/CanvasFont.java
@@ -65,8 +65,8 @@ import com.sun.star.lib.uno.helper.WeakBase;
 import com.sun.star.awt.*;
 
 // Canvas
-import drafts.com.sun.star.rendering.*;
-import drafts.com.sun.star.geometry.*;
+import com.sun.star.rendering.*;
+import com.sun.star.geometry.*;
 
 // system-dependent stuff
 import sun.awt.*;
@@ -75,15 +75,15 @@ import sun.awt.*;
 public class CanvasFont
     extends com.sun.star.lib.uno.helper.ComponentBase
     implements com.sun.star.lang.XServiceInfo,
-               drafts.com.sun.star.rendering.XCanvasFont
+               com.sun.star.rendering.XCanvasFont
 {
     private CanvasBase                                  associatedCanvas;
-    private drafts.com.sun.star.rendering.FontRequest   fontRequest;
+    private com.sun.star.rendering.FontRequest  fontRequest;
     private java.awt.Font                               font;
 
     //----------------------------------------------------------------------------------
 
-    public CanvasFont( drafts.com.sun.star.rendering.FontRequest    _fontRequest,
+    public CanvasFont( com.sun.star.rendering.FontRequest   _fontRequest,
                        CanvasBase                                   _canvas )
     {
         associatedCanvas = _canvas;
@@ -141,7 +141,7 @@ public class CanvasFont
     //
 
     private static final String s_implName = "CanvasFont.java.impl";
-    private static final String s_serviceName = "drafts.com.sun.star.rendering.XCanvasFont";
+    private static final String s_serviceName = "com.sun.star.rendering.XCanvasFont";
 
     public String getImplementationName()
     {
diff --git a/canvas/source/java/CanvasGraphicDevice.java b/canvas/source/java/CanvasGraphicDevice.java
index 16ad7fc3ed3a..a6c9ebc3557f 100644
--- a/canvas/source/java/CanvasGraphicDevice.java
+++ b/canvas/source/java/CanvasGraphicDevice.java
@@ -66,8 +66,8 @@ import com.sun.star.lib.uno.helper.WeakBase;
 import com.sun.star.awt.*;
 
 // Canvas
-import drafts.com.sun.star.rendering.*;
-import drafts.com.sun.star.geometry.*;
+import com.sun.star.rendering.*;
+import com.sun.star.geometry.*;
 
 // Java AWT
 import java.awt.*;
@@ -84,7 +84,7 @@ public class CanvasGraphicDevice
     extends com.sun.star.lib.uno.helper.ComponentBase
     implements com.sun.star.lang.XServiceInfo,
                com.sun.star.beans.XPropertySet,
-               drafts.com.sun.star.rendering.XGraphicDevice
+               com.sun.star.rendering.XGraphicDevice
 {
     private java.awt.Graphics2D             graphics;
     private java.awt.GraphicsConfiguration  graphicsConfig;
@@ -116,19 +116,19 @@ public class CanvasGraphicDevice
         return null;
     }
 
-    public synchronized drafts.com.sun.star.geometry.RealSize2D getPhysicalResolution()
+    public synchronized com.sun.star.geometry.RealSize2D getPhysicalResolution()
     {
         CanvasUtils.printLog( "CanvasGraphicDevice.getPhysicalResolution!" );
         // TODO: getDefaultTransform + getNormalizingTransform
-        return new drafts.com.sun.star.geometry.RealSize2D(100,100);
+        return new com.sun.star.geometry.RealSize2D(100,100);
     }
 
-    public synchronized drafts.com.sun.star.geometry.RealSize2D getSize()
+    public synchronized com.sun.star.geometry.RealSize2D getSize()
     {
         CanvasUtils.printLog( "CanvasGraphicDevice.getSize!" );
         java.awt.Rectangle bounds = graphicsConfig.getBounds();
 
-        return new drafts.com.sun.star.geometry.RealSize2D(bounds.width, bounds.height);
+        return new com.sun.star.geometry.RealSize2D(bounds.width, bounds.height);
     }
 
     public synchronized XLinePolyPolygon2D createCompatibleLinePolyPolygon( RealPoint2D[][] points )
@@ -143,7 +143,7 @@ public class CanvasGraphicDevice
         return new BezierPolyPolygon( points );
     }
 
-    public synchronized drafts.com.sun.star.rendering.XBitmap createCompatibleBitmap( IntegerSize2D size )
+    public synchronized com.sun.star.rendering.XBitmap createCompatibleBitmap( IntegerSize2D size )
     {
         CanvasUtils.printLog( "createCompatibleBitmap called with size (" + size.Width + ", " + size.Height + ")" );
         return new CanvasBitmap( graphicsConfig.createCompatibleImage( size.Width,
@@ -151,14 +151,14 @@ public class CanvasGraphicDevice
                                                                        Transparency.OPAQUE ) );
     }
 
-    public synchronized drafts.com.sun.star.rendering.XVolatileBitmap createVolatileBitmap( IntegerSize2D size )
+    public synchronized com.sun.star.rendering.XVolatileBitmap createVolatileBitmap( IntegerSize2D size )
     {
         CanvasUtils.printLog( "createVolatileBitmap called with size (" + size.Width + ", " + size.Height + ")" );
         //return new CanvasBitmap( graphicsConfig.createCompatibleVolatileImage( size.Width, size.Height ) );
         return null;
     }
 
-    public synchronized drafts.com.sun.star.rendering.XBitmap createCompatibleAlphaBitmap( IntegerSize2D size )
+    public synchronized com.sun.star.rendering.XBitmap createCompatibleAlphaBitmap( IntegerSize2D size )
     {
         CanvasUtils.printLog( "createCompatibleBitmap called with size (" + size.Width + ", " + size.Height + ")" );
         return new CanvasBitmap( graphicsConfig.createCompatibleImage( size.Width,
@@ -166,14 +166,14 @@ public class CanvasGraphicDevice
                                                                         Transparency.TRANSLUCENT ) );
     }
 
-    public synchronized drafts.com.sun.star.rendering.XVolatileBitmap createVolatileAlphaBitmap( IntegerSize2D size )
+    public synchronized com.sun.star.rendering.XVolatileBitmap createVolatileAlphaBitmap( IntegerSize2D size )
     {
         CanvasUtils.printLog( "createVolatileBitmap called with size (" + size.Width + ", " + size.Height + ")" );
         //return new CanvasBitmap( graphicsConfig.createCompatibleVolatileImage( size.Width, size.Height ) );
         return null;
     }
 
-    public synchronized drafts.com.sun.star.rendering.XParametricPolyPolygon2DFactory getParametricPolyPolygonFactory()
+    public synchronized com.sun.star.rendering.XParametricPolyPolygon2DFactory getParametricPolyPolygonFactory()
     {
         // TODO
         return null;
@@ -250,7 +250,7 @@ public class CanvasGraphicDevice
     //
 
     private static final String s_implName = "XGraphicsDevice.java.impl";
-    private static final String s_serviceName = "drafts.com.sun.star.rendering.GraphicsDevice";
+    private static final String s_serviceName = "com.sun.star.rendering.GraphicsDevice";
 
     public String getImplementationName()
     {