buildbot failure in ASF Buildbot on openoffice-fbsd-nightly
The Buildbot has detected a failed build on builder openoffice-fbsd-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/143 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-fbsd2_64bit Build Reason: The Nightly scheduler named 'openoffice-fbsd-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: BUILD FAILED: failed sincerely, -The Buildbot
svn commit: r925300 - in /websites/production/ooo-site: cgi-bin/ content/
Author: astepukonis Date: Fri Oct 10 20:04:52 2014 New Revision: 925300 Log: Publishing svnmucc operation to ooo-site site by astepukonis Added: websites/production/ooo-site/cgi-bin/ - copied from r925299, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r925299, websites/staging/ooo-site/trunk/content/
svn commit: r925299 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/lt/download/msg_prop_l10n_lt.js
Author: buildbot Date: Fri Oct 10 20:04:19 2014 New Revision: 925299 Log: Staging update by buildbot for ooo-site Modified: websites/staging/ooo-site/trunk/cgi-bin/ (props changed) websites/staging/ooo-site/trunk/content/ (props changed) websites/staging/ooo-site/trunk/content/lt/download/msg_prop_l10n_lt.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Fri Oct 10 20:04:19 2014 @@ -1 +1 @@ -1630529 +1630972 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Fri Oct 10 20:04:19 2014 @@ -1 +1 @@ -1630529 +1630972 Modified: websites/staging/ooo-site/trunk/content/lt/download/msg_prop_l10n_lt.js == --- websites/staging/ooo-site/trunk/content/lt/download/msg_prop_l10n_lt.js (original) +++ websites/staging/ooo-site/trunk/content/lt/download/msg_prop_l10n_lt.js Fri Oct 10 20:04:19 2014 @@ -348,6 +348,7 @@ l10n.dl_analyze_table_javascript_text = // General: Links to webpage files that could be localized. +l10n.dl_rel_notes_aoo411_link = "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.1+Release+Notes";; l10n.dl_rel_notes_aoo410_link = "http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes";; l10n.dl_rel_notes_aoo401_link = "http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0.1+Release+Notes";; l10n.dl_rel_notes_aoo400_link = "http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes";;
svn commit: r1630972 - /openoffice/ooo-site/trunk/content/lt/download/msg_prop_l10n_lt.js
Author: astepukonis Date: Fri Oct 10 20:01:55 2014 New Revision: 1630972 URL: http://svn.apache.org/r1630972 Log: Added string for 4.1.1. release notes link Modified: openoffice/ooo-site/trunk/content/lt/download/msg_prop_l10n_lt.js Modified: openoffice/ooo-site/trunk/content/lt/download/msg_prop_l10n_lt.js URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/lt/download/msg_prop_l10n_lt.js?rev=1630972&r1=1630971&r2=1630972&view=diff == --- openoffice/ooo-site/trunk/content/lt/download/msg_prop_l10n_lt.js (original) +++ openoffice/ooo-site/trunk/content/lt/download/msg_prop_l10n_lt.js Fri Oct 10 20:01:55 2014 @@ -348,6 +348,7 @@ l10n.dl_analyze_table_javascript_text = // General: Links to webpage files that could be localized. +l10n.dl_rel_notes_aoo411_link = "https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.1+Release+Notes";; l10n.dl_rel_notes_aoo410_link = "http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes";; l10n.dl_rel_notes_aoo401_link = "http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0.1+Release+Notes";; l10n.dl_rel_notes_aoo400_link = "http://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes";;
svn commit: r1630928 - in /openoffice/trunk/main/svgio: inc/svgio/svgreader/svgtools.hxx source/svgreader/svgdocumenthandler.cxx source/svgreader/svgtools.cxx
Author: alg Date: Fri Oct 10 15:52:52 2014 New Revision: 1630928 URL: http://svn.apache.org/r1630928 Log: i125325 added code to handle block comments in Css style definitions Modified: openoffice/trunk/main/svgio/inc/svgio/svgreader/svgtools.hxx openoffice/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx openoffice/trunk/main/svgio/source/svgreader/svgtools.cxx Modified: openoffice/trunk/main/svgio/inc/svgio/svgreader/svgtools.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svgio/inc/svgio/svgreader/svgtools.hxx?rev=1630928&r1=1630927&r2=1630928&view=diff == --- openoffice/trunk/main/svgio/inc/svgio/svgreader/svgtools.hxx (original) +++ openoffice/trunk/main/svgio/inc/svgio/svgreader/svgtools.hxx Fri Oct 10 15:52:52 2014 @@ -236,6 +236,10 @@ namespace svgio rtl::OUString whiteSpaceHandlingDefault(const rtl::OUString& rCandidate); rtl::OUString whiteSpaceHandlingPreserve(const rtl::OUString& rCandidate); +// #125325# removes block comment of the general form '/* ... */', returns +// an adapted string or the original if no comments included +rtl::OUString removeBlockComments(const rtl::OUString& rCandidate); + } // end of namespace svgreader } // end of namespace svgio Modified: openoffice/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx?rev=1630928&r1=1630927&r2=1630928&view=diff == --- openoffice/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx (original) +++ openoffice/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx Fri Oct 10 15:52:52 2014 @@ -512,7 +512,16 @@ namespace svgio if(maCssContents.size()) { // need to interpret css styles and remember them as StyleSheets -pCssStyle->addCssStyleSheet(*(maCssContents.end() - 1)); +// #125325# Caution! the Css content may contain block comments +// (see http://www.w3.org/wiki/CSS_basics#CSS_comments). These need +// to be removed first +const rtl::OUString aCommentFreeSource(removeBlockComments(*(maCssContents.end() - 1))); + +if(aCommentFreeSource.getLength()) +{ +pCssStyle->addCssStyleSheet(aCommentFreeSource); +} + maCssContents.pop_back(); } else Modified: openoffice/trunk/main/svgio/source/svgreader/svgtools.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svgio/source/svgreader/svgtools.cxx?rev=1630928&r1=1630927&r2=1630928&view=diff == --- openoffice/trunk/main/svgio/source/svgreader/svgtools.cxx (original) +++ openoffice/trunk/main/svgio/source/svgreader/svgtools.cxx Fri Oct 10 15:52:52 2014 @@ -1538,6 +1538,57 @@ namespace svgio return rCandidate; } +// #125325# +rtl::OUString removeBlockComments(const rtl::OUString& rCandidate) +{ +const sal_Int32 nLen(rCandidate.getLength()); + +if(nLen) +{ +sal_Int32 nPos(0); +rtl::OUStringBuffer aBuffer; +bool bChanged(false); +sal_Int32 nInsideComment(0); +const sal_Unicode aCommentSlash('/'); +const sal_Unicode aCommentStar('*'); + +while(nPos < nLen) +{ +const sal_Unicode aChar(rCandidate[nPos]); +const bool bStart(aCommentSlash == aChar && nPos + 1 < nLen && aCommentStar == rCandidate[nPos + 1]); +const bool bEnd(aCommentStar == aChar && nPos + 1 < nLen && aCommentSlash == rCandidate[nPos + 1]); + +if(bStart) +{ +nPos += 2; +nInsideComment++; +bChanged = true; +} +else if(bEnd) +{ +nPos += 2; +nInsideComment--; +} +else +{ +if(!nInsideComment) +{ +aBuffer.append(aChar); +} + +nPos++; +} +} + +if(bChanged) +{ +return aBuffer.makeStringAndClear(); +} +} + +return rCandidate; +} + rtl::OUString cons
svn commit: r1630814 - /openoffice/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx
Author: alg Date: Fri Oct 10 12:50:29 2014 New Revision: 1630814 URL: http://svn.apache.org/r1630814 Log: i125326 accept CssStyles with missing type attribute Modified: openoffice/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx Modified: openoffice/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx?rev=1630814&r1=1630813&r2=1630814&view=diff == --- openoffice/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx (original) +++ openoffice/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx Fri Oct 10 12:50:29 2014 @@ -330,10 +330,26 @@ namespace svgio { SvgStyleNode* pNew = new SvgStyleNode(maDocument, mpTarget); mpTarget = pNew; -mpTarget->parseAttributes(xAttribs); +const sal_uInt32 nAttributes(xAttribs->getLength()); + +if(0 == nAttributes) +{ +// #125326# no attributes, thus also no type="text/css". This is allowed to be missing, +// thus do mark this style as CssStyle. This is required to read the contained +// text (which defines the css style) +pNew->setTextCss(true); +} +else +{ +// #125326# there are attributes, read them. This will set isTextCss to true if +// a type="text/css" is contained as exact match, else not +mpTarget->parseAttributes(xAttribs); +} if(pNew->isTextCss()) { +// if it is a Css style, allow reading text between the start and end tag (see +// SvgDocHdl::characters for details) maCssContents.push_back(rtl::OUString()); } break;
buildbot success in ASF Buildbot on openoffice-linux64-nightly
The Buildbot has detected a passing build on builder openoffice-linux64-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/157 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
buildbot success in ASF Buildbot on aoo-win7
The Buildbot has detected a passing build on builder aoo-win7 while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/aoo-win7/builds/179 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-win7 Build Reason: The Nightly scheduler named 'aoo-win7-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
buildbot success in ASF Buildbot on openoffice-linux32-nightly
The Buildbot has detected a passing build on builder openoffice-linux32-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/174 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm2_ubuntu_32bit Build Reason: The Nightly scheduler named 'openoffice-linux32-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot