Fixed comments.
This commit is contained in:
parent
60524bb39e
commit
763703b96a
24
bin/obasync
24
bin/obasync
@ -109,7 +109,7 @@ def append_uno_path():
|
|||||||
if os.path.exists(os.path.join(cand, "uno.py")):
|
if os.path.exists(os.path.join(cand, "uno.py")):
|
||||||
sys.path.append(cand)
|
sys.path.append(cand)
|
||||||
return
|
return
|
||||||
# Finds uno.py for MS-Windows
|
# Find uno.py for MS-Windows
|
||||||
cand = sys.executable
|
cand = sys.executable
|
||||||
while cand != os.path.dirname(cand):
|
while cand != os.path.dirname(cand):
|
||||||
cand = os.path.dirname(cand)
|
cand = os.path.dirname(cand)
|
||||||
@ -210,12 +210,12 @@ def parse_args():
|
|||||||
"-v", "--version", action="version", version="%(prog)s 0.4")
|
"-v", "--version", action="version", version="%(prog)s 0.4")
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
# Obtains the absolute path
|
# Obtain the absolute path
|
||||||
args.projdir = os.path.abspath(args.projdir)
|
args.projdir = os.path.abspath(args.projdir)
|
||||||
# Obtains the library name from the path
|
# Obtain the library name from the path
|
||||||
if args.library is None:
|
if args.library is None:
|
||||||
args.library = os.path.basename(args.projdir)
|
args.library = os.path.basename(args.projdir)
|
||||||
# Adjusts the file name extension.
|
# Adjust the file name extension.
|
||||||
if args.ext[0] != ".":
|
if args.ext[0] != ".":
|
||||||
args.ext = "." + args.ext
|
args.ext = "." + args.ext
|
||||||
|
|
||||||
@ -485,14 +485,14 @@ class Office:
|
|||||||
Run OpenOffice/LibreOffice in server listening mode if it is
|
Run OpenOffice/LibreOffice in server listening mode if it is
|
||||||
not running yet.
|
not running yet.
|
||||||
"""
|
"""
|
||||||
# Obtains the local context
|
# Obtain the local context
|
||||||
local_context = uno.getComponentContext()
|
local_context = uno.getComponentContext()
|
||||||
# Obtains the local service manager
|
# Obtain the local service manager
|
||||||
local_service_manager = local_context.getServiceManager()
|
local_service_manager = local_context.getServiceManager()
|
||||||
# Obtains the URL resolver
|
# Obtain the URL resolver
|
||||||
url_resolver = local_service_manager.createInstanceWithContext(
|
url_resolver = local_service_manager.createInstanceWithContext(
|
||||||
"com.sun.star.bridge.UnoUrlResolver", local_context)
|
"com.sun.star.bridge.UnoUrlResolver", local_context)
|
||||||
# Obtains the context
|
# Obtain the context
|
||||||
url = ("uno:socket,host=localhost,port=%d;"
|
url = ("uno:socket,host=localhost,port=%d;"
|
||||||
"urp;StarOffice.ComponentContext") % self.port
|
"urp;StarOffice.ComponentContext") % self.port
|
||||||
while True:
|
while True:
|
||||||
@ -502,9 +502,9 @@ class Office:
|
|||||||
self.__start_oo()
|
self.__start_oo()
|
||||||
else:
|
else:
|
||||||
break
|
break
|
||||||
# Obtains the service manager
|
# Obtain the service manager
|
||||||
self.service_manager = self.bootstrap_context.getServiceManager()
|
self.service_manager = self.bootstrap_context.getServiceManager()
|
||||||
# Obtains the desktop service
|
# Obtain the desktop service
|
||||||
self.desktop = self.service_manager.createInstanceWithContext(
|
self.desktop = self.service_manager.createInstanceWithContext(
|
||||||
"com.sun.star.frame.Desktop", self.bootstrap_context)
|
"com.sun.star.frame.Desktop", self.bootstrap_context)
|
||||||
|
|
||||||
@ -559,7 +559,7 @@ class Office:
|
|||||||
Returns:
|
Returns:
|
||||||
The found soffice executable, or None if not found.
|
The found soffice executable, or None if not found.
|
||||||
"""
|
"""
|
||||||
# Checkes soffice in the same directory of uno.py
|
# Check soffice in the same directory of uno.py
|
||||||
# This works for Linux OpenOffice/LibreOffice local
|
# This works for Linux OpenOffice/LibreOffice local
|
||||||
# installation, and OpenOffice on MacOSX.
|
# installation, and OpenOffice on MacOSX.
|
||||||
soffice = os.path.join(
|
soffice = os.path.join(
|
||||||
@ -596,7 +596,7 @@ class Office:
|
|||||||
if soffice.lower().find("libreoffice") != -1:
|
if soffice.lower().find("libreoffice") != -1:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
# Checks the symbolic link at /usr/bin/soffice
|
# Check the symbolic link at /usr/bin/soffice
|
||||||
if soffice == "/usr/bin/soffice" and os.path.islink(soffice):
|
if soffice == "/usr/bin/soffice" and os.path.islink(soffice):
|
||||||
if os.readlink(soffice).lower().find("libreoffice") != -1:
|
if os.readlink(soffice).lower().find("libreoffice") != -1:
|
||||||
return True
|
return True
|
||||||
|
Loading…
Reference in New Issue
Block a user