diff options
6 files changed, 26 insertions, 21 deletions
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index 7c291072d46e..c06dd2daba31 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -193,6 +193,7 @@ public class LocalOfficeConnection * @param containerFactory This is a application provided AWT container * factory. */ + @Deprecated public void setContainerFactory(ContainerFactory containerFactory) { } @@ -221,6 +222,7 @@ public class LocalOfficeConnection * @param container This is an AWT container. * @return The office window instance. */ + @Deprecated public OfficeWindow createOfficeWindow(Container container) { return new LocalOfficeWindow(this); diff --git a/bean/qa/complex/bean/OOoBeanTest.java b/bean/qa/complex/bean/OOoBeanTest.java index d223fb74a9be..9fecfedc007a 100644 --- a/bean/qa/complex/bean/OOoBeanTest.java +++ b/bean/qa/complex/bean/OOoBeanTest.java @@ -19,6 +19,7 @@ package complex.bean; import java.awt.event.*; + import com.sun.star.comp.beans.OOoBean; import com.sun.star.uno.UnoRuntime; @@ -28,6 +29,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.openoffice.test.OfficeConnection; + import static org.junit.Assert.*; class PrivateLocalOfficeConnection extends com.sun.star.comp.beans.LocalOfficeConnection @@ -38,6 +40,7 @@ class PrivateLocalOfficeConnection extends com.sun.star.comp.beans.LocalOfficeCo } } +@Deprecated public class OOoBeanTest { diff --git a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java index 4a50617dff88..3b1f589fa142 100644 --- a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java +++ b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java @@ -26,7 +26,7 @@ import com.sun.star.loader.XImplementationLoader; import com.sun.star.registry.XSimpleRegistry; - +@Deprecated public class SharedLibraryLoader_Test { private static final String NATIVE_SERVICE_MANAGER_IMP_NAME = "com.sun.star.comp.stoc.OServiceManager"; diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java index ad24adbb3531..bb8d053ebcfa 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java @@ -35,7 +35,7 @@ import com.sun.star.comp.helper.RegistryServiceFactory; import com.sun.star.uno.UnoRuntime; - +@Deprecated public class Factory_Test extends WeakBase implements XServiceInfo diff --git a/odk/examples/DevelopersGuide/Charts/ChartHelper.java b/odk/examples/DevelopersGuide/Charts/ChartHelper.java index 977983ecbce7..2a75a94ef132 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartHelper.java +++ b/odk/examples/DevelopersGuide/Charts/ChartHelper.java @@ -35,25 +35,27 @@ // __________ Imports __________ -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.Any; - -// factory for creating components -import com.sun.star.lang.XMultiServiceFactory; +// base graphics things +import com.sun.star.awt.Point; +import com.sun.star.awt.Size; import com.sun.star.beans.XPropertySet; - // application specific classes import com.sun.star.chart.XChartDocument; import com.sun.star.chart.XDiagram; -import com.sun.star.drawing.*; +import com.sun.star.drawing.XDrawPageSupplier; +import com.sun.star.drawing.XDrawPagesSupplier; +import com.sun.star.drawing.XShape; +import com.sun.star.drawing.XShapes; import com.sun.star.frame.XModel; -import com.sun.star.text.XTextDocument; +// factory for creating components +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.text.XText; import com.sun.star.text.XTextContent; import com.sun.star.text.XTextCursor; -import com.sun.star.text.XText; -// base graphics things -import com.sun.star.awt.Point; -import com.sun.star.awt.Size; +import com.sun.star.text.XTextDocument; +import com.sun.star.uno.Any; +import com.sun.star.uno.Type; +import com.sun.star.uno.UnoRuntime; // __________ Implementation __________ @@ -90,7 +92,7 @@ public class ChartHelper XPropertySet xPropSet = UnoRuntime.queryInterface( XPropertySet.class, xTextContent); - Any aAny = new Any(String.class, msChartClassID); + Any aAny = new Any(new Type(String.class), msChartClassID); xPropSet.setPropertyValue("CLSID", aAny ); XTextDocument xTextDoc = UnoRuntime.queryInterface(XTextDocument.class, @@ -106,15 +108,15 @@ public class ChartHelper XShape.class, xTextContent); xShape.setSize( aExtent ); - aAny = new Any(Short.class, + aAny = new Any(new Type(Short.class), new Short(com.sun.star.text.VertOrientation.NONE)); xPropSet.setPropertyValue("VertOrient", aAny ); - aAny = new Any(Short.class, + aAny = new Any(new Type(Short.class), new Short(com.sun.star.text.HoriOrientation.NONE)); xPropSet.setPropertyValue("HoriOrient", aAny ); - aAny = new Any(Integer.class, new Integer(aUpperLeft.Y)); + aAny = new Any(new Type(Integer.class), new Integer(aUpperLeft.Y)); xPropSet.setPropertyValue("VertOrientPosition", aAny ); - aAny = new Any(Integer.class, new Integer(aUpperLeft.X)); + aAny = new Any(new Type(Integer.class), new Integer(aUpperLeft.X)); xPropSet.setPropertyValue("HoriOrientPosition", aAny ); // retrieve the chart document as model of the OLE shape diff --git a/qadevOOo/runner/lib/Parameters.java b/qadevOOo/runner/lib/Parameters.java index 2db421c1142f..5ec44205ec71 100644 --- a/qadevOOo/runner/lib/Parameters.java +++ b/qadevOOo/runner/lib/Parameters.java @@ -39,8 +39,6 @@ import com.sun.star.uno.Type; */ public class Parameters implements XPropertySet { -/* final protected Map parameters; - final Parameters defaults; */ final protected Map<String, Object> parameters; final Parameters defaults; Property[] props; |