[Libreoffice-commits] core.git: desktop/test odk/examples xmerge/source

Noel Grandin noel at peralex.com
Fri Dec 12 03:41:58 PST 2014


 desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java |    2 +-
 odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java                        |    2 +-
 odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java        |    2 +-
 odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java                                          |    2 +-
 odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java                                |    2 +-
 odk/examples/java/Inspector/InspectorAddon.java                                                     |    2 +-
 odk/examples/java/Inspector/ProtocolHandlerAddon.java                                               |    2 +-
 odk/examples/java/MinimalComponent/MinimalComponent.java                                            |    2 +-
 odk/examples/java/ToDo/ToDo.java                                                                    |    2 +-
 xmerge/source/bridge/java/XMergeBridge.java                                                         |    2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 7320714922b2d68f668283747faf1b98e7d2b15b
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Dec 12 13:37:47 2014 +0200

    java: fix non-public UNO implementation classes
    
    which I messed up in commit 70f56bc22fe952c
    "java: reduce scope, make member classes private"
    
    Change-Id: I817b2a571e2124f551ccd5c0d8e1099d89f0ec46

diff --git a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
index abd49d5..17c6244 100644
--- a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
+++ b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
@@ -43,7 +43,7 @@ import com.sun.star.util.XChangesBatch;
  */
 public class OptionsEventHandler {
 
-    private static class _OptionsEventHandler extends WeakBase
+    public static class _OptionsEventHandler extends WeakBase
         implements XServiceInfo, XContainerWindowEventHandler {
 
         static private final String __serviceName =
diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
index 083347c..253ca60 100644
--- a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
+++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
@@ -65,7 +65,7 @@ import com.sun.star.test.XTestDialogHandler;
 // ComponentBase, see implementation of TestComponentA.
 public class DialogComponent {
 
-    private static class _DialogComponent
+    public static class _DialogComponent
         implements XTypeProvider, XServiceInfo, XTestDialogHandler, XDialogEventHandler {
 
         private static final String __serviceName= "com.sun.star.test.TestDialogHandler";
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
index 7930f85..bf3cea5 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
@@ -67,7 +67,7 @@ import com.sun.star.document.XFilter;
 
 public class AsciiReplaceFilter
 {
-    private static class _AsciiReplaceFilter extends     WeakBase
+    public static class _AsciiReplaceFilter extends     WeakBase
                                             implements  XInitialization ,
                                                         XServiceInfo    ,
                                                         XNamed          ,
diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
index a3a2e09..e6d6830 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
+++ b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
@@ -108,7 +108,7 @@ class ExampleAddInThread extends Thread
 
 public class ExampleAddIn
 {
-    static private class _ExampleAddIn extends com.sun.star.lib.uno.helper.WeakBase
+    static public class _ExampleAddIn extends com.sun.star.lib.uno.helper.WeakBase
            implements org.openoffice.sheet.addin.XExampleAddIn,
                       com.sun.star.sheet.XAddIn,
                       com.sun.star.lang.XServiceName,
diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java b/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
index 445b75d..bea38f1 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
+++ b/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
@@ -752,7 +752,7 @@ public class ExampleDataPilotSource
 {
     //  implementation of com.sun.star.sheet.DataPilotSource
 
-    static private class _ExampleDataPilotSource implements
+    static public class _ExampleDataPilotSource implements
                         com.sun.star.sheet.XDimensionsSupplier,
                         com.sun.star.sheet.XDataPilotResults,
                         com.sun.star.util.XRefreshable,
diff --git a/odk/examples/java/Inspector/InspectorAddon.java b/odk/examples/java/Inspector/InspectorAddon.java
index fee4f1d..d9236ce 100644
--- a/odk/examples/java/Inspector/InspectorAddon.java
+++ b/odk/examples/java/Inspector/InspectorAddon.java
@@ -53,7 +53,7 @@ public class InspectorAddon {
     /** This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
-    private static class InspectorAddonImpl extends WeakBase implements XDispatchProvider, XInitialization, XServiceInfo {
+    public static class InspectorAddonImpl extends WeakBase implements XDispatchProvider, XInitialization, XServiceInfo {
     private org.openoffice.XInstanceInspector xInstInspector = null;
 //    Dispatcher oDispatcher = null;
     private XFrame m_xFrame = null;
diff --git a/odk/examples/java/Inspector/ProtocolHandlerAddon.java b/odk/examples/java/Inspector/ProtocolHandlerAddon.java
index 714593b..80e52db 100644
--- a/odk/examples/java/Inspector/ProtocolHandlerAddon.java
+++ b/odk/examples/java/Inspector/ProtocolHandlerAddon.java
@@ -57,7 +57,7 @@ public class ProtocolHandlerAddon {
     /** This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
-    private static class ProtocolHandlerAddonImpl extends WeakBase implements
+    public static class ProtocolHandlerAddonImpl extends WeakBase implements
                                                  XDispatchProvider,
                                                  XDispatch,
                                                  XInitialization,
diff --git a/odk/examples/java/MinimalComponent/MinimalComponent.java b/odk/examples/java/MinimalComponent/MinimalComponent.java
index e0c34d4..30b984c 100644
--- a/odk/examples/java/MinimalComponent/MinimalComponent.java
+++ b/odk/examples/java/MinimalComponent/MinimalComponent.java
@@ -49,7 +49,7 @@ public class MinimalComponent {
     /** This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
-    private static class _MinimalComponent extends WeakBase
+    public static class _MinimalComponent extends WeakBase
         implements XInitialization, XServiceInfo {
         /** The service name, that must be used to get an instance of this service.
          */
diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java
index af518ad..c22ad16 100644
--- a/odk/examples/java/ToDo/ToDo.java
+++ b/odk/examples/java/ToDo/ToDo.java
@@ -75,7 +75,7 @@ public class ToDo {
      * XInterface, XTypeProvider, and XWeak implemented by the helper class
      * WeakBase and XServiceInfo should be provided by the service.
      */
-    private static class ToDoImpl extends WeakBase implements XServiceInfo, XToDo {
+    public static class ToDoImpl extends WeakBase implements XServiceInfo, XToDo {
 
         /** The service name, that must be used to get an instance of this service.
          */
diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java
index da0d31a..414fe37 100644
--- a/xmerge/source/bridge/java/XMergeBridge.java
+++ b/xmerge/source/bridge/java/XMergeBridge.java
@@ -82,7 +82,7 @@ public class XMergeBridge {
     /** This inner class provides the component as a concrete implementation
      * of the service description. It implements the needed interfaces.
      */
-    static private class _XMergeBridge implements
+    static public class _XMergeBridge implements
                                                XImportFilter,
      XExportFilter,
         XServiceName,


More information about the Libreoffice-commits mailing list