INTEGRATION: CWS presfixes01 (1.3.10); FILE MERGED

2005/02/16 11:13:54 fs 1.3.10.1: #i42558# drafts.com.sun.star.drawing/rendering/geometry moved to com.sun.star.*
This commit is contained in:
Vladimir Glazounov 2005-03-10 10:53:46 +00:00
parent f270ff9bab
commit ec6bda7326

View file

@ -67,8 +67,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.*;
@ -82,8 +82,8 @@ import sun.awt.*;
public class JavaCanvas
extends CanvasBase
implements com.sun.star.awt.XWindow,
drafts.com.sun.star.rendering.XSpriteCanvas,
drafts.com.sun.star.rendering.XIntegerBitmap,
com.sun.star.rendering.XSpriteCanvas,
com.sun.star.rendering.XIntegerBitmap,
com.sun.star.lang.XServiceInfo,
com.sun.star.lang.XInitialization
{
@ -370,13 +370,13 @@ public class JavaCanvas
// ==================
//
public synchronized void copyRect( drafts.com.sun.star.rendering.XBitmapCanvas sourceCanvas,
drafts.com.sun.star.geometry.RealRectangle2D sourceRect,
drafts.com.sun.star.rendering.ViewState sourceViewState,
drafts.com.sun.star.rendering.RenderState sourceRenderState,
drafts.com.sun.star.geometry.RealRectangle2D destRect,
drafts.com.sun.star.rendering.ViewState destViewState,
drafts.com.sun.star.rendering.RenderState destRenderState )
public synchronized void copyRect( com.sun.star.rendering.XBitmapCanvas sourceCanvas,
com.sun.star.geometry.RealRectangle2D sourceRect,
com.sun.star.rendering.ViewState sourceViewState,
com.sun.star.rendering.RenderState sourceRenderState,
com.sun.star.geometry.RealRectangle2D destRect,
com.sun.star.rendering.ViewState destViewState,
com.sun.star.rendering.RenderState destRenderState )
{
CanvasUtils.printLog( "JavaCanvas.copyRect() called" );
@ -421,14 +421,14 @@ public class JavaCanvas
// ==================
//
public synchronized drafts.com.sun.star.rendering.XAnimatedSprite createSpriteFromAnimation( XAnimation animation )
public synchronized com.sun.star.rendering.XAnimatedSprite createSpriteFromAnimation( XAnimation animation )
{
CanvasUtils.printLog( "JavaCanvas.createSpriteFromAnimation called" );
return new CanvasSprite( animation, this, (Graphics2D)dummyFrame.frame.getGraphics() );
}
public synchronized XAnimatedSprite createSpriteFromBitmaps( drafts.com.sun.star.rendering.XBitmap[] animationBitmaps,
public synchronized XAnimatedSprite createSpriteFromBitmaps( com.sun.star.rendering.XBitmap[] animationBitmaps,
byte interpolationMode )
{
return null;
@ -473,7 +473,7 @@ public class JavaCanvas
//----------------------------------------------------------------------------------
public synchronized drafts.com.sun.star.rendering.XBitmap getScaledBitmap( RealSize2D newSize, boolean beFast ) throws com.sun.star.lang.IllegalArgumentException, VolatileContentDestroyedException
public synchronized com.sun.star.rendering.XBitmap getScaledBitmap( RealSize2D newSize, boolean beFast ) throws com.sun.star.lang.IllegalArgumentException, VolatileContentDestroyedException
{
// TODO
return null;
@ -494,14 +494,14 @@ public class JavaCanvas
//----------------------------------------------------------------------------------
public synchronized void setData( byte[] data, IntegerBitmapLayout bitmapLayout, drafts.com.sun.star.geometry.IntegerRectangle2D rect )
public synchronized void setData( byte[] data, IntegerBitmapLayout bitmapLayout, com.sun.star.geometry.IntegerRectangle2D rect )
{
// TODO
}
//----------------------------------------------------------------------------------
public synchronized void setPixel( byte[] color, IntegerBitmapLayout bitmapLayout, drafts.com.sun.star.geometry.IntegerPoint2D pos )
public synchronized void setPixel( byte[] color, IntegerBitmapLayout bitmapLayout, com.sun.star.geometry.IntegerPoint2D pos )
{
// TODO
}
@ -669,7 +669,7 @@ public class JavaCanvas
//----------------------------------------------------------------------------------
private static final String s_implName = "XCanvas.java.impl";
private static final String s_serviceName = "drafts.com.sun.star.rendering.JavaCanvas";
private static final String s_serviceName = "com.sun.star.rendering.JavaCanvas";
//----------------------------------------------------------------------------------