[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - wizards/source
Alex McMurchy1917
mcmurchy1917-libreoffice at yahoo.co.uk
Fri Jan 20 08:57:44 UTC 2017
wizards/source/tools/Strings.xba | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bf7f3c0baabf0a8e74687ca192ff59c8f3d06207
Author: Alex McMurchy1917 <mcmurchy1917-libreoffice at yahoo.co.uk>
Date: Tue Dec 6 13:02:26 2016 +0000
Fixes tdf#104412 - DirectoryNameoutofPath no longer works
In the macro tools library the subroutine GetFileNameWithoutExtension
has a missing bracket in the last line. This confuses the following
subroutine DirectoryNameoutofPath causing it to fail.
This only came to light after the introduction of commit
"tdf#80731 Closing parenthesis is now detected (Mid statement and functions)."
which tightened up on syntax validation.
This commit adds in the missing bracket to subroutine
GetFileNameWithoutExtension in the macro tools library.
Change-Id: I015c88a29a933cd42b7a7623a9ae70d090739c54
Reviewed-on: https://gerrit.libreoffice.org/31677
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens at cib.de>
(cherry picked from commit 08befaceb65bf2f0f0e8ec976f7826be8f5dd7d7)
Reviewed-on: https://gerrit.libreoffice.org/31695
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
(cherry picked from commit b1f739b2bc227f81b1ec740e05927e866fa81d94)
Reviewed-on: https://gerrit.libreoffice.org/33340
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/wizards/source/tools/Strings.xba b/wizards/source/tools/Strings.xba
index 6938938..4c2802f 100644
--- a/wizards/source/tools/Strings.xba
+++ b/wizards/source/tools/Strings.xba
@@ -345,7 +345,7 @@ Dim SepList() as String
FileName = FileNameoutofPath(FileName, Separator)
End If
SepList() = ArrayoutofString(FileName,".", MaxIndex)
- GetFileNameWithoutExtension = RTrimStr(FileName, "." & SepList(MaxIndex)
+ GetFileNameWithoutExtension = RTrimStr(FileName, "." & SepList(MaxIndex))
End Function
More information about the Libreoffice-commits
mailing list