summaryrefslogtreecommitdiff
path: root/odk/examples/java
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-04 13:51:59 +0200
committerNoel Grandin <noel@peralex.com>2014-08-04 14:50:59 +0200
commit0781dad870cb48b8604e84df1750422c91d70f1a (patch)
treeb49948231d0fde9a46eb060457fcf44a6fd0de26 /odk/examples/java
parent66c34ff3e7cb940536b7257033c097491862d04f (diff)
java: remove commented out code for OpenOffice 3.3
Specifically the comment says: This method not longer necessary since OOo 3.4 where the component registration was changed to passive component registration. For more details see http://wiki.openoffice.org/wiki/Passive_Component_Registration Change-Id: Icfeec634ebc30a270533787b94e2a9a4318778db
Diffstat (limited to 'odk/examples/java')
-rw-r--r--odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java10
-rw-r--r--odk/examples/java/MinimalComponent/MinimalComponent.java18
-rw-r--r--odk/examples/java/PropertySet/PropTest.java10
-rw-r--r--odk/examples/java/Spreadsheet/CalcAddins.java18
-rw-r--r--odk/examples/java/ToDo/ToDo.java17
5 files changed, 0 insertions, 73 deletions
diff --git a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java
index 983f65172d47..84547be8b1a4 100644
--- a/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java
+++ b/odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java
@@ -45,16 +45,6 @@ public final class OwnEmbeddedObjectFactory extends WeakBase
return xFactory;
}
- // This method not longer necessary since OOo 3.4 where the component registration
- // was changed to passive component registration. For more details see
- // http://wiki.openoffice.org/wiki/Passive_Component_Registration
-
-// public static boolean __writeRegistryServiceInfo( XRegistryKey xRegistryKey ) {
-// return Factory.writeRegistryServiceInfo(m_implementationName,
-// m_serviceNames,
-// xRegistryKey);
-// }
-
// com.sun.star.lang.XServiceInfo:
public String getImplementationName() {
return m_implementationName;
diff --git a/odk/examples/java/MinimalComponent/MinimalComponent.java b/odk/examples/java/MinimalComponent/MinimalComponent.java
index a54048298054..1a585dfdfb91 100644
--- a/odk/examples/java/MinimalComponent/MinimalComponent.java
+++ b/odk/examples/java/MinimalComponent/MinimalComponent.java
@@ -150,22 +150,4 @@ public class MinimalComponent {
return xFactory;
}
-
- /**
- * 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
- */
- // This method not longer necessary since OOo 3.4 where the component registration
- // was changed to passive component registration. For more details see
- // http://wiki.openoffice.org/wiki/Passive_Component_Registration
-
-// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
-// return Factory.writeRegistryServiceInfo(_MinimalComponent.class.getName(),
-// _MinimalComponent.getServiceNames(),
-// regKey);
-// }
}
diff --git a/odk/examples/java/PropertySet/PropTest.java b/odk/examples/java/PropertySet/PropTest.java
index 6749b4fd56eb..fd77886a6678 100644
--- a/odk/examples/java/PropertySet/PropTest.java
+++ b/odk/examples/java/PropertySet/PropTest.java
@@ -256,14 +256,4 @@ public class PropTest extends PropertySet implements XServiceInfo
return xSingleServiceFactory;
}
-
- // This method not longer necessary since OOo 3.4 where the component registration
- // was changed to passive component registration. For more details see
- // http://wiki.openoffice.org/wiki/Passive_Component_Registration
-
-// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey)
-// {
-// return FactoryHelper.writeRegistryServiceInfo( PropTest.class.getName(),
-// PropTest.__serviceName, regKey);
-// }
}
diff --git a/odk/examples/java/Spreadsheet/CalcAddins.java b/odk/examples/java/Spreadsheet/CalcAddins.java
index e0387a481d1e..7b4a2853a264 100644
--- a/odk/examples/java/Spreadsheet/CalcAddins.java
+++ b/odk/examples/java/Spreadsheet/CalcAddins.java
@@ -281,22 +281,4 @@ public class CalcAddins {
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
- */
- // This method not longer necessary since OOo 3.4 where the component registration
- // was changed to passive component registration. For more details see
- // http://wiki.openoffice.org/wiki/Passive_Component_Registration
-
-// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
-// return FactoryHelper.writeRegistryServiceInfo(_CalcAddins.class.getName(),
-// _CalcAddins.__serviceName, regKey)
-// && FactoryHelper.writeRegistryServiceInfo(_CalcAddins.class.getName(),
-// _CalcAddins.ADDIN_SERVICE, regKey);
-// }
}
diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java
index 8b1f8743fb5c..99af7047a77f 100644
--- a/odk/examples/java/ToDo/ToDo.java
+++ b/odk/examples/java/ToDo/ToDo.java
@@ -929,22 +929,5 @@ public class ToDo {
return xFactory;
}
-
- /**
- * 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
- */
- // This method not longer necessary since OOo 3.4 where the component registration
- // was changed to passive component registration. For more details see
- // http://wiki.openoffice.org/wiki/Passive_Component_Registration
-
-// public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) {
-// return Factory.writeRegistryServiceInfo(ToDoImpl.class.getName(),
-// ToDoImpl.getServiceNames(), regKey);
-// }
}