INTEGRATION: CWS sdksample (1.3.124); FILE MERGED

2004/06/25 15:48:03 jsc 1.3.124.1: #i29308# use of new UNO features

2 files changed, 22 insertions, 27 deletions

diff --git a/odk/examples/java/Spreadsheet/CalcAddins.java b/odk/examples/java/Spreadsheet/CalcAddins.java
index 2406d2d331be..6d2d08f74272 100644
--- a/odk/examples/java/Spreadsheet/CalcAddins.java
+++ b/odk/examples/java/Spreadsheet/CalcAddins.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CalcAddins.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2003-06-30 15:57:57 $
+ *  last change: $Author: rt $ $Date: 2005-01-31 17:14:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  the BSD license.
@@ -51,7 +51,6 @@ import com.sun.star.registry.XRegistryKey;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.lib.uno.helper.WeakBase;
 import com.sun.star.lang.XInitialization;
-import com.sun.star.sheet.addin.XCalcAddins;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XServiceInfo;
 import com.sun.star.lang.XServiceName;
@@ -60,6 +59,8 @@ import com.sun.star.lang.Locale;
 import com.sun.star.lang.XTypeProvider;
 import com.sun.star.uno.Type;
 
+import org.openoffice.sheet.addin.XCalcAddins;
+
 /** This outer class provides an inner class to implement the service
  * description, a method to instantiate the
  * component on demand (__getServiceFactory()), and a method to give
@@ -80,7 +81,7 @@ public class CalcAddins {
 
 /** The component will be registered under this name.
  */
-        static private final String __serviceName = "com.sun.star.sheet.addin.CalcAddins";
+        static private final String __serviceName = "org.openoffice.sheet.addin.CalcAddins";
 
         static private final String ADDIN_SERVICE = "com.sun.star.sheet.AddIn";
 
diff --git a/odk/examples/java/Spreadsheet/XCalcAddins.idl b/odk/examples/java/Spreadsheet/XCalcAddins.idl
index be182be96240..d81c9b014485 100644
--- a/odk/examples/java/Spreadsheet/XCalcAddins.idl
+++ b/odk/examples/java/Spreadsheet/XCalcAddins.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XCalcAddins.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2003-06-30 15:58:56 $
+ *  last change: $Author: rt $ $Date: 2005-01-31 17:16:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  the BSD license.
@@ -39,26 +39,18 @@
  *************************************************************************/
 
 // Guard against multiple includes
-#ifndef _COM_SUN_STAR_SHEET_ADDIN_IDL_
-#define _COM_SUN_STAR_SHEET_ADDIN_IDL__
+#ifndef _org_openoffice_sheet_addin_XCalcAddins_
+#define _org_openoffice_sheet_addin_XCalcAddins_
 
-/// Template for StarOffice Calc add-in component idl file.
-
-
-/* Provides lifetime control by reference counting and the possibility of
-    querying for other interfaces of the same logical object.
- */
+// must be included always for compatibility reasons
 #include <com/sun/star/uno/XInterface.idl>
 
-/* Provides information about and access to the properties from an
-    implementation.
- */
 #include <com/sun/star/beans/XPropertySet.idl>
+#include <com/sun/star/sheet/AddIn.idl>
 
 
-module com {
-  module sun {
-    module star {
+module org {
+  module openoffice {
       module sheet {
         module addin {
       /** Interface with your additional methods.
@@ -67,13 +59,11 @@ module com {
               any number of arguments after xOptions.
               Furthermore, you could replace the name of the service and
               the interface, but only if you want to replace this name in all
-              your project files. This example will work with the default
+              your project files. This example will work with tNeccessaryhe default
               names.
-              All interfaces specified in UNOIDL must be derived from
-              com.sun.star.uno.XInterface .
               Interface names should start with an X prefix.
            */
-      interface XCalcAddins : com::sun::star::uno::XInterface
+      interface XCalcAddins
       {
             /** Declare your methods:
                 This is where you could add the declarations of your methods.
@@ -103,15 +93,19 @@ module com {
        service CalcAddins
        {
             /** Exported interfaces:
-        This is where you put all interfaces that this service exports. The service
-        supports its main interface only.
+                This is where you put all interfaces that this service exports. The service
+                supports its main interface only.
              */
            interface XCalcAddins;
+
+           /** Necessary base service.
+               All add-ins must implement this service
+            */
+           service com::sun::star::sheet::AddIn;
        };
         };
       };
     };
-  };
 };
 
 #endif