From 293a144126b13a78aef01bd72586432056b8ca80 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Sat, 22 Sep 2012 19:16:38 +0200 Subject: pyfax: Use relative imports so we can call the wizard remotely Change-Id: I8ed98ff5125caf28680f94865ab2fe122f124182 Reviewed-on: https://gerrit.libreoffice.org/683 Reviewed-by: Michael Meeks Tested-by: Michael Meeks --- wizards/com/sun/star/wizards/RemoteWebWizard | 15 --------- wizards/com/sun/star/wizards/common/ConfigGroup.py | 4 +-- wizards/com/sun/star/wizards/common/ConfigSet.py | 4 +-- .../com/sun/star/wizards/common/Configuration.py | 5 ++- wizards/com/sun/star/wizards/common/Desktop.py | 2 +- wizards/com/sun/star/wizards/common/FileAccess.py | 2 +- wizards/com/sun/star/wizards/common/Helper.py | 2 +- .../com/sun/star/wizards/common/NumberFormatter.py | 2 +- .../sun/star/wizards/common/PropertySetHelper.py | 4 +-- wizards/com/sun/star/wizards/common/Resource.py | 4 +-- .../com/sun/star/wizards/common/SystemDialog.py | 6 ++-- .../sun/star/wizards/document/OfficeDocument.py | 4 +-- wizards/com/sun/star/wizards/fax/CGFax.py | 4 +-- wizards/com/sun/star/wizards/fax/CGFaxWizard.py | 6 ++-- wizards/com/sun/star/wizards/fax/CallWizard.py | 37 +++++++++++----------- wizards/com/sun/star/wizards/fax/FaxDocument.py | 7 ++-- .../com/sun/star/wizards/fax/FaxWizardDialog.py | 7 ++-- .../sun/star/wizards/fax/FaxWizardDialogConst.py | 3 +- .../sun/star/wizards/fax/FaxWizardDialogImpl.py | 27 +++++++--------- .../star/wizards/fax/FaxWizardDialogResources.py | 2 +- wizards/com/sun/star/wizards/fax/__init__.py | 3 +- wizards/com/sun/star/wizards/remote.py | 8 +++++ wizards/com/sun/star/wizards/text/TextDocument.py | 12 +++---- .../com/sun/star/wizards/text/TextFieldHandler.py | 2 +- .../sun/star/wizards/text/TextSectionHandler.py | 2 +- wizards/com/sun/star/wizards/ui/ImageList.py | 8 ++--- wizards/com/sun/star/wizards/ui/PathSelection.py | 6 ++-- wizards/com/sun/star/wizards/ui/PeerConfig.py | 2 +- wizards/com/sun/star/wizards/ui/UnoDialog.py | 7 ++-- wizards/com/sun/star/wizards/ui/UnoDialog2.py | 9 +++--- wizards/com/sun/star/wizards/ui/WizardDialog.py | 13 ++++---- .../sun/star/wizards/ui/event/CommonListener.py | 4 +-- wizards/com/sun/star/wizards/ui/event/DataAware.py | 4 +-- .../sun/star/wizards/ui/event/ListModelBinder.py | 2 +- .../sun/star/wizards/ui/event/RadioDataAware.py | 11 ++----- .../com/sun/star/wizards/ui/event/UnoDataAware.py | 6 ++-- 36 files changed, 109 insertions(+), 137 deletions(-) delete mode 100755 wizards/com/sun/star/wizards/RemoteWebWizard create mode 100755 wizards/com/sun/star/wizards/remote.py diff --git a/wizards/com/sun/star/wizards/RemoteWebWizard b/wizards/com/sun/star/wizards/RemoteWebWizard deleted file mode 100755 index d9916a09a24a..000000000000 --- a/wizards/com/sun/star/wizards/RemoteWebWizard +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -from web.WWD_Events import WWD_Events -import sys - -if __name__ == "__main__": - - WWD_Events.main(sys.argv) diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.py b/wizards/com/sun/star/wizards/common/ConfigGroup.py index bb5d95f9169e..0491c81159ca 100644 --- a/wizards/com/sun/star/wizards/common/ConfigGroup.py +++ b/wizards/com/sun/star/wizards/common/ConfigGroup.py @@ -17,8 +17,8 @@ # import traceback import inspect -from wizards.common.ConfigNode import * -from wizards.common.Configuration import Configuration +from .ConfigNode import * +from .Configuration import Configuration class ConfigGroup(ConfigNode): diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.py b/wizards/com/sun/star/wizards/common/ConfigSet.py index 8ba66358fc45..b5ff83618795 100644 --- a/wizards/com/sun/star/wizards/common/ConfigSet.py +++ b/wizards/com/sun/star/wizards/common/ConfigSet.py @@ -16,8 +16,8 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import traceback -from wizards.common.ConfigNode import * -from wizards.common.Configuration import Configuration +from .ConfigNode import * +from .Configuration import Configuration class ConfigSet(ConfigNode): ''' diff --git a/wizards/com/sun/star/wizards/common/Configuration.py b/wizards/com/sun/star/wizards/common/Configuration.py index cd8a0182aafb..d76cad4602be 100644 --- a/wizards/com/sun/star/wizards/common/Configuration.py +++ b/wizards/com/sun/star/wizards/common/Configuration.py @@ -15,10 +15,9 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -import uno import traceback -from wizards.common.PropertyNames import PropertyNames -from wizards.common.Helper import * +from .PropertyNames import PropertyNames +from .Helper import * ''' This class gives access to the OO configuration api. diff --git a/wizards/com/sun/star/wizards/common/Desktop.py b/wizards/com/sun/star/wizards/common/Desktop.py index 408edf1f5dd1..86f76e9f43a0 100644 --- a/wizards/com/sun/star/wizards/common/Desktop.py +++ b/wizards/com/sun/star/wizards/common/Desktop.py @@ -17,7 +17,7 @@ # import uno import traceback -from wizards.common.NoValidPathException import * +from .NoValidPathException import * from com.sun.star.frame.FrameSearchFlag import ALL, PARENT from com.sun.star.util import URL diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py b/wizards/com/sun/star/wizards/common/FileAccess.py index 2019632855d6..6fa8493b11de 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.py +++ b/wizards/com/sun/star/wizards/common/FileAccess.py @@ -18,7 +18,7 @@ import traceback import types from os import path as osPath -from wizards.common.NoValidPathException import * +from .NoValidPathException import * from com.sun.star.ucb import CommandAbortedException from com.sun.star.awt.VclWindowPeerAttribute import OK, YES_NO diff --git a/wizards/com/sun/star/wizards/common/Helper.py b/wizards/com/sun/star/wizards/common/Helper.py index cd63ef8b2916..c77652ee0f4b 100644 --- a/wizards/com/sun/star/wizards/common/Helper.py +++ b/wizards/com/sun/star/wizards/common/Helper.py @@ -18,7 +18,7 @@ import uno import traceback from datetime import date as DateTime -from wizards.common.NumberFormatter import NumberFormatter +from .NumberFormatter import NumberFormatter from com.sun.star.uno import RuntimeException diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.py b/wizards/com/sun/star/wizards/common/NumberFormatter.py index 4a357dc88cb3..1a8d3a60a640 100644 --- a/wizards/com/sun/star/wizards/common/NumberFormatter.py +++ b/wizards/com/sun/star/wizards/common/NumberFormatter.py @@ -16,7 +16,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import traceback - +import uno from com.sun.star.lang import Locale from com.sun.star.util.NumberFormat import DATE, LOGICAL, DATETIME, TEXT, NUMBER diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.py b/wizards/com/sun/star/wizards/common/PropertySetHelper.py index 524caf043f36..3a2be35b24fc 100644 --- a/wizards/com/sun/star/wizards/common/PropertySetHelper.py +++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.py @@ -15,8 +15,8 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -from wizards.common.DebugHelper import * -from wizards.common.DebugHelper import * +from .DebugHelper import * +from .DebugHelper import * class PropertySetHelper(object): diff --git a/wizards/com/sun/star/wizards/common/Resource.py b/wizards/com/sun/star/wizards/common/Resource.py index 44739b634c23..8d6837a1a681 100644 --- a/wizards/com/sun/star/wizards/common/Resource.py +++ b/wizards/com/sun/star/wizards/common/Resource.py @@ -16,8 +16,8 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import traceback -from wizards.common.Configuration import Configuration -from wizards.common.SystemDialog import SystemDialog +from .Configuration import Configuration +from .SystemDialog import SystemDialog from com.sun.star.awt.VclWindowPeerAttribute import OK diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.py b/wizards/com/sun/star/wizards/common/SystemDialog.py index 3793672d0979..21756fc172fc 100644 --- a/wizards/com/sun/star/wizards/common/SystemDialog.py +++ b/wizards/com/sun/star/wizards/common/SystemDialog.py @@ -17,9 +17,9 @@ # import uno import traceback -from wizards.common.Configuration import Configuration -from wizards.common.Desktop import Desktop -from wizards.common.Helper import Helper +from .Configuration import Configuration +from .Desktop import Desktop +from .Helper import Helper from com.sun.star.ui.dialogs.TemplateDescription import FILESAVE_AUTOEXTENSION, FILEOPEN_SIMPLE from com.sun.star.ui.dialogs.ExtendedFilePickerElementIds import CHECKBOX_AUTOEXTENSION diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py b/wizards/com/sun/star/wizards/document/OfficeDocument.py index b8d692cfef15..418479498ee9 100644 --- a/wizards/com/sun/star/wizards/document/OfficeDocument.py +++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py @@ -18,8 +18,8 @@ import uno import traceback import unohelper -from wizards.ui.event.CommonListener import TerminateListenerProcAdapter -from wizards.common.Desktop import Desktop +from ..ui.event.CommonListener import TerminateListenerProcAdapter +from ..common.Desktop import Desktop from com.sun.star.awt import WindowDescriptor from com.sun.star.awt import Rectangle diff --git a/wizards/com/sun/star/wizards/fax/CGFax.py b/wizards/com/sun/star/wizards/fax/CGFax.py index 3944a48bc280..868aa8b7ddc8 100644 --- a/wizards/com/sun/star/wizards/fax/CGFax.py +++ b/wizards/com/sun/star/wizards/fax/CGFax.py @@ -15,8 +15,8 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -from wizards.common.ConfigGroup import * -from wizards.common.ConfigGroup import * +from ..common.ConfigGroup import * +from ..common.ConfigGroup import * class CGFax(ConfigGroup): diff --git a/wizards/com/sun/star/wizards/fax/CGFaxWizard.py b/wizards/com/sun/star/wizards/fax/CGFaxWizard.py index 40e685322ab1..0cfbeb33a05d 100644 --- a/wizards/com/sun/star/wizards/fax/CGFaxWizard.py +++ b/wizards/com/sun/star/wizards/fax/CGFaxWizard.py @@ -15,9 +15,9 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -from wizards.common.ConfigGroup import * -from wizards.common.ConfigGroup import * -from wizards.fax.CGFax import CGFax +from .CGFax import CGFax +from ..common.ConfigGroup import * +from ..common.ConfigGroup import * class CGFaxWizard(ConfigGroup): diff --git a/wizards/com/sun/star/wizards/fax/CallWizard.py b/wizards/com/sun/star/wizards/fax/CallWizard.py index c9e472e3f9e6..3fbbac173bf9 100644 --- a/wizards/com/sun/star/wizards/fax/CallWizard.py +++ b/wizards/com/sun/star/wizards/fax/CallWizard.py @@ -15,39 +15,38 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - import uno import unohelper import traceback +from .FaxWizardDialogImpl import FaxWizardDialogImpl + from com.sun.star.task import XJobExecutor -from wizards.fax.FaxWizardDialogImpl import FaxWizardDialogImpl # implement a UNO component by deriving from the standard unohelper.Base class # and from the interface(s) you want to implement. class CallWizard(unohelper.Base, XJobExecutor): - def __init__(self, ctx): - # store the component context for later use - self.ctx = ctx + def __init__(self, ctx): + # store the component context for later use + self.ctx = ctx - def trigger(self, args): - try: - fw = FaxWizardDialogImpl(self.ctx.ServiceManager) - fw.startWizard(self.ctx.ServiceManager) - except Exception as e: - print ("Wizard failure exception " + str(type(e)) + - " message " + str(e) + " args " + str(e.args) + - traceback.format_exc()); + def trigger(self, args): + print "hello" + try: + fw = FaxWizardDialogImpl(self.ctx.ServiceManager) + fw.startWizard(self.ctx.ServiceManager) + except Exception as e: + print ("Wizard failure exception " + str(type(e)) + + " message " + str(e) + " args " + str(e.args) + + traceback.format_exc()) # pythonloader looks for a static g_ImplementationHelper variable g_ImplementationHelper = unohelper.ImplementationHelper() g_ImplementationHelper.addImplementation( \ - CallWizard, # UNO object class - "com.sun.star.wizards.fax.CallWizard", # implemenation name - ("com.sun.star.task.Job",),) # list of implemented services - # (the only service) + CallWizard, # UNO object class + "com.sun.star.wizards.fax.CallWizard", # implemenation name + ("com.sun.star.task.Job",),) # list of implemented services + # (the only service) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/wizards/com/sun/star/wizards/fax/FaxDocument.py b/wizards/com/sun/star/wizards/fax/FaxDocument.py index 2a8449d18c21..18543d6ff3ec 100644 --- a/wizards/com/sun/star/wizards/fax/FaxDocument.py +++ b/wizards/com/sun/star/wizards/fax/FaxDocument.py @@ -15,10 +15,9 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -from wizards.text.TextDocument import * -from wizards.text.TextDocument import * -from wizards.text.TextSectionHandler import TextSectionHandler -from wizards.common.PropertyNames import PropertyNames +from ..text.TextDocument import * +from ..text.TextSectionHandler import TextSectionHandler +from ..common.PropertyNames import PropertyNames from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK from com.sun.star.style.ParagraphAdjust import CENTER diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py index 2c3b09db8177..4da2c4cfb79c 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py @@ -15,10 +15,9 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -import wizards.ui.UIConsts -from wizards.ui.WizardDialog import * -from wizards.fax.FaxWizardDialogResources import FaxWizardDialogResources -from wizards.fax.FaxWizardDialogConst import * +from .FaxWizardDialogResources import FaxWizardDialogResources +from .FaxWizardDialogConst import * +from ..ui.WizardDialog import * from com.sun.star.awt.FontUnderline import SINGLE diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py index 84d5013bf9b3..1f1de57beb07 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py @@ -15,8 +15,7 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -from wizards.common.HelpIds import HelpIds - +from ..common.HelpIds import HelpIds OPTBUSINESSFAX_ITEM_CHANGED = "optBusinessFaxItemChanged" LSTBUSINESSSTYLE_ACTION_PERFORMED = None # "lstBusinessStyleActionPerformed" diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py index 07dec8df1d4a..980a28f3ffd0 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py @@ -15,17 +15,16 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -from wizards.fax.FaxWizardDialog import * -from wizards.fax.FaxWizardDialog import * -from wizards.fax.CGFaxWizard import * -from wizards.fax.FaxDocument import * -from wizards.ui.PathSelection import PathSelection -from wizards.common.FileAccess import FileAccess -from wizards.ui.event.UnoDataAware import UnoDataAware -from wizards.ui.event.RadioDataAware import RadioDataAware -from wizards.text.TextFieldHandler import TextFieldHandler -from wizards.common.SystemDialog import SystemDialog -from wizards.common.NoValidPathException import NoValidPathException +from .FaxWizardDialog import * +from .CGFaxWizard import * +from .FaxDocument import * +from ..ui.PathSelection import PathSelection +from ..common.FileAccess import FileAccess +from ..ui.event.UnoDataAware import UnoDataAware +from ..ui.event.RadioDataAware import RadioDataAware +from ..text.TextFieldHandler import TextFieldHandler +from ..common.SystemDialog import SystemDialog +from ..common.NoValidPathException import NoValidPathException from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO from com.sun.star.uno import RuntimeException @@ -66,12 +65,8 @@ class FaxWizardDialogImpl(FaxWizardDialog): "uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext" xLocMSF = Desktop.connect(ConnectStr) lw = FaxWizardDialogImpl(xLocMSF) - lw.startWizard(xLocMSF, None) - except RuntimeException, e: - # TODO Auto-generated catch block - traceback.print_exc() + lw.startWizard(xLocMSF) except Exception, e: - # TODO Auto-generated catch blocksetMaxStep traceback.print_exc() def startWizard(self, xMSF): diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py index d96d24371ae1..c057a5afc6ed 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py @@ -15,7 +15,7 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -from wizards.common.Resource import Resource +from ..common.Resource import Resource class FaxWizardDialogResources(Resource): MODULE_NAME = "dbw" diff --git a/wizards/com/sun/star/wizards/fax/__init__.py b/wizards/com/sun/star/wizards/fax/__init__.py index 1ad913ad7b52..8b137891791f 100644 --- a/wizards/com/sun/star/wizards/fax/__init__.py +++ b/wizards/com/sun/star/wizards/fax/__init__.py @@ -1,2 +1 @@ -__all__ = ['CallWizard', 'CGFax', 'GCFaxWizard', 'FaxDocument', 'FaxWizardDialogConst', - 'FaxWizardDialogImpl', 'FaxWizardDialog', 'FaxWizardDialogResources'] + diff --git a/wizards/com/sun/star/wizards/remote.py b/wizards/com/sun/star/wizards/remote.py new file mode 100755 index 000000000000..db54e8229a68 --- /dev/null +++ b/wizards/com/sun/star/wizards/remote.py @@ -0,0 +1,8 @@ +#!/usr/bin/env python + +import uno +from fax.FaxWizardDialogImpl import FaxWizardDialogImpl +import sys + +if __name__ == "__main__": + FaxWizardDialogImpl.main(sys.argv) diff --git a/wizards/com/sun/star/wizards/text/TextDocument.py b/wizards/com/sun/star/wizards/text/TextDocument.py index 824cafb8539e..2dea2ceb3899 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.py +++ b/wizards/com/sun/star/wizards/text/TextDocument.py @@ -19,12 +19,12 @@ import uno import traceback import time from datetime import date as dateTimeObject -from wizards.common.Desktop import Desktop -from wizards.common.Helper import Helper -from wizards.document.OfficeDocument import OfficeDocument -from wizards.text.ViewHandler import ViewHandler -from wizards.text.TextFieldHandler import TextFieldHandler -from wizards.common.Configuration import Configuration +from .ViewHandler import ViewHandler +from .TextFieldHandler import TextFieldHandler +from ..common.Desktop import Desktop +from ..common.Helper import Helper +from ..document.OfficeDocument import OfficeDocument +from ..common.Configuration import Configuration from com.sun.star.container import NoSuchElementException from com.sun.star.lang import WrappedTargetException diff --git a/wizards/com/sun/star/wizards/text/TextFieldHandler.py b/wizards/com/sun/star/wizards/text/TextFieldHandler.py index 90f0447e3d65..25c3703b1820 100644 --- a/wizards/com/sun/star/wizards/text/TextFieldHandler.py +++ b/wizards/com/sun/star/wizards/text/TextFieldHandler.py @@ -18,7 +18,7 @@ import traceback import time import unicodedata -from wizards.common.PropertyNames import PropertyNames +from ..common.PropertyNames import PropertyNames from com.sun.star.util import DateTime diff --git a/wizards/com/sun/star/wizards/text/TextSectionHandler.py b/wizards/com/sun/star/wizards/text/TextSectionHandler.py index 6056ea9af028..8d8c52d1a7b6 100644 --- a/wizards/com/sun/star/wizards/text/TextSectionHandler.py +++ b/wizards/com/sun/star/wizards/text/TextSectionHandler.py @@ -17,7 +17,7 @@ # import uno import traceback -from wizards.common.Helper import Helper +from ..common.Helper import Helper class TextSectionHandler(object): '''Creates a new instance of TextSectionHandler''' diff --git a/wizards/com/sun/star/wizards/ui/ImageList.py b/wizards/com/sun/star/wizards/ui/ImageList.py index 333aa29752e0..1a6b8ddbc550 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.py +++ b/wizards/com/sun/star/wizards/ui/ImageList.py @@ -16,10 +16,10 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # from threading import RLock -from wizards.ui.PeerConfig import PeerConfig -from wizards.common.PropertyNames import * -from wizards.common.HelpIds import HelpIds -from wizards.common.Helper import Helper +from .PeerConfig import PeerConfig +from ..common.PropertyNames import * +from ..common.HelpIds import HelpIds +from ..common.Helper import Helper from com.sun.star.awt import Size diff --git a/wizards/com/sun/star/wizards/ui/PathSelection.py b/wizards/com/sun/star/wizards/ui/PathSelection.py index ac6b50522b92..37040a6a8a30 100644 --- a/wizards/com/sun/star/wizards/ui/PathSelection.py +++ b/wizards/com/sun/star/wizards/ui/PathSelection.py @@ -16,9 +16,9 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import traceback -from wizards.common.PropertyNames import * -from wizards.common.FileAccess import * -from wizards.common.SystemDialog import SystemDialog +from ..common.PropertyNames import * +from ..common.FileAccess import * +from ..common.SystemDialog import SystemDialog class PathSelection(object): diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.py b/wizards/com/sun/star/wizards/ui/PeerConfig.py index e37c1ac7a2cd..442e42159b29 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.py +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.py @@ -15,7 +15,7 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -from wizards.ui.event.CommonListener import WindowListenerProcAdapter +from .event.CommonListener import WindowListenerProcAdapter ''' @author rpiterman diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.py b/wizards/com/sun/star/wizards/ui/UnoDialog.py index 05459f430910..98657326dc0b 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.py +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.py @@ -17,10 +17,9 @@ # import uno import traceback -import wizards.ui.UIConsts -from wizards.common.PropertyNames import PropertyNames -from wizards.common.Helper import Helper -from wizards.ui.PeerConfig import PeerConfig +from .PeerConfig import PeerConfig +from ..common.PropertyNames import PropertyNames +from ..common.Helper import Helper from com.sun.star.awt import Rectangle from com.sun.star.awt.PosSize import POS diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.py b/wizards/com/sun/star/wizards/ui/UnoDialog2.py index 465687285bbd..943fdffddb19 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog2.py +++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.py @@ -15,11 +15,10 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -from wizards.ui.UIConsts import * -from wizards.ui.UIConsts import * -from wizards.ui.UnoDialog import * -from wizards.ui.event.CommonListener import * -from wizards.common.Desktop import Desktop +from .UIConsts import * +from .UnoDialog import * +from .event.CommonListener import * +from ..common.Desktop import Desktop ''' This class contains convenience methods for inserting components to a dialog. diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py index 3f93f135c99b..ab7104c558c9 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.py +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py @@ -15,14 +15,13 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -import wizards.ui.UIConsts -from wizards.ui.UnoDialog2 import * from abc import ABCMeta, abstractmethod -from wizards.common.Resource import Resource -from wizards.ui.XPathSelectionListener import XPathSelectionListener -from wizards.common.HelpIds import * -from wizards.document.OfficeDocument import OfficeDocument -from wizards.text.TextDocument import TextDocument +from .UnoDialog2 import * +from .XPathSelectionListener import XPathSelectionListener +from ..common.Resource import Resource +from ..common.HelpIds import * +from ..document.OfficeDocument import OfficeDocument +from ..text.TextDocument import TextDocument from com.sun.star.lang import NoSuchMethodException from com.sun.star.lang import IllegalArgumentException diff --git a/wizards/com/sun/star/wizards/ui/event/CommonListener.py b/wizards/com/sun/star/wizards/ui/event/CommonListener.py index c94ae418036c..2a6ef5b68fb9 100644 --- a/wizards/com/sun/star/wizards/ui/event/CommonListener.py +++ b/wizards/com/sun/star/wizards/ui/event/CommonListener.py @@ -30,12 +30,10 @@ # Change Log # Danny Brewer Revised 2004-06-05-01 # -#********************************************************************** - -# OOo's libraries import unohelper from com.sun.star.awt import XActionListener + class ActionListenerProcAdapter( unohelper.Base, XActionListener ): def __init__( self, oProcToCall, tParams=() ): self.oProcToCall = oProcToCall # a python procedure diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.py b/wizards/com/sun/star/wizards/ui/event/DataAware.py index 4ffaf902bf39..8a9f08d36e65 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAware.py +++ b/wizards/com/sun/star/wizards/ui/event/DataAware.py @@ -17,8 +17,8 @@ # import traceback from abc import ABCMeta, abstractmethod -from wizards.common.PropertyNames import * -from wizards.ui.event.CommonListener import * +from .CommonListener import * +from ...common.PropertyNames import * ''' @author rpiterman diff --git a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py index c4f26f4d69b6..cd255ff10321 100644 --- a/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py +++ b/wizards/com/sun/star/wizards/ui/event/ListModelBinder.py @@ -15,7 +15,7 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -from wizards.common.Helper import Helper +from ...common.Helper import Helper class ListModelBinder(object): diff --git a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.py b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.py index 6e0feb5b850b..fa30c4d8beb9 100644 --- a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.py +++ b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.py @@ -15,15 +15,10 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -from wizards.ui.event.DataAware import * -from wizards.ui.event.DataAware import * -from wizards.ui.event.UnoDataAware import * import time -''' -@author rpiterman -To change the template for this generated type comment go to -Window>Preferences>Java>Code Generation>Code and Comments -''' +from .DataAware import * +from .DataAware import * +from .UnoDataAware import * class RadioDataAware(DataAware): diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py index e2cebda8391d..4cc5a3e4f25c 100644 --- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py +++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py @@ -15,9 +15,9 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -from wizards.ui.event.DataAware import * -from wizards.ui.event.DataAware import * -from wizards.common.Helper import * +from .DataAware import * +from .DataAware import * +from ...common.Helper import * ''' @author rpiterman -- cgit