masterfix: #i10000# add api-adaptions from cws jl152

2 files changed, 9 insertions, 9 deletions

diff --git a/smoketestoo_native/data/Global.xml b/smoketestoo_native/data/Global.xml
index f944731fde79..364d2e2efcfb 100644
--- a/smoketestoo_native/data/Global.xml
+++ b/smoketestoo_native/data/Global.xml
@@ -76,7 +76,7 @@ Global const cUnoDatabaseContext = cUnoPrefix + "sdb.DatabaseContext"
 Global const cUnoRowSet = cUnoPrefix + "sdb.RowSet"
 Global const cUnoSmoketestTestExtension = cUnoPrefix + "comp.smoketest.TestExtension"
 Global const cUnoSmoketestCommandEnvironment = cUnoPrefix + "deployment.test.SmoketestCommandEnvironment"
-Global const cUnothePackageManagerFactory = cUnoPrefix + "deployment.thePackageManagerFactory"
+Global const cExtensionManager = cUnoPrefix + "deployment.ExtensionManager"
 
 'UserFieldNames
 Global const cUserFieldTestWriter = "Writer", cUserFieldTestCalc = "Calc", cUserFieldTestImpress = "Impress"
diff --git a/smoketestoo_native/data/Test_Ext.xml b/smoketestoo_native/data/Test_Ext.xml
index bd7dbac693fa..31d27dc7a4a7 100644
--- a/smoketestoo_native/data/Test_Ext.xml
+++ b/smoketestoo_native/data/Test_Ext.xml
@@ -53,14 +53,10 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q
     'javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java and the code is in juh.jar
     cmdEnv = createUnoService(cUnoSmoketestCommandEnvironment)
 
-    'Create the component context and then get the singleton thePackageManagerFactory
+    'Create the component context and then get the singleton ExtensionManager
     'A singleton cannot be created with createUnoService
     ctx = getDefaultContext
-    factory = ctx.getValueByName("/singletons/" + cUnothePackageManagerFactory)
-
-    'Get the XPackageManager interface. By passing "user" we determine that the actions we perform on
-    'XPackageManager only affect the user installation. To modify the share installation one would pass "share".
-    ext_mgr = factory.getPackageManager("user")
+    ext_mgr = ctx.getValueByName("/singletons/" + cExtensionManager)
 
     LogState (not IsNull (ext_mgr), "Extension "+ cMessageExtensionService, FileChannel)
     LogState (not IsNull (ext_mgr), "Extension "+ cMessageExtensionService, MainFileChannel)
@@ -74,7 +70,11 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q
     nCurrentAction = cEXTInstall
 
     'Add the extension. We must provide a file URL here.
-    ext_mgr.addPackage(sExtensionURL + cExtensionFileName, "", obj_null, cmdEnv)
+    'By passing "user" we determine that the actions we perform on
+    'XExtensionManager only affect the user installation. To modify the share installation one would pass "share".
+
+    Dim props() as Object
+    ext_mgr.addExtension(sExtensionURL + cExtensionFileName, props, "user", obj_null, cmdEnv)
 
     'Check if the extension has been added by creating a service which is contained in the extension.
     oTestExtension = createUnoService(cUnoSmoketestTestExtension)
@@ -91,7 +91,7 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q
     nCurrentAction = cEXTUninstall
 
     'Remove the package
-    ext_mgr.removePackage("org.openoffice.legacy." + cExtensionFileName, cExtensionFileName, obj_null, cmdEnv)
+    ext_mgr.removeExtension("org.openoffice.legacy." + cExtensionFileName, cExtensionFileName, "user",obj_null, cmdEnv)
 
     'Try to create the service which is contained in the now removed extension.
     oTestExtension = createUnoService(cUnoSmoketestTestExtension)