strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert changes to public URE APIs in previous commit

Browse source 
Change-Id: I8f5309ee5fbda34ad1bb9e724c26e04692253649
This commit is contained in:
Michael Stahl 2012-06-29 21:21:40 +02:00
parent f9fa0dd66b
commit 37e1055f8c
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
javaunohelper/com/sun/star/comp/helper/Bootstrap.java
View file

@ -37,8 +37,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintStream;
import java.util.Iterator;
import java.util.Map;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Random;
/** Bootstrap offers functionality to obtain a context or simply
@ -94,7 +93,7 @@ public class Bootstrap {
context entries (type class ComponentContextEntry).
@return a new context.
*/
static public XComponentContext createInitialComponentContext( Map<String,Object> context_entries )
static public XComponentContext createInitialComponentContext( Hashtable<String, Object> context_entries )
throws Exception
{
XImplementationLoader xImpLoader = UnoRuntime.queryInterface(
@ -117,7 +116,7 @@ public class Bootstrap {
// initial component context
if (context_entries == null)
context_entries = new HashMap<String,Object>( 1 );
context_entries = new Hashtable<String,Object>( 1 );
// add smgr
context_entries.put(
"/singletons/com.sun.star.lang.theServiceManager",
@ -172,7 +171,7 @@ public class Bootstrap {
@see "cppuhelper/defaultBootstrap_InitialComponentContext()"
*/
static public final XComponentContext defaultBootstrap_InitialComponentContext(
String ini_file, Map<String,String> bootstrap_parameters )
String ini_file, Hashtable<String,String> bootstrap_parameters )
throws Exception
{
// jni convenience: easier to iterate over array than calling Hashtable

7
javaunohelper/com/sun/star/comp/helper/ComponentContext.java
View file

@ -27,8 +27,7 @@ import com.sun.star.lang.XComponent;
import com.sun.star.lang.XEventListener;
import com.sun.star.lang.EventObject;
import java.util.HashMap;
import java.util.Map;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.ArrayList;
@ -58,7 +57,7 @@ public class ComponentContext implements XComponentContext, XComponent
private static final String SMGR_NAME = "/singletons/com.sun.star.lang.theServiceManager";
private static final String TDMGR_NAME = "/singletons/com.sun.star.reflection.theTypeDescriptionManager";
private Map<String,Object> m_table;
private Hashtable<String,Object> m_table;
private XComponentContext m_xDelegate;
private XMultiComponentFactory m_xSMgr;
@ -75,7 +74,7 @@ public class ComponentContext implements XComponentContext, XComponent
@param xDelegate
if values are not found, request is delegated to this object
*/
public ComponentContext( Map<String,Object> table, XComponentContext xDelegate )
public ComponentContext( Hashtable<String,Object> table, XComponentContext xDelegate )
{
m_eventListener = new ArrayList<XEventListener>();
m_table = table;