[Libreoffice-commits] core.git: 2 commits - bin/convwatch.py sw/source
Michael Stahl (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jan 16 11:17:36 UTC 2020
bin/convwatch.py | 5 ++++-
sw/source/filter/ww8/wrtw8nds.cxx | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 8f2d1ff0f745b056799a783ca973bd6d579b5bfc
Author: Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Jan 15 18:23:51 2020 +0100
Commit: Michael Stahl <michael.stahl at cib.de>
CommitDate: Thu Jan 16 12:17:07 2020 +0100
convwatch: handle Win32 absolute path as directory
Change-Id: I5952665d14b2cee64f40db69dbb9508b1abb97bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86871
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at cib.de>
diff --git a/bin/convwatch.py b/bin/convwatch.py
index 51a4f55dee6b..55849fdfb081 100644
--- a/bin/convwatch.py
+++ b/bin/convwatch.py
@@ -319,7 +319,10 @@ class LoadPrintFileTest:
log("Time: " + str(start) + " Loading document: " + self.file)
xDoc = None
try:
- url = "file://" + quote(self.file)
+ if os.name == 'nt' and self.file[1] == ':':
+ url = "file:///" + self.file[0:2] + quote(self.file[2:])
+ else:
+ url = "file://" + quote(self.file)
xDoc = loadFromURL(xContext, url)
printDoc(xContext, xDoc, url + self.prtsuffix)
finally:
commit 9982b1dd7b6aff9e0a35f7157491be120874196d
Author: Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Jan 15 16:43:41 2020 +0100
Commit: Michael Stahl <michael.stahl at cib.de>
CommitDate: Thu Jan 16 12:16:54 2020 +0100
sw: replace hardcoded CH_TXTATR_BREAKWORD
Change-Id: I5828fa3de469b65ed84a2a00c65f309de7d54f9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86861
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at cib.de>
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 9d20bff30617..da7bc1de87e7 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2275,7 +2275,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
3) If the anchor is associated with a text node with empty text then we ignore.
*/
if( rNode.IsTextNode()
- && aStr != "\001" && !aStr.isEmpty()
+ && aStr != OUStringChar(CH_TXTATR_BREAKWORD) && !aStr.isEmpty()
&& !rNode.GetFlyFormat()
&& !(IsInTable() && !AllowPostponedTextInTable())
&& aAttrIter.IsAnchorLinkedToThisNode(rNode.GetIndex()) )
More information about the Libreoffice-commits
mailing list