diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:23:21 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:23:21 +0200 |
commit | 5847d2ab92aa35223e03e1adab486d7c73e2349c (patch) | |
tree | 66781e290f2adf8d25ca68681b1e95b93435ac81 /javaunohelper/com/sun/star/lib/uno/helper/Factory.java | |
parent | b8867927e2fee37ed60b1b8773bcc0dc7e2b91cd (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit dc53bbdbf2e1d0cbb53bb4619188955698f8a5c2 (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:09 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit e4601251b90e2555b032eadbdaa56dcfb91b5aae
Author: Noel Power <noel.power@novell.com>
Date: Wed Apr 13 18:52:58 2011 +0100
fix for fdo#35108 allow dot net clients to bootstrap libreoffice
Signed-off-by: Petr Mladek <pmladek@suse.cz>
cli_ure/source/native/native_bootstrap.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 1818bf1dbc330974c749ca17b4d7b79796587fae
Author: Jani Monoses <jani.monoses@canonical.com>
Date: Mon Mar 14 19:10:04 2011 +0100
prefer gcc __sync functions over pthread
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
sal/osl/unx/interlck.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
Notes
split repo tag: ure_libreoffice-3.3.3.1
split repo tag: ure_libreoffice-3.3.4.1
Diffstat (limited to 'javaunohelper/com/sun/star/lib/uno/helper/Factory.java')
-rw-r--r-- | javaunohelper/com/sun/star/lib/uno/helper/Factory.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java index 33d107279633..0d3759f74d6d 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/Factory.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/Factory.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ import com.sun.star.uno.UnoRuntime; /** Factory helper class supporting com.sun.star.lang.XServiceInfo and com.sun.star.lang.XSingleComponentFactory. - + @attention This factory implementation does not support lang.XSingleServiceFactory. */ @@ -46,11 +46,11 @@ public class Factory implements XSingleComponentFactory, XServiceInfo { private static final boolean DEBUG = false; - + /** Creates an object factory supporting interfaces com.sun.star.lang.XSingleComponentFactory and com.sun.star.lang.XServiceInfo - + @param impl_class implementation class @param supported_services @@ -65,7 +65,7 @@ public class Factory return new Factory( impl_class, supported_services ); } /** Writes component's implementation info to given registry key. - + @param impl_name name of implementation @param supported_services @@ -98,14 +98,14 @@ public class Factory } return false; } - + //============================================================================================== private String m_impl_name; private String [] m_supported_services; private Class m_impl_class; private java.lang.reflect.Method m_method; private java.lang.reflect.Constructor m_ctor; - + // ctor private Factory( Class impl_class, String supported_services [] ) throws com.sun.star.uno.RuntimeException @@ -115,9 +115,9 @@ public class Factory m_impl_class = impl_class; m_method = null; m_ctor = null; - + Class params [] = new Class [] { XComponentContext.class }; - + try { // seeking for "public static Object __create( XComponentContext )" @@ -133,7 +133,7 @@ public class Factory catch (Exception exc) { } - + if (null == m_method) { try @@ -147,7 +147,7 @@ public class Factory } } } - + //______________________________________________________________________________________________ private final Object instantiate( XComponentContext xContext ) throws com.sun.star.uno.Exception @@ -218,7 +218,7 @@ public class Factory xInit.initialize( arguments ); return inst; } - + // XServiceInfo impl //______________________________________________________________________________________________ public final String getImplementationName() |