summaryrefslogtreecommitdiff
path: root/testtools/com/sun
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2011-03-11 11:35:29 +0000
committerMichael Meeks <michael.meeks@novell.com>2011-03-11 11:35:29 +0000
commit8c59580b88a33d7f0c892c9c53776716ad661fcf (patch)
treeda43a9c8f3ba7cba7afca05894acc8712f6e36ce /testtools/com/sun
parente62f74cabe9558e003d3105df7a69e3841dfc9ce (diff)
parent36979f1c9e43c42e62b0ad5a32b7abb2fc425b5b (diff)
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Conflicts: smoketestoo_native/data/Global.xml smoketestoo_native/data/OptionsDlg.xml smoketestoo_native/data/Test_10er.xml smoketestoo_native/data/content.xml smoketestoo_native/smoketest.cxx test/source/cpp/getargument.cxx test/source/cpp/officeconnection.cxx testautomation/framework/optional/includes/basic_vba-compat_security_check.inc testautomation/framework/optional/includes/filedlg_cjk_folders.inc testautomation/global/sid/all.sid testautomation/global/sid/bars.sid testautomation/global/sid/e_all.sid testautomation/global/win/bars.win testautomation/graphics/optional/includes/impress/i_slideshow2.inc testautomation/graphics/optional/includes/impress/i_slideshow3.inc testtools/source/bridgetest/bridgetest.cxx testtools/source/bridgetest/constructors.cxx testtools/source/bridgetest/makefile.mk testtools/source/bridgetest/testComponent.component
Diffstat (limited to 'testtools/com/sun')
-rw-r--r--testtools/com/sun/star/comp/bridge/TestComponent.java19
1 files changed, 0 insertions, 19 deletions
diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java b/testtools/com/sun/star/comp/bridge/TestComponent.java
index 6953a4da90da..c63ff7fe2293 100644
--- a/testtools/com/sun/star/comp/bridge/TestComponent.java
+++ b/testtools/com/sun/star/comp/bridge/TestComponent.java
@@ -1325,23 +1325,4 @@ public class TestComponent {
return xSingleServiceFactory;
}
-
- /**
- * Writes the service information into the given registry key.
- * This method is called by the <code>JavaLoader</code>
- * <p>
- * @return returns true if the operation succeeded
- * @param regKey the registryKey
- * @see com.sun.star.comp.loader.JavaLoader
- */
- public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
- boolean result = true;
-
- result = result & FactoryHelper.writeRegistryServiceInfo(_TestObject.class.getName(), _TestObject.__serviceName, regKey);
- result = result & FactoryHelper.writeRegistryServiceInfo(_PerformancTestObject.class.getName(),
- _PerformancTestObject.__serviceName, regKey);
-
- return result;
- }
-
}