pyuno/source/loader/pythonloader.py | 2 +- pyuno/source/module/unohelper.py | 4 ---- testtools/source/bridgetest/pyuno/impl.py | 2 +- wizards/com/sun/star/wizards/document/OfficeDocument.py | 4 ++-- 4 files changed, 4 insertions(+), 8 deletions(-)
New commits: commit b0390a4d1b0063c0e494f037bbf06114755cfc6e Author: Mike Kaganski <[email protected]> AuthorDate: Sun Nov 16 20:49:30 2025 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Sun Nov 16 19:10:57 2025 +0100 Drop unohelper.absolutize, and use uno.absolutize to avoid duplication Change-Id: I9e3b10c5c9b0a0ef1af66c99732bb217d37c3851 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194073 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Jenkins diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py index d261b0188b6e..a1c9ba48b131 100644 --- a/pyuno/source/loader/pythonloader.py +++ b/pyuno/source/loader/pythonloader.py @@ -85,7 +85,7 @@ class Loader(XImplementationLoader, XServiceInfo, unohelper.Base): try: if "file" == protocol: # remove \..\ sequence, which may be useful e.g. in the build env - url = unohelper.absolutize(url, url) + url = uno.absolutize(url, url) # did we load the module already ? mod = g_loadedComponents.get(url) diff --git a/pyuno/source/module/unohelper.py b/pyuno/source/module/unohelper.py index cf6f78d63b32..dc4867d5fac8 100644 --- a/pyuno/source/module/unohelper.py +++ b/pyuno/source/module/unohelper.py @@ -183,10 +183,6 @@ def fileUrlToSystemPath( url ): "returns a system path (determined by the system, the python interpreter is running on)" return pyuno.fileUrlToSystemPath( url ) -def absolutize( path, relativeUrl ): - "returns an absolute file url from the given urls" - return pyuno.absolutize( path, relativeUrl ) - def getComponentFactoryHelper( implementationName, smgr, regKey, seqEntries ): for x in seqEntries: if x.implName == implementationName: diff --git a/testtools/source/bridgetest/pyuno/impl.py b/testtools/source/bridgetest/pyuno/impl.py index 5cf296cfadcc..f569b393e651 100644 --- a/testtools/source/bridgetest/pyuno/impl.py +++ b/testtools/source/bridgetest/pyuno/impl.py @@ -135,7 +135,7 @@ class TestHelperCase( unittest.TestCase ): self.assertTrue( "file:///c:/temp" == unohelper.systemPathToFileUrl( "c:\temp" ) ) systemPath = unohelper.systemPathToFileUrl( systemPath ) - self.assertTrue( systemPath + "/a" == unohelper.absolutize( systemPath, "a" ) ) + self.assertTrue( systemPath + "/a" == uno.absolutize( systemPath, "a" ) ) def testInspect( self ): dev = NullDevice() # dev = sys.stdout diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py b/wizards/com/sun/star/wizards/document/OfficeDocument.py index 1483f902da17..074cc904d7cb 100644 --- a/wizards/com/sun/star/wizards/document/OfficeDocument.py +++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py @@ -17,7 +17,7 @@ # import uno import traceback -from unohelper import systemPathToFileUrl, absolutize +from unohelper import systemPathToFileUrl from ..common.Desktop import Desktop from ..common.SystemDialog import SystemDialog @@ -174,7 +174,7 @@ class OfficeDocument(object): sPath = StorePath[:(StorePath.rfind("/") + 1)] sFile = StorePath[(StorePath.rfind("/") + 1):] xComponent.storeToURL( - absolutize(sPath, sFile), tuple(oStoreProperties)) + uno.absolutize(sPath, sFile), tuple(oStoreProperties)) return True except ErrorCodeIOException: #Throw this exception when trying to save a file
