Merge lp:~zorba-coders/zorba/bug-1158052-data-formatting into lp:zorba/data-formatting-module

Proposed by Paul J. Lucas on 2013-06-22
Status: Merged
Merged at revision: 45
Proposed branch: lp:~zorba-coders/zorba/bug-1158052-data-formatting
Merge into: lp:zorba/data-formatting-module
Diff against target: 14 lines (+2/-2)
1 file modified
src/com/zorba-xquery/www/modules/xsl-fo.xq.src/xslfo.cpp (+2/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1158052-data-formatting
Reviewer Review Type Date Requested Status
Chris Hillery 2013-06-22 Approve on 2013-06-28
Paul J. Lucas Approve on 2013-06-22
Review via email: mp+170944@code.launchpad.net

Commit message

Corresponding changes for bug #1158052.

Description of the change

Corresponding changes for bug #1158052.

To post a comment you must log in.
Paul J. Lucas (paul-lucas) :
review: Approve
Chris Hillery (ceejatec) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/com/zorba-xquery/www/modules/xsl-fo.xq.src/xslfo.cpp'
2--- src/com/zorba-xquery/www/modules/xsl-fo.xq.src/xslfo.cpp 2013-06-12 13:52:59 +0000
3+++ src/com/zorba-xquery/www/modules/xsl-fo.xq.src/xslfo.cpp 2013-06-22 13:09:26 +0000
4@@ -231,8 +231,8 @@
5
6 std::string lBinaryString((const char*) dataElements, dataSize);
7 std::stringstream lStream(lBinaryString);
8- String base64S = base64::encode(lStream);
9- Item lRes = theFactory->createBase64Binary(base64S.c_str(), base64S.length());
10+ String base64S( base64::encode(lStream) );
11+ Item lRes( theFactory->createBase64Binary(base64S.c_str(), base64S.length(), true) );
12 return ItemSequence_t(new SingletonItemSequence(lRes));
13 } catch (zorba::jvm::VMOpenException&) {
14 Item lQName = theFactory->createQName("http://www.zorba-xquery.com/modules/xsl-fo",

Subscribers

People subscribed via source and target branches

to all changes: