From 4c0d24c9d295eacd8c5e2dbe4bc78293cddad115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= <imacat@mail.imacat.idv.tw>
Date: Thu, 13 Apr 2017 14:20:06 +0800
Subject: [PATCH] Changed the connect method to private.

---
 bin/mpresent | 60 ++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/bin/mpresent b/bin/mpresent
index fcd450e..b5a3364 100755
--- a/bin/mpresent
+++ b/bin/mpresent
@@ -177,41 +177,12 @@ class PresentationController:
             try:
                 self.bootstrap_context.getServiceManager()
             except (AttributeError, DisposedException):
-                self.connect()
+                self.__connect()
             self.open()
             presentation = self.doc.getPresentation()
         if not presentation.isRunning():
             presentation.start()
 
-    def connect(self):
-        """Connect to the running OpenOffice/LibreOffice process.
-
-        Run OpenOffice/LibreOffice in server listening mode if it is
-        not running yet.
-        """
-        # Obtains the local context
-        local_context = uno.getComponentContext()
-        # Obtains the local service manager
-        local_service_manager = local_context.getServiceManager()
-        # Obtains the URL resolver
-        url_resolver = local_service_manager.createInstanceWithContext(
-            "com.sun.star.bridge.UnoUrlResolver", local_context)
-        # Obtains the context
-        url = ("uno:socket,host=localhost,port=%d;"
-               "urp;StarOffice.ComponentContext") % self.port
-        while True:
-            try:
-                self.bootstrap_context = url_resolver.resolve(url)
-            except NoConnectException:
-                self.__start_oo()
-            else:
-                break
-        # Obtains the service manager
-        self.service_manager = self.bootstrap_context.getServiceManager()
-        # Obtains the desktop service
-        self.desktop = self.service_manager.createInstanceWithContext(
-            "com.sun.star.frame.Desktop", self.bootstrap_context)
-
     def open(self):
         """Open an office document."""
         file_content_provider = self.service_manager.createInstance(
@@ -250,6 +221,35 @@ class PresentationController:
         self.doc.getPresentation().getController().gotoPreviousSlide()
         return
 
+    def __connect(self):
+        """Connect to the running OpenOffice/LibreOffice process.
+
+        Run OpenOffice/LibreOffice in server listening mode if it is
+        not running yet.
+        """
+        # Obtains the local context
+        local_context = uno.getComponentContext()
+        # Obtains the local service manager
+        local_service_manager = local_context.getServiceManager()
+        # Obtains the URL resolver
+        url_resolver = local_service_manager.createInstanceWithContext(
+            "com.sun.star.bridge.UnoUrlResolver", local_context)
+        # Obtains the context
+        url = ("uno:socket,host=localhost,port=%d;"
+               "urp;StarOffice.ComponentContext") % self.port
+        while True:
+            try:
+                self.bootstrap_context = url_resolver.resolve(url)
+            except NoConnectException:
+                self.__start_oo()
+            else:
+                break
+        # Obtains the service manager
+        self.service_manager = self.bootstrap_context.getServiceManager()
+        # Obtains the desktop service
+        self.desktop = self.service_manager.createInstanceWithContext(
+            "com.sun.star.frame.Desktop", self.bootstrap_context)
+
     def __start_oo(self):
         """Start OpenOffice/LibreOffice in server listening mode."""
         # For MS-Windows, which does not have fork()