[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - xmloff/source

[Eike Rathke]

 xmloff/source/style/escphdl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 775b75a696deb0ea1cc758aee8250663ddfc1d3a
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Nov 17 19:52:10 2016 +0100

    ODF: do not write an empty style:text-position="" attribute for CharEscapement
    
    ... and CharEscapementHeight if the Any is void.
    This was a real error complained about in the officeotron validation
    https://bugs.documentfoundation.org/attachment.cgi?id=128411
    https://bugs.documentfoundation.org/show_bug.cgi?id=103493
    
    Also showed up as console warning
    
    	warn:legacy.osl:3269:1:xmloff/source/core/xmlerror.cxx:178: An error or a warning has occurred during XML import/export!
    	Error-Id: 0x20040003
    		Flags: 2 ERROR
    		Class: 4 API
    		Number: 3
    	Parameters:
    		0: CharEscapement
    	Exception-Message: UNKNOWN_PROPERTY
    	Position:
    		Public Identifier:
    		System Identifier: file:///.../103493-LotroPlan%203.8.ods
    		Row, Column: 2,1850164
    
    Change-Id: Ifc634cc6b3d5d6dfa43741005ef0c9a1f7ff71fe
    (cherry picked from commit 8aec9057a169acfda6f2d986af93edca54677fd2)
    Reviewed-on: https://gerrit.libreoffice.org/30939
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx
index 9573706..9528f3b 100644
--- a/xmloff/source/style/escphdl.cxx
+++ b/xmloff/source/style/escphdl.cxx
@@ -95,7 +95,7 @@ bool XMLEscapementPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV
     }
 
     rStrExpValue = aOut.makeStringAndClear();
-    return true;
+    return !rStrExpValue.isEmpty();
 }