buildbot success in ASF Buildbot on aoo-win7

2014-07-03 Thread buildbot 
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/71

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

2014-07-03 Thread buildbot 
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/73

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

buildbot success in ASF Buildbot on openoffice-linux64-nightly

2014-07-03 Thread buildbot 
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/68

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

svn commit: r1607610 - /openoffice/trunk/main/sysui/desktop/debian/makefile.mk

2014-07-03 Thread hdu 
Author: hdu
Date: Thu Jul  3 12:35:27 2014
New Revision: 1607610

URL: http://svn.apache.org/r1607610
Log:
#i125176# fix the Debian control-file-bad-permission problem

Modified:
openoffice/trunk/main/sysui/desktop/debian/makefile.mk

Modified: openoffice/trunk/main/sysui/desktop/debian/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/debian/makefile.mk?rev=1607610r1=1607609r2=1607610view=diff
==
--- openoffice/trunk/main/sysui/desktop/debian/makefile.mk (original)
+++ openoffice/trunk/main/sysui/desktop/debian/makefile.mk Thu Jul  3 12:35:27 
2014
@@ -81,7 +81,7 @@ $(DEBFILES) : makefile.mk control postin
-$(RM) $(@:d)$(@:f:s/_/ /:1)_*
$(RM) -r $(MISC)$/$(@:b)
dmake $(MISC)$/$(@:b)$/DEBIAN$/{control postinst postrm prerm} 
-   @chmod -R o-w $(MISC)$/$(@:b)
+   @chmod -R go-w $(MISC)$/$(@:b)
@chmod a+rx $(MISC)$/$(@:b)$/DEBIAN $(MISC)/$(@:b)/DEBIAN/post* 
$(MISC)/$(@:b)/DEBIAN/pre*
@chmod g-s $(MISC)/$(@:b)/DEBIAN
@mkdir -p $(PKGDIR)

svn commit: r1607619 - /openoffice/trunk/main/sysui/desktop/debian/control

2014-07-03 Thread hdu 
Author: hdu
Date: Thu Jul  3 12:50:04 2014
New Revision: 1607619

URL: http://svn.apache.org/r1607619
Log:
#i125176# add Debian package maintainer and extended description

the package maintainer is a to-be-created email alias to the target that
will be decided by the Apache OpenOffice PMC.

Modified:
openoffice/trunk/main/sysui/desktop/debian/control

Modified: openoffice/trunk/main/sysui/desktop/debian/control
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/debian/control?rev=1607619r1=1607618r2=1607619view=diff
==
--- openoffice/trunk/main/sysui/desktop/debian/control (original)
+++ openoffice/trunk/main/sysui/desktop/debian/control Thu Jul  3 12:50:04 2014
@@ -1,5 +1,6 @@
 Description: %productname desktop integration
-Maintainer: Apache Software Foundation
+ This package provides desktop icons and menus for %productname
+Maintainer: Apache Software Foundation packag...@openoffice.apache.org
 Architecture: all
 Provides: openoffice-desktop-integration, openoffice.org-unbundled
 Conflicts: openoffice-desktop-integration, openofficeorg-desktop-integration, 
openoffice.org-debian-menus

svn commit: r1607649 - /openoffice/trunk/main/sw/source/core/doc/notxtfrm.cxx

2014-07-03 Thread alg 
Author: alg
Date: Thu Jul  3 13:58:29 2014
New Revision: 1607649

URL: http://svn.apache.org/r1607649
Log:
i125171 support lossless embedding of linked jpegs in writer for PDF export

Modified:
openoffice/trunk/main/sw/source/core/doc/notxtfrm.cxx

Modified: openoffice/trunk/main/sw/source/core/doc/notxtfrm.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/notxtfrm.cxx?rev=1607649r1=1607648r2=1607649view=diff
==
--- openoffice/trunk/main/sw/source/core/doc/notxtfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/doc/notxtfrm.cxx Thu Jul  3 13:58:29 
2014
@@ -1006,13 +1006,54 @@ void SwNoTxtFrm::PaintPicture( OutputDev
 basegfx::tools::createScaleTranslateB2DHomMatrix(
 aTargetRange.getRange(),
 aTargetRange.getMinimum()));
-drawinglayer::primitive2d::Primitive2DSequence aContent;
+drawinglayer::primitive2d::Primitive2DSequence aContent(1);
+bool bDone(false);
 
-aContent.realloc(1);
-aContent[0] = new 
drawinglayer::primitive2d::GraphicPrimitive2D(
-aTargetTransform,
-rGrfObj.GetGraphic(),
-aGrfAttr);
+// #i125171# The mechanism to get lossless jpegs into pdf 
is based on having the original
+// file data (not the bitmap data) at the Graphic in the 
GfxLink (which has *nothing* to
+// do with the graphic being linked). This works well for 
DrawingLayer GraphicObjects (linked
+// and unlinked) but fails for linked Writer 
GraphicObjects. These have the URL in the
+// GraphicObject, but no GfxLink with the original file 
data when it's a linked graphic.
+// Since this blows up PDF size by a factor of 10 (the 
graphics get embedded as pixel maps
+// then) it is okay to add this workarund: In the needed 
case, load the graphic in a way to
+// get the GfxLink in the needed form and use that Graphic 
temporarily. Do this only when
+// - we have PDF export
+// - the GraphicObject is linked
+// - the Graphic has no GfxLink
+// - LosslessCompression is activated
+// - it's indeed a jpeg graphic (could be checked by the 
url ending, but is more reliable to check later)
+// In all other cases (normal repaint, print, etc...) use 
the available Graphic with the
+// already loaded pixel graphic as before this change.
+if(pOut-GetExtOutDevData()  rGrfObj.HasLink()  
!rGrfObj.GetGraphic().IsLink())
+{
+const vcl::PDFExtOutDevData* pPDFExt = dynamic_cast 
const vcl::PDFExtOutDevData* (pOut-GetExtOutDevData());
+
+if(pPDFExt  pPDFExt-GetIsLosslessCompression())
+{
+Graphic aTempGraphic;
+INetURLObject aURL(rGrfObj.GetLink());
+
+if(GRFILTER_OK == 
GraphicFilter::GetGraphicFilter()-ImportGraphic(aTempGraphic, aURL))
+{
+if(aTempGraphic.IsLink()  
GFX_LINK_TYPE_NATIVE_JPG == aTempGraphic.GetLink().GetType())
+{
+aContent[0] = new 
drawinglayer::primitive2d::GraphicPrimitive2D(
+aTargetTransform,
+aTempGraphic,
+aGrfAttr);
+bDone = true;
+}
+}
+}
+}
+
+if(!bDone)
+{
+aContent[0] = new 
drawinglayer::primitive2d::GraphicPrimitive2D(
+aTargetTransform,
+rGrfObj.GetGraphic(),
+aGrfAttr);
+}
 
 paintUsingPrimitivesHelper(
 *pOut,

svn commit: r1607682 - in /openoffice/trunk/main/svgio: inc/svgio/svgreader/svgclippathnode.hxx inc/svgio/svgreader/svgmasknode.hxx source/svgreader/svgclippathnode.cxx source/svgreader/svgmasknode.cx

2014-07-03 Thread alg 
Author: alg
Date: Thu Jul  3 15:49:09 2014
New Revision: 1607682

URL: http://svn.apache.org/r1607682
Log:
i124852 Corrected mask and clip polygons for userSpaceOnUse

Modified:
openoffice/trunk/main/svgio/inc/svgio/svgreader/svgclippathnode.hxx
openoffice/trunk/main/svgio/inc/svgio/svgreader/svgmasknode.hxx
openoffice/trunk/main/svgio/source/svgreader/svgclippathnode.cxx
openoffice/trunk/main/svgio/source/svgreader/svgmasknode.cxx
openoffice/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx

Modified: openoffice/trunk/main/svgio/inc/svgio/svgreader/svgclippathnode.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svgio/inc/svgio/svgreader/svgclippathnode.hxx?rev=1607682r1=1607681r2=1607682view=diff
==
--- openoffice/trunk/main/svgio/inc/svgio/svgreader/svgclippathnode.hxx 
(original)
+++ openoffice/trunk/main/svgio/inc/svgio/svgreader/svgclippathnode.hxx Thu Jul 
 3 15:49:09 2014
@@ -52,8 +52,10 @@ namespace svgio
 virtual void parseAttribute(const rtl::OUString rTokenName, 
SVGToken aSVGToken, const rtl::OUString aContent);
 virtual void 
decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence rTarget, bool 
bReferenced) const;
 
-/// apply contained clipPath to given geometry
-void apply(drawinglayer::primitive2d::Primitive2DSequence 
rTarget) const;
+/// apply contained clipPath to given geometry #i124852# transform 
may be needed
+void apply(
+drawinglayer::primitive2d::Primitive2DSequence rTarget, 
+const basegfx::B2DHomMatrix* pTransform) const;
 
 /// clipPathUnits content
 SvgUnits getClipPathUnits() const { return maClipPathUnits; }

Modified: openoffice/trunk/main/svgio/inc/svgio/svgreader/svgmasknode.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svgio/inc/svgio/svgreader/svgmasknode.hxx?rev=1607682r1=1607681r2=1607682view=diff
==
--- openoffice/trunk/main/svgio/inc/svgio/svgreader/svgmasknode.hxx (original)
+++ openoffice/trunk/main/svgio/inc/svgio/svgreader/svgmasknode.hxx Thu Jul  3 
15:49:09 2014
@@ -57,8 +57,10 @@ namespace svgio
 virtual void parseAttribute(const rtl::OUString rTokenName, 
SVGToken aSVGToken, const rtl::OUString aContent);
 virtual void 
decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence rTarget, bool 
bReferenced) const;
 
-/// apply contained clipPath to given geometry
-void apply(drawinglayer::primitive2d::Primitive2DSequence 
rTarget) const;
+/// apply contained clipPath to given geometry #i124852# transform 
may be needed
+void apply(
+drawinglayer::primitive2d::Primitive2DSequence rTarget, 
+const basegfx::B2DHomMatrix* pTransform) const;
 
 /// x content, set if found in current context
 const SvgNumber getX() const { return maX; }

Modified: openoffice/trunk/main/svgio/source/svgreader/svgclippathnode.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svgio/source/svgreader/svgclippathnode.cxx?rev=1607682r1=1607681r2=1607682view=diff
==
--- openoffice/trunk/main/svgio/source/svgreader/svgclippathnode.cxx (original)
+++ openoffice/trunk/main/svgio/source/svgreader/svgclippathnode.cxx Thu Jul  3 
15:49:09 2014
@@ -132,7 +132,9 @@ namespace svgio
 }
 }
 
-void 
SvgClipPathNode::apply(drawinglayer::primitive2d::Primitive2DSequence 
rContent) const
+void SvgClipPathNode::apply(
+drawinglayer::primitive2d::Primitive2DSequence rContent,
+const basegfx::B2DHomMatrix* pTransform) const
 {
 if(rContent.hasElements()  Display_none != getDisplay())
 {
@@ -179,6 +181,14 @@ namespace svgio
 aContentRange.getRange(),
 aContentRange.getMinimum()));
 }
+else // userSpaceOnUse
+{
+// #i124852#
+if(pTransform)
+{
+aClipPolyPolygon.transform(*pTransform);
+}
+}
 
 // #124313# try to avoid creating an embedding to a 
MaskPrimitive2D if
 // possible; MaskPrimitive2D processing is potentially 
expensive

Modified: openoffice/trunk/main/svgio/source/svgreader/svgmasknode.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svgio/source/svgreader/svgmasknode.cxx?rev=1607682r1=1607681r2=1607682view=diff
==
---

svn commit: r1607725 - /openoffice/ooo-site/trunk/content/zh-tw/index.html

2014-07-03 Thread marcus 
Author: marcus
Date: Thu Jul  3 19:21:32 2014
New Revision: 1607725

URL: http://svn.apache.org/r1607725
Log:
Improved translation, contributed by 'Hung Mark mark...@gmail.com'

Modified:
openoffice/ooo-site/trunk/content/zh-tw/index.html

Modified: openoffice/ooo-site/trunk/content/zh-tw/index.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/zh-tw/index.html?rev=1607725r1=1607724r2=1607725view=diff
==
--- openoffice/ooo-site/trunk/content/zh-tw/index.html (original)
+++ openoffice/ooo-site/trunk/content/zh-tw/index.html Thu Jul  3 19:21:32 2014
@@ -121,12 +121,12 @@ screen reader.
   + div class='action-download'
 + div class='action-text action-link'
   + a href='download/index.html'
-+ h2I want to download Apache OpenOffice/h2
-+ p style='font-size: 1.0em; font-weight: bold;'(Most recent 
release:  + VERSION + )/p
-+ pDownload Apache OpenOffice for free b(really!)/b | 
++ h2我想下載Apache OpenOffice/h2
++ p style='font-size: 1.0em; font-weight: bold;'(最新版本: 
 + VERSION + )/p
++ p免費下載Apache OpenOfficeb(真的免費!)/b | 
   + a 
href='https://blogs.apache.org/OOo/entry/with_apache_openoffice_you_get'
 + title='Blog post: With Apache OpenOffice you get what you 
do not pay for' target='_blank'
-+ Click here to get more information
++ 點這裡取得更多資訊
   + /a.
 + /p
   + /a
@@ -202,23 +202,23 @@ screen reader.
   div class=action-social-extra
 p
   span style=padding: 0 5px; cursor: pointer; 
onclick=javascript:follow( 'ApacheBlog' );
-title=Blog of OpenOffice.
-img src=../images/logo-rss-16.png alt=Blog of OpenOffice 
/
+title=OpenOffice官方網誌
+img src=../images/logo-rss-16.png 
alt=OpenOffice官方網誌 /
 a官方網誌/a
   /span
   span style=padding: 0 5px; cursor: pointer; 
onclick=javascript:follow( 'Facebook' );
-title=Follow us on Facebook.
-img src=../images/logo-facebook-16.png alt=Follow us on 
Facebook /
+title=在Facebook上跟隨我們
+img src=../images/logo-facebook-16.png 
alt=在Facebook上跟隨我們 /
 aFacebook/a
   /span
   span style=padding: 0 5px; cursor: pointer; 
onclick=javascript:follow( 'Twitter' );
-title=Follow us on Twitter.
-img src=../images/logo-twitter-16.png alt=Follow us on 
Twitter /
+title=在Twitter上跟隨我們
+img src=../images/logo-twitter-16.png 
alt=在Twitter上跟隨我們 /
 aTwitter/a
   /span
   span style=padding: 0 5px; cursor: pointer; 
onclick=javascript:follow( 'GooglePlus' );
-title=Follow us on Google+.
-img src=../images/logo-googleplus-16.png alt=Follow us on 
Google+ /
+title=在Google+上跟隨我們
+img src=../images/logo-googleplus-16.png 
alt=在Google+上跟隨我們 /
 aGoogle+/a
   /span
 /p
@@ -233,9 +233,9 @@ screen reader.
 
   div id=SupportedAndSupporters
 a href=http://validator.w3.org/check?uri=referer;
-title=W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) 
of Web documents
+title=W3C標記檢驗服務 - 檢查網頁文件標記 (HTML, XHTML, 
...)
 img src=http://www.w3.org/Icons/valid-xhtml10-blue.png;
-alt=W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) 
of Web documents //a
+alt=W3C標記檢驗服務 - 檢查網頁文件標記 (HTML, XHTML, ...) 
//a
   /div
 /div
 
@@ -252,31 +252,31 @@ screen reader.
   em29 April:/em
   br /
   a 
href=https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce;
-  Apache OpenOffice 4.1.0 released/a
+  Apache OpenOffice 4.1.0 已經發行/a
   br /
 
   em28 April:/em
   br /
   a 
href=https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_2;
-  Apache OpenOffice Weekly News #2/a
+  Apache OpenOffice 每周新聞#2/a
   br /
 
   em25 April:/em
   br /
   a 
href=https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_1;
-  Apache OpenOffice Weekly News #1/a
+  Apache OpenOffice 每周新聞#1/a
   br /
 
   em17 April:/em
   br /
   a 
href=https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56;
-  100 Million downloads/a
+  1億次下載達成/a
   br /
 
   em31 December:/em
   br /
   a href=https://blogs.apache.org/OOo/entry/apache_openoffice_in_2013_a;
-  Apache OpenOffice in 2013:

svn commit: r914924 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/zh-tw/index.html

2014-07-03 Thread buildbot 
Author: buildbot
Date: Thu Jul  3 19:23:40 2014
New Revision: 914924

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/zh-tw/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul  3 19:23:40 2014
@@ -1 +1 @@
-1607494
+1607725

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul  3 19:23:40 2014
@@ -1 +1 @@
-1607494
+1607725

Modified: websites/staging/ooo-site/trunk/content/zh-tw/index.html
==
--- websites/staging/ooo-site/trunk/content/zh-tw/index.html (original)
+++ websites/staging/ooo-site/trunk/content/zh-tw/index.html Thu Jul  3 
19:23:40 2014
@@ -137,12 +137,12 @@ screen reader.
   + div class='action-download'
 + div class='action-text action-link'
   + a href='download/index.html'
-+ h2I want to download Apache OpenOffice/h2
-+ p style='font-size: 1.0em; font-weight: bold;'(Most recent 
release:  + VERSION + )/p
-+ pDownload Apache OpenOffice for free b(really!)/b | 
++ h2我想下載Apache OpenOffice/h2
++ p style='font-size: 1.0em; font-weight: bold;'(最新版本: 
 + VERSION + )/p
++ p免費下載Apache OpenOfficeb(真的免費!)/b | 
   + a 
href='https://blogs.apache.org/OOo/entry/with_apache_openoffice_you_get'
 + title='Blog post: With Apache OpenOffice you get what you 
do not pay for' target='_blank'
-+ Click here to get more information
++ 點這裡取得更多資訊
   + /a.
 + /p
   + /a
@@ -218,23 +218,23 @@ screen reader.
   div class=action-social-extra
 p
   span style=padding: 0 5px; cursor: pointer; 
onclick=javascript:follow( 'ApacheBlog' );
-title=Blog of OpenOffice.
-img src=../images/logo-rss-16.png alt=Blog of OpenOffice 
/
+title=OpenOffice官方網誌
+img src=../images/logo-rss-16.png 
alt=OpenOffice官方網誌 /
 a官方網誌/a
   /span
   span style=padding: 0 5px; cursor: pointer; 
onclick=javascript:follow( 'Facebook' );
-title=Follow us on Facebook.
-img src=../images/logo-facebook-16.png alt=Follow us on 
Facebook /
+title=在Facebook上跟隨我們
+img src=../images/logo-facebook-16.png 
alt=在Facebook上跟隨我們 /
 aFacebook/a
   /span
   span style=padding: 0 5px; cursor: pointer; 
onclick=javascript:follow( 'Twitter' );
-title=Follow us on Twitter.
-img src=../images/logo-twitter-16.png alt=Follow us on 
Twitter /
+title=在Twitter上跟隨我們
+img src=../images/logo-twitter-16.png 
alt=在Twitter上跟隨我們 /
 aTwitter/a
   /span
   span style=padding: 0 5px; cursor: pointer; 
onclick=javascript:follow( 'GooglePlus' );
-title=Follow us on Google+.
-img src=../images/logo-googleplus-16.png alt=Follow us on 
Google+ /
+title=在Google+上跟隨我們
+img src=../images/logo-googleplus-16.png 
alt=在Google+上跟隨我們 /
 aGoogle+/a
   /span
 /p
@@ -249,9 +249,9 @@ screen reader.
 
   div id=SupportedAndSupporters
 a href=http://validator.w3.org/check?uri=referer;
-title=W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) 
of Web documents
+title=W3C標記檢驗服務 - 檢查網頁文件標記 (HTML, XHTML, 
...)
 img src=http://www.w3.org/Icons/valid-xhtml10-blue.png;
-alt=W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) 
of Web documents //a
+alt=W3C標記檢驗服務 - 檢查網頁文件標記 (HTML, XHTML, ...) 
//a
   /div
 /div
 
@@ -268,31 +268,31 @@ screen reader.
   em29 April:/em
   br /
   a 
href=https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce;
-  Apache OpenOffice 4.1.0 released/a
+  Apache OpenOffice 4.1.0 已經發行/a
   br /
 
   em28 April:/em
   br /
   a 
href=https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_2;
-  Apache OpenOffice Weekly News #2/a
+  Apache OpenOffice 每周新聞#2/a
   br /
 
   em25 April:/em
   br /
   a 
href=https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_1;

svn commit: r1607726 - /openoffice/ooo-site/trunk/content/download/archive.html

2014-07-03 Thread marcus 
Author: marcus
Date: Thu Jul  3 19:28:11 2014
New Revision: 1607726

URL: http://svn.apache.org/r1607726
Log:
Fixed HTML error, updated text

Modified:
openoffice/ooo-site/trunk/content/download/archive.html

Modified: openoffice/ooo-site/trunk/content/download/archive.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/archive.html?rev=1607726r1=1607725r2=1607726view=diff
==
--- openoffice/ooo-site/trunk/content/download/archive.html (original)
+++ openoffice/ooo-site/trunk/content/download/archive.html Thu Jul  3 19:28:11 
2014
@@ -14,46 +14,55 @@
 
 body
 
-h1OpenOffice.org® - Download archived versions/h1
+h1OpenOffice.org® and Apache OpenOffice® - Download archived versions/h1
 
-center
-  img src=cachedimages/ooo-logo-registered.png /
-/center
+img style=display: block; margin-left: auto; margin-right: auto; 
src=cachedimages/ooo-logo-registered.png
+alt=Apache OpenOffice logo/
 
-pOld versions of OpenOffice can be downloaded here./p
-br /
+p
+  Old versions of OpenOffice can be downloaded here.
+  br /
+  If you are searching for the most recent release, please visit the
+  a href=index.html title=Download tested and stable buildsdownload 
webpage/a.
+/p
 
-pIf you are searching for the most recent release, please visit the
-  a href=index.html title=Download tested and stable buildsdownload 
webpage/a. Please note: Archived builds are
-  unsupported and may contain security issues. It is highly recommended not to 
use them except when there is no better
-  choice.
+p
+  bPlease note:/b
+  br /
+  Archived builds are unsupported and may contain security issues. It is 
highly recommended not to use them except when
+  there is no better choice.
 /p
-br /
 
 h3Versions 1.x-3.x (until 3.3.0)/h3
 
 p
-  a 
href=http://archive.services.openoffice.org/pub/openoffice-archive/;Archive 
Mirror Network/a
+  a href=http://archive.services.openoffice.org/pub/openoffice-archive/; 
title=Archive Mirror Network
+Archive Mirror Network
+  /a
 /p
 
-pThe URL above will send you to the most available mirror. If it does not 
work, use one of the following direct links to
+p
+  The URL above will send you to the most available mirror. If it does not 
work, use one of the following direct links to
   mirrors:
   br /
-  a href=http://ooo.mirror.garr.it/mirrors/openoffice-archive/;GARR 
(Italy)/a -
-  a href=http://ftp5.gwdg.de/pub/openoffice/archive/;GWDG (Germany)/a -
-  a href=http://ftp.rz.tu-bs.de/pub/mirror/openoffice-archive/;TU BS 
(Germany)/a -
-  a href=http://ftp.tu-chemnitz.de/pub/openoffice-archive/;TU Chemnitz 
(Germany)/a
+  a href=http://ooo.mirror.garr.it/mirrors/openoffice-archive/; title=GARR 
(Italy)GARR (Italy)/a -
+  a href=http://ftp5.gwdg.de/pub/openoffice/archive/; title=GWDG 
(Germany)GWDG (Germany)/a -
+  a href=http://ftp.rz.tu-bs.de/pub/mirror/openoffice-archive/; 
title=Mirror: TU BS (Germany)TU BS (Germany)/a -
+  a href=http://ftp.tu-chemnitz.de/pub/openoffice-archive/; title=TU 
Chemnitz (Germany)TU Chemnitz (Germany)/a
 /p
 
 h3Versions 1.x-3.x (until 3.4.1)/h3
 
 p
-  a href=http://archive.apache.org/dist/incubator/ooo/;ASF - Archives of 
the Apache Software Foundation - Incubator/a
-  br /Quick access:
-  a href=http://archive.apache.org/dist/incubator/ooo/stable/;1.x-3.3.0 
English/a -
-  a href=http://archive.apache.org/dist/incubator/ooo/localized/;1.x-3.3.0 
Localized/a -
-  a href=http://archive.apache.org/dist/incubator/ooo/files/stable/;3.4.x 
English/a -
-  a 
href=http://archive.apache.org/dist/incubator/ooo/files/localized/;3.4.x 
Localized/a
+  a href=http://archive.apache.org/dist/incubator/ooo/; title=Archives of 
the Apache Software Foundation - Incubator
+Archives of the Apache Software Foundation - Incubator
+  /a
+  br /
+  Quick access:
+  a href=http://archive.apache.org/dist/incubator/ooo/stable/; 
title=1.x-3.3.0 English1.x-3.3.0 English/a -
+  a href=http://archive.apache.org/dist/incubator/ooo/localized/;  
title=1.x-3.3.0 Localized1.x-3.3.0 Localized/a -
+  a href=http://archive.apache.org/dist/incubator/ooo/files/stable/;  
title=3.4.x English3.4.x English/a -
+  a href=http://archive.apache.org/dist/incubator/ooo/files/localized/;  
title=3.4.x Localized3.4.x Localized/a
 /p
 
 h3Versions 4.x/h3

svn commit: r914926 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/archive.html

2014-07-03 Thread buildbot 
Author: buildbot
Date: Thu Jul  3 19:28:51 2014
New Revision: 914926

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/download/archive.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul  3 19:28:51 2014
@@ -1 +1 @@
-1607725
+1607726

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul  3 19:28:51 2014
@@ -1 +1 @@
-1607725
+1607726

Modified: websites/staging/ooo-site/trunk/content/download/archive.html
==
--- websites/staging/ooo-site/trunk/content/download/archive.html (original)
+++ websites/staging/ooo-site/trunk/content/download/archive.html Thu Jul  3 
19:28:51 2014
@@ -30,46 +30,55 @@
 
 
 
-h1OpenOffice.org® - Download archived versions/h1
+h1OpenOffice.org® and Apache OpenOffice® - Download archived versions/h1
 
-center
-  img src=cachedimages/ooo-logo-registered.png /
-/center
+img style=display: block; margin-left: auto; margin-right: auto; 
src=cachedimages/ooo-logo-registered.png
+alt=Apache OpenOffice logo/
 
-pOld versions of OpenOffice can be downloaded here./p
-br /
+p
+  Old versions of OpenOffice can be downloaded here.
+  br /
+  If you are searching for the most recent release, please visit the
+  a href=index.html title=Download tested and stable buildsdownload 
webpage/a.
+/p
 
-pIf you are searching for the most recent release, please visit the
-  a href=index.html title=Download tested and stable buildsdownload 
webpage/a. Please note: Archived builds are
-  unsupported and may contain security issues. It is highly recommended not to 
use them except when there is no better
-  choice.
+p
+  bPlease note:/b
+  br /
+  Archived builds are unsupported and may contain security issues. It is 
highly recommended not to use them except when
+  there is no better choice.
 /p
-br /
 
 h3Versions 1.x-3.x (until 3.3.0)/h3
 
 p
-  a 
href=http://archive.services.openoffice.org/pub/openoffice-archive/;Archive 
Mirror Network/a
+  a href=http://archive.services.openoffice.org/pub/openoffice-archive/; 
title=Archive Mirror Network
+Archive Mirror Network
+  /a
 /p
 
-pThe URL above will send you to the most available mirror. If it does not 
work, use one of the following direct links to
+p
+  The URL above will send you to the most available mirror. If it does not 
work, use one of the following direct links to
   mirrors:
   br /
-  a href=http://ooo.mirror.garr.it/mirrors/openoffice-archive/;GARR 
(Italy)/a -
-  a href=http://ftp5.gwdg.de/pub/openoffice/archive/;GWDG (Germany)/a -
-  a href=http://ftp.rz.tu-bs.de/pub/mirror/openoffice-archive/;TU BS 
(Germany)/a -
-  a href=http://ftp.tu-chemnitz.de/pub/openoffice-archive/;TU Chemnitz 
(Germany)/a
+  a href=http://ooo.mirror.garr.it/mirrors/openoffice-archive/; title=GARR 
(Italy)GARR (Italy)/a -
+  a href=http://ftp5.gwdg.de/pub/openoffice/archive/; title=GWDG 
(Germany)GWDG (Germany)/a -
+  a href=http://ftp.rz.tu-bs.de/pub/mirror/openoffice-archive/; 
title=Mirror: TU BS (Germany)TU BS (Germany)/a -
+  a href=http://ftp.tu-chemnitz.de/pub/openoffice-archive/; title=TU 
Chemnitz (Germany)TU Chemnitz (Germany)/a
 /p
 
 h3Versions 1.x-3.x (until 3.4.1)/h3
 
 p
-  a href=http://archive.apache.org/dist/incubator/ooo/;ASF - Archives of 
the Apache Software Foundation - Incubator/a
-  br /Quick access:
-  a href=http://archive.apache.org/dist/incubator/ooo/stable/;1.x-3.3.0 
English/a -
-  a href=http://archive.apache.org/dist/incubator/ooo/localized/;1.x-3.3.0 
Localized/a -
-  a href=http://archive.apache.org/dist/incubator/ooo/files/stable/;3.4.x 
English/a -
-  a 
href=http://archive.apache.org/dist/incubator/ooo/files/localized/;3.4.x 
Localized/a
+  a href=http://archive.apache.org/dist/incubator/ooo/; title=Archives of 
the Apache Software Foundation - Incubator
+Archives of the Apache Software Foundation - Incubator
+  /a
+  br /
+  Quick access:
+  a href=http://archive.apache.org/dist/incubator/ooo/stable/; 
title=1.x-3.3.0 English1.x-3.3.0 English/a -
+  a href=http://archive.apache.org/dist/incubator/ooo/localized/;  
title=1.x-3.3.0 Localized1.x-3.3.0 Localized/a -
+  a href=http://archive.apache.org/dist/incubator/ooo/files/stable/;  
title=3.4.x English3.4.x English/a -
+  a href=http://archive.apache.org/dist/incubator/ooo/files/localized/;  
title=3.4.x Localized3.4.x Localized/a
 /p
 
 h3Versions 4.x/h3

svn commit: r1607731 - /openoffice/ooo-site/trunk/content/download/devbuilds.html

2014-07-03 Thread marcus 
Author: marcus
Date: Thu Jul  3 19:56:17 2014
New Revision: 1607731

URL: http://svn.apache.org/r1607731
Log:
Updated HTML, updated text

Modified:
openoffice/ooo-site/trunk/content/download/devbuilds.html

Modified: openoffice/ooo-site/trunk/content/download/devbuilds.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/devbuilds.html?rev=1607731r1=1607730r2=1607731view=diff
==
--- openoffice/ooo-site/trunk/content/download/devbuilds.html (original)
+++ openoffice/ooo-site/trunk/content/download/devbuilds.html Thu Jul  3 
19:56:17 2014
@@ -4,12 +4,14 @@
   meta http-equiv=Content-Type content=text/html; charset=utf-8 /
   titleApache OpenOffice development builds: daily, nightly, 
snapshots/title
   style type=text/css
-div.warning {
-  background-color: rgb(254,203,203);
-  padding: 10px;
-  border: 1px solid rgb(192,0,0);
-  font-style: italic;
-}
+  /* ![CDATA[ */
+  div.warning {
+background-color: rgb(254, 203, 203);
+padding: 10px;
+border: 1px solid rgb(192, 0, 0);
+font-style: italic;
+  }
+  /* ]] */
   /style
 /head
 
@@ -18,51 +20,84 @@
 h1Apache OpenOffice daily/nightly builds and snapshots/h1
 
 div class=warning
-The following installation packages are automatically generated by 
buildbots.br/
-They are strongfor testing purposes only/strong: they are not formally 
approved and they can contain issues.br/
-End users must use strongonly our formally approved builds/strong,
-available from
-a 
href=http://www.openoffice.org/download/;http://www.openoffice.org/download//a
-and widely tested.
+  The following installation packages are automatically generated by buildbots.
+  br/
+  They are strongfor testing purposes only/strong: they are not formally 
approved and they can contain issues.
+  br/
+  End users must use strongonly our officially approved and widely tested 
builds/strong, available from the 
+  a href=http://www.openoffice.org/download/; title=DownloadDownload 
webpage/a.
 /div
 
 h2Target public/h2
 
 p
-The following builds are for use by strongOpenOffice project
-volunteers/strong who are participating in the
-a href=http://openoffice.apache.org/qa.html;QA/a or
-a href=http://openoffice.apache.org/translate.html;Localization/a
-activities and are tracking specific bugs in our
-a href=https://issues.apache.org/ooo/;Bugzilla/a.
+  The following builds are for use by strongOpenOffice project 
volunteers/strong who are participating in the
+  a href=http://openoffice.apache.org/qa.html; title=QAQA/a or
+  a href=http://openoffice.apache.org/translate.html; 
title=LocalizationLocalization/a
+  activities and are tracking specific bugs in our
+  a href=https://issues.apache.org/ooo/; title=BugzillaBugzilla/a.
 /p
 
 !--
 p
-Our daily/nightly and snapshots builds are made more visible to help volunteers
-a 
href=https://blogs.apache.org/OOo/entry/seeking_beta_testers_for_apache;report
 bugs in the 4.1.0 pre-release phase/a.
-Everyone is welcome to
-a href=http://openoffice.apache.org/orientation/index.html;join the 
OpenOffice QA or Localization/a
-efforts. 
+  Our daily/nightly and snapshot builds are made more visible to help 
volunteers
+  a href=https://blogs.apache.org/OOo/entry/seeking_beta_testers_for_apache; 
title=Report bugs in the pre-release phase
+  report bugs in the 4.1.0 pre-release phase/a. Everyone is welcome to
+  a href=http://openoffice.apache.org/orientation/index.html; 
title=Joinjoin the OpenOffice QA or Localization/a
+  efforts. 
 /p
 --
 
 h2Available builds/h2
 
 ul
-  !-- lia 
href=http://ci.apache.org/projects/openoffice/index.html;Overview/a/li --
-  !-- lia 
href=http://ci.apache.org/projects/openoffice/index.html#win;Windows 
nightly/a: English and German, built every night from trunk/li --
-  !-- lia 
href=http://ci.apache.org/projects/openoffice/index.html#winsnap;Windows 
snapshot/a: ~40 languages, built every Sunday from the AOO410 branch/li --
-  !-- lia 
href=http://ci.apache.org/projects/openoffice/index.html#linux32;Linux 32-bit 
nightly/a: English and German, built every night from trunk; RPM, DEB, 
archived format/li --
-  !-- lia 
href=http://ci.apache.org/projects/openoffice/index.html#linsnap;Linux 32-bit 
snapshot/a: ~40 languages, built every Sunday from the AOO410 branch; DEB 
format/li --
-  !-- lia 
href=http://ci.apache.org/projects/openoffice/index.html#linux64;Linux 64-bit 
nightly/a: English and German, built every night from trunk; RPM, DEB, 
archived format/li --
-  !-- lia 
href=https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds;Apache
 OpenOffice 4.1.0-RC4 Release Candidate/a: all languages and platforms/li 
--
-  liemWe currently have no development builds available. Version 4.1.0 has 
been released. Use a 
href=http://svn.apache.org/viewvc/openoffice/trunk/main/?sortby=date#dirlist;the
 SVN web interface/a to see what changed in code since version

svn commit: r914927 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/devbuilds.html

2014-07-03 Thread buildbot 
Author: buildbot
Date: Thu Jul  3 19:57:01 2014
New Revision: 914927

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/download/devbuilds.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul  3 19:57:01 2014
@@ -1 +1 @@
-1607726
+1607731

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul  3 19:57:01 2014
@@ -1 +1 @@
-1607726
+1607731

Modified: websites/staging/ooo-site/trunk/content/download/devbuilds.html
==
--- websites/staging/ooo-site/trunk/content/download/devbuilds.html (original)
+++ websites/staging/ooo-site/trunk/content/download/devbuilds.html Thu Jul  3 
19:57:01 2014
@@ -6,12 +6,14 @@
   meta http-equiv=Content-Type content=text/html; charset=utf-8 /
   titleApache OpenOffice development builds: daily, nightly, 
snapshots/title
   style type=text/css
-div.warning {
-  background-color: rgb(254,203,203);
-  padding: 10px;
-  border: 1px solid rgb(192,0,0);
-  font-style: italic;
-}
+  /* ![CDATA[ */
+  div.warning {
+background-color: rgb(254, 203, 203);
+padding: 10px;
+border: 1px solid rgb(192, 0, 0);
+font-style: italic;
+  }
+  /* ]] */
   /style
 
 !--#include virtual=/google-analytics.js -- 
@@ -34,51 +36,84 @@
 h1Apache OpenOffice daily/nightly builds and snapshots/h1
 
 div class=warning
-The following installation packages are automatically generated by 
buildbots.br/
-They are strongfor testing purposes only/strong: they are not formally 
approved and they can contain issues.br/
-End users must use strongonly our formally approved builds/strong,
-available from
-a 
href=http://www.openoffice.org/download/;http://www.openoffice.org/download//a
-and widely tested.
+  The following installation packages are automatically generated by buildbots.
+  br/
+  They are strongfor testing purposes only/strong: they are not formally 
approved and they can contain issues.
+  br/
+  End users must use strongonly our officially approved and widely tested 
builds/strong, available from the 
+  a href=http://www.openoffice.org/download/; title=DownloadDownload 
webpage/a.
 /div
 
 h2Target public/h2
 
 p
-The following builds are for use by strongOpenOffice project
-volunteers/strong who are participating in the
-a href=http://openoffice.apache.org/qa.html;QA/a or
-a href=http://openoffice.apache.org/translate.html;Localization/a
-activities and are tracking specific bugs in our
-a href=https://issues.apache.org/ooo/;Bugzilla/a.
+  The following builds are for use by strongOpenOffice project 
volunteers/strong who are participating in the
+  a href=http://openoffice.apache.org/qa.html; title=QAQA/a or
+  a href=http://openoffice.apache.org/translate.html; 
title=LocalizationLocalization/a
+  activities and are tracking specific bugs in our
+  a href=https://issues.apache.org/ooo/; title=BugzillaBugzilla/a.
 /p
 
 !--
 p
-Our daily/nightly and snapshots builds are made more visible to help volunteers
-a 
href=https://blogs.apache.org/OOo/entry/seeking_beta_testers_for_apache;report
 bugs in the 4.1.0 pre-release phase/a.
-Everyone is welcome to
-a href=http://openoffice.apache.org/orientation/index.html;join the 
OpenOffice QA or Localization/a
-efforts. 
+  Our daily/nightly and snapshot builds are made more visible to help 
volunteers
+  a href=https://blogs.apache.org/OOo/entry/seeking_beta_testers_for_apache; 
title=Report bugs in the pre-release phase
+  report bugs in the 4.1.0 pre-release phase/a. Everyone is welcome to
+  a href=http://openoffice.apache.org/orientation/index.html; 
title=Joinjoin the OpenOffice QA or Localization/a
+  efforts. 
 /p
 --
 
 h2Available builds/h2
 
 ul
-  !-- lia 
href=http://ci.apache.org/projects/openoffice/index.html;Overview/a/li --
-  !-- lia 
href=http://ci.apache.org/projects/openoffice/index.html#win;Windows 
nightly/a: English and German, built every night from trunk/li --
-  !-- lia 
href=http://ci.apache.org/projects/openoffice/index.html#winsnap;Windows 
snapshot/a: ~40 languages, built every Sunday from the AOO410 branch/li --
-  !-- lia 
href=http://ci.apache.org/projects/openoffice/index.html#linux32;Linux 32-bit 
nightly/a: English and German, built every night from trunk; RPM, DEB, 
archived format/li --
-  !-- lia 
href=http://ci.apache.org/projects/openoffice/index.html#linsnap;Linux 32-bit 
snapshot/a: ~40 languages, built every Sunday from the AOO410 branch; DEB 
format/li --
-  !-- lia 
href=http://ci.apache.org/projects/openoffice/index.html#linux64;Linux

svn commit: r914929 - in /websites/production/ooo-site: cgi-bin/ content/

2014-07-03 Thread marcus 
Author: marcus
Date: Thu Jul  3 20:01:30 2014
New Revision: 914929

Log:
Publishing svnmucc operation to ooo-site site by marcus

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r914928, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r914928, websites/staging/ooo-site/trunk/content/

svn commit: r1607756 - /openoffice/ooo-site/trunk/content/download/test/boxed_download.js

2014-07-03 Thread marcus 
Author: marcus
Date: Thu Jul  3 22:18:15 2014
New Revision: 1607756

URL: http://svn.apache.org/r1607756
Log:
Updated comments

Modified:
openoffice/ooo-site/trunk/content/download/test/boxed_download.js

Modified: openoffice/ooo-site/trunk/content/download/test/boxed_download.js
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/boxed_download.js?rev=1607756r1=1607755r2=1607756view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/boxed_download.js (original)
+++ openoffice/ooo-site/trunk/content/download/test/boxed_download.js Thu Jul  
3 22:18:15 2014
@@ -1,17 +1,21 @@
 /*
  * Functions to draw every single colored box as well as the navigation bar 
and logo section
  */
+
+/*
+ * Download box
+ * Show the select boxes, both download text buttons and the sub-box
+ */
 function createDownloadBox() {
-  // Green colored box.
-  // Show select boxes and both download text buttons.
   document.write( div class='first button green-sel' id='optionitem2'
 + div class='green-icon'/div
+
 // Headline.
 + h2 title=' + l10n_download_green_box_headline_title + '
   + l10n_download_green_box_headline_text
 + /h2
 
-// Select text.
+// Box text.
 + p title=' + l10n_download_green_box_subtext1_title + '
   + ( + l10n_download_green_box_subtext1_text + )
 + /p
@@ -19,7 +23,7 @@ function createDownloadBox() {
   + b + l10n_download_green_box_subtext2_text + :/b
 + /p
 
-// Select boxes.
+// Select drop-down boxes.
 + form name='download'
   + select class='sel-os' id='os' name='os' ' 
onchange='getLinkSelection()'
 + title=' + l10n_download_green_box_selectbox_os_title   + '
@@ -51,15 +55,18 @@ function createDownloadBox() {
   + br /br /
   + /div
 
-  // Sub-green colored box.
-  // Show release info, filesizes, checksum links and help links.
+  /*
+   * Download sub-box
+   * Show release info, filesizes, checksum links and help links
+   */
   + div id='sub_box' class='button sub-green-sel'
 + div // The 3 lines of release info
+
   // Error text with hint.
   + img id='dl_err_img'  style='margin: 5px 5px 18px 3%;' 
height='16' width='16' /
   + p id='dl_err'style='text-decoration: none;'/p
-
   + p
+
 // Release info and notes.
 + a id='dl_rel_info' style='text-decoration: none;'/a
 + a id='dl_rel_notes'style='text-decoration: underline;' 
target='_blank'/a
@@ -89,8 +96,13 @@ function createDownloadBox() {
   + /p
 + /div
 
-+ div // The 3 help icons and links
+   /*
+* Download box
+* Show the help icons and links
+*/
++ div
   + p
+
 // Help: What is a language pack?
 + img id='dl_hlp_img'  style='padding: 5px 5px 0px 0px;' 
height='16' width='16' /
 + a id='dl_hlp' target='_blank' onclick='showWindow( this.href ); 
return false;'/a
@@ -108,32 +120,46 @@ function createDownloadBox() {
   return;
 }
 
+/*
+ * Social network box
+ * Show the clickable icons for the social networks
+ */
 function createShareBox() {
-  // Light blue colored box.
-  // Share download with social networks.
   document.write( div class='button lightblue' id='optionitem4'
 + div class='lightblue-icon'/div
+
+// Headline.
 + h2 title=' + l10n_share_light_blue_box_headline_title + ' + 
l10n_share_light_blue_box_headline_text + /h2
+
+// Box text.
 + p id='ShareDownloadLinks'
   + title=' + l10n_share_light_blue_box_text_title + '
   + l10n_share_light_blue_box_text_text
 + /p
 + div class='icon_box'
+
+  // Apache OpenOffice blog.
   + span onclick='javascript:share( \apacheblog\ )'
 + title=' + l10n_share_light_blue_box_blog_title + '
 + img src='../../images/logo-rss-32.png' alt=' + 
l10n_share_light_blue_box_blog_alt + '/
 + aOfficial Blog/a
   + /span
+
+  // Facebook.
   + span onclick='javascript:share( \facebook\ )'
 + title=' + l10n_share_light_blue_box_facebook_title + '
 + img src='../../images/logo-facebook-32.png' alt=' + 
l10n_share_light_blue_box_facebook_alt + ' /
 + aFacebook/a
   + /span
+
+  // Twitter.
   + span onclick='javascript:share( \twitter\ )'
 + title=' + l10n_share_light_blue_box_twitter_title + '
 + img src='../../images/logo-twitter-32.png' alt=' + 
l10n_share_light_blue_box_twitter_alt + ' /
 + aTwitter/a
   + /span
+
+  // Google+.
   + span onclick='javascript:share( \google+\ )'
 + title=' + l10n_share_light_blue_box_googleplus_title + '
 + img src='../../images/logo-googleplus-32.png' alt=' + 
l10n_share_light_blue_box_googleplus_alt + ' /
@@ -144,13 +170,18 @@ function createShareBox() {
   return;
 }
 
+/*
+ * Extensions and dictionaries
+ */
 function createExtensionsBox() {
-  // Blue colored box.
-

svn commit: r1607757 - /openoffice/ooo-site/trunk/content/download/test/download.js

2014-07-03 Thread marcus 
Author: marcus
Date: Thu Jul  3 22:20:20 2014
New Revision: 1607757

URL: http://svn.apache.org/r1607757
Log:
Fixed JS errors

Modified:
openoffice/ooo-site/trunk/content/download/test/download.js

Modified: openoffice/ooo-site/trunk/content/download/test/download.js
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download.js?rev=1607757r1=1607756r2=1607757view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download.js (original)
+++ openoffice/ooo-site/trunk/content/download/test/download.js Thu Jul  3 
22:20:20 2014
@@ -34,7 +34,7 @@ function init( release_mode ) {
initVariables( 1 );
 
// Fill the OS, language and version select boxes.
-   fillOSSelection()
+   fillOSSelection();
fillLanguageSelection();
fillVersionSelection();
 
@@ -49,8 +49,9 @@ function init( release_mode ) {
 

// When release mode = 2, it is a beta release. Otherwise assume 
stable release as default.
-   if( release_mode === 2 )
+   if( release_mode === 2 ) {
RELEASE_MODE = mode;
+   }
 
getLinkSelection();
 
@@ -130,34 +131,38 @@ function getLanguage() {
var language = ;
 
// If available, use the manual set ISO code (see index.html) that 
overrides $LANG_ISO.
-   if( NL_LANG !==  )
+   if( NL_LANG !==  ) {
language = NL_LANG;
 
// Else if available, use the selected language from select box.
-   else if( LANG_SEL !==  )
+   } else if( LANG_SEL !==  ) {
language = LANG_SEL;
 
// Else try to recognize the language from browser data.
-   else if( navigator.language )
+   } else if( navigator.language ) {
language = navigator.language;
-   else if( navigator.userLanguage )
+   } else if( navigator.userLanguage ) {
language = navigator.userLanguage;
-   else if( navigator.browserLanguage )
+   } else if( navigator.browserLanguage ) {
language = navigator.browserLanguage;
-   else if( navigator.systemLanguage )
+   } else if( navigator.systemLanguage ) {
language = navigator.systemLanguage;
+   }
 
// Assign en-US as fall-back language if only en is set or nothing 
at all.
-   if( !language || language ===  || language == null || language === 
en )
+   if( !language || language ===  || language == null || language === 
en ) {
language = en-US;
+   }
// Assign pt-PT if only pt is set.
-   if( language === pt )
+   if( language === pt ) {
language = pt-PT;
+   }
 
// Konqueror uses '_' where other browsers use '-'.
-   if( language.indexOf( _ ) !== -1 )
+   if( language.indexOf( _ ) !== -1 ) {
// Change a contained '_' into a '-'.
language = language.split( _ ).join( - );
+   }
 
language= language.toLowerCase();   // Change the 
language into lower case.
var languageCode= language.split( - )[ 0 ];   // Part before 
- is the language code.
@@ -174,8 +179,9 @@ function getLanguage() {
 
if( regionCode != null ) {
// Fix for Portuguese (European) downloads as they are named 
only pt without region code!
-   if( languageCode === pt  regionCode === pt )
+   if( languageCode === pt  regionCode === pt ) {
language = languageCode;
+   }
 
// If an additional region code was found.
if( thisLanguageSet[ regionCode ] != null ) {
@@ -436,11 +442,13 @@ function getVersionSelection() {
 function hideElements() {
// Change CSS styles for all elements with ID in the green and 
sub-green colored boxes.
// Emtpy the values for all elements, make them invisible.
-   for( var i = 0, j = element_ids_sub_box.length; i  j; i++ )
+   for( var i = 0, j = element_ids_sub_box.length; i  j; i++ ) {
document.getElementById( element_ids_sub_box[ i ] 
).style.display = none;
+   }
 
-   for( var i = 0, j = element_ids_links.length; i  j; i++ )
+   for( var i = 0, j = element_ids_links.length; i  j; i++ ) {
document.getElementById( element_ids_links[ i ] ).style.display 
  = none;
+   }
 
return;
 }
@@ -451,6 +459,8 @@ function hideElements() {
  */
 function showWindow( target_link ) {
// Open a popup window with specific parameters to show the file from 
target_link.
+   var window;
+
window = window.open( target_link, _blank, location=no, menubar=no, 
resizable=yes, scrollbars=yes, status=no, titlebar=no, toolbar=no, left=100, 
top=250, width=800, height=550);
window.focus();
 
@@ -507,8 +517,9 @@ function showErrorMessage( error_text ) 
 function isLanguageSupported() {
//

svn commit: r914943 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/boxed_download.js

2014-07-03 Thread buildbot 
Author: buildbot
Date: Thu Jul  3 22:21:19 2014
New Revision: 914943

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/download/test/boxed_download.js

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul  3 22:21:19 2014
@@ -1 +1 @@
-1607731
+1607756

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul  3 22:21:19 2014
@@ -1 +1 @@
-1607731
+1607756

Modified: 
websites/staging/ooo-site/trunk/content/download/test/boxed_download.js
==
--- websites/staging/ooo-site/trunk/content/download/test/boxed_download.js 
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/boxed_download.js Thu 
Jul  3 22:21:19 2014
@@ -1,17 +1,21 @@
 /*
  * Functions to draw every single colored box as well as the navigation bar 
and logo section
  */
+
+/*
+ * Download box
+ * Show the select boxes, both download text buttons and the sub-box
+ */
 function createDownloadBox() {
-  // Green colored box.
-  // Show select boxes and both download text buttons.
   document.write( div class='first button green-sel' id='optionitem2'
 + div class='green-icon'/div
+
 // Headline.
 + h2 title=' + l10n_download_green_box_headline_title + '
   + l10n_download_green_box_headline_text
 + /h2
 
-// Select text.
+// Box text.
 + p title=' + l10n_download_green_box_subtext1_title + '
   + ( + l10n_download_green_box_subtext1_text + )
 + /p
@@ -19,7 +23,7 @@ function createDownloadBox() {
   + b + l10n_download_green_box_subtext2_text + :/b
 + /p
 
-// Select boxes.
+// Select drop-down boxes.
 + form name='download'
   + select class='sel-os' id='os' name='os' ' 
onchange='getLinkSelection()'
 + title=' + l10n_download_green_box_selectbox_os_title   + '
@@ -51,15 +55,18 @@ function createDownloadBox() {
   + br /br /
   + /div
 
-  // Sub-green colored box.
-  // Show release info, filesizes, checksum links and help links.
+  /*
+   * Download sub-box
+   * Show release info, filesizes, checksum links and help links
+   */
   + div id='sub_box' class='button sub-green-sel'
 + div // The 3 lines of release info
+
   // Error text with hint.
   + img id='dl_err_img'  style='margin: 5px 5px 18px 3%;' 
height='16' width='16' /
   + p id='dl_err'style='text-decoration: none;'/p
-
   + p
+
 // Release info and notes.
 + a id='dl_rel_info' style='text-decoration: none;'/a
 + a id='dl_rel_notes'style='text-decoration: underline;' 
target='_blank'/a
@@ -89,8 +96,13 @@ function createDownloadBox() {
   + /p
 + /div
 
-+ div // The 3 help icons and links
+   /*
+* Download box
+* Show the help icons and links
+*/
++ div
   + p
+
 // Help: What is a language pack?
 + img id='dl_hlp_img'  style='padding: 5px 5px 0px 0px;' 
height='16' width='16' /
 + a id='dl_hlp' target='_blank' onclick='showWindow( this.href ); 
return false;'/a
@@ -108,32 +120,46 @@ function createDownloadBox() {
   return;
 }
 
+/*
+ * Social network box
+ * Show the clickable icons for the social networks
+ */
 function createShareBox() {
-  // Light blue colored box.
-  // Share download with social networks.
   document.write( div class='button lightblue' id='optionitem4'
 + div class='lightblue-icon'/div
+
+// Headline.
 + h2 title=' + l10n_share_light_blue_box_headline_title + ' + 
l10n_share_light_blue_box_headline_text + /h2
+
+// Box text.
 + p id='ShareDownloadLinks'
   + title=' + l10n_share_light_blue_box_text_title + '
   + l10n_share_light_blue_box_text_text
 + /p
 + div class='icon_box'
+
+  // Apache OpenOffice blog.
   + span onclick='javascript:share( \apacheblog\ )'
 + title=' + l10n_share_light_blue_box_blog_title + '
 + img src='../../images/logo-rss-32.png' alt=' + 
l10n_share_light_blue_box_blog_alt + '/
 + aOfficial Blog/a
   + /span
+
+  // Facebook.
   + span onclick='javascript:share( \facebook\ )'
 + title=' + l10n_share_light_blue_box_facebook_title + '
 + img src='../../images/logo-facebook-32.png' alt=' + 
l10n_share_light_blue_box_facebook_alt + ' /
 + aFacebook/a
   + /span
+
+  // Twitter.
   + span onclick='javascript:share( \twitter\ )'
 + title=' + l10n_share_light_blue_box_twitter_title + '
 + img src='../../images/logo-twitter-32.png' alt=' +

svn commit: r914944 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download.js

2014-07-03 Thread buildbot 
Author: buildbot
Date: Thu Jul  3 22:23:05 2014
New Revision: 914944

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/download/test/download.js

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul  3 22:23:05 2014
@@ -1 +1 @@
-1607756
+1607757

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul  3 22:23:05 2014
@@ -1 +1 @@
-1607756
+1607757

Modified: websites/staging/ooo-site/trunk/content/download/test/download.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download.js (original)
+++ websites/staging/ooo-site/trunk/content/download/test/download.js Thu Jul  
3 22:23:05 2014
@@ -34,7 +34,7 @@ function init( release_mode ) {
initVariables( 1 );
 
// Fill the OS, language and version select boxes.
-   fillOSSelection()
+   fillOSSelection();
fillLanguageSelection();
fillVersionSelection();
 
@@ -49,8 +49,9 @@ function init( release_mode ) {
 

// When release mode = 2, it is a beta release. Otherwise assume 
stable release as default.
-   if( release_mode === 2 )
+   if( release_mode === 2 ) {
RELEASE_MODE = mode;
+   }
 
getLinkSelection();
 
@@ -130,34 +131,38 @@ function getLanguage() {
var language = ;
 
// If available, use the manual set ISO code (see index.html) that 
overrides $LANG_ISO.
-   if( NL_LANG !==  )
+   if( NL_LANG !==  ) {
language = NL_LANG;
 
// Else if available, use the selected language from select box.
-   else if( LANG_SEL !==  )
+   } else if( LANG_SEL !==  ) {
language = LANG_SEL;
 
// Else try to recognize the language from browser data.
-   else if( navigator.language )
+   } else if( navigator.language ) {
language = navigator.language;
-   else if( navigator.userLanguage )
+   } else if( navigator.userLanguage ) {
language = navigator.userLanguage;
-   else if( navigator.browserLanguage )
+   } else if( navigator.browserLanguage ) {
language = navigator.browserLanguage;
-   else if( navigator.systemLanguage )
+   } else if( navigator.systemLanguage ) {
language = navigator.systemLanguage;
+   }
 
// Assign en-US as fall-back language if only en is set or nothing 
at all.
-   if( !language || language ===  || language == null || language === 
en )
+   if( !language || language ===  || language == null || language === 
en ) {
language = en-US;
+   }
// Assign pt-PT if only pt is set.
-   if( language === pt )
+   if( language === pt ) {
language = pt-PT;
+   }
 
// Konqueror uses '_' where other browsers use '-'.
-   if( language.indexOf( _ ) !== -1 )
+   if( language.indexOf( _ ) !== -1 ) {
// Change a contained '_' into a '-'.
language = language.split( _ ).join( - );
+   }
 
language= language.toLowerCase();   // Change the 
language into lower case.
var languageCode= language.split( - )[ 0 ];   // Part before 
- is the language code.
@@ -174,8 +179,9 @@ function getLanguage() {
 
if( regionCode != null ) {
// Fix for Portuguese (European) downloads as they are named 
only pt without region code!
-   if( languageCode === pt  regionCode === pt )
+   if( languageCode === pt  regionCode === pt ) {
language = languageCode;
+   }
 
// If an additional region code was found.
if( thisLanguageSet[ regionCode ] != null ) {
@@ -436,11 +442,13 @@ function getVersionSelection() {
 function hideElements() {
// Change CSS styles for all elements with ID in the green and 
sub-green colored boxes.
// Emtpy the values for all elements, make them invisible.
-   for( var i = 0, j = element_ids_sub_box.length; i  j; i++ )
+   for( var i = 0, j = element_ids_sub_box.length; i  j; i++ ) {
document.getElementById( element_ids_sub_box[ i ] 
).style.display = none;
+   }
 
-   for( var i = 0, j = element_ids_links.length; i  j; i++ )
+   for( var i = 0, j = element_ids_links.length; i  j; i++ ) {
document.getElementById( element_ids_links[ i ] ).style.display 
  = none;
+   }
 
return;
 }
@@ -451,6 +459,8 @@ function

buildbot failure in ASF Buildbot on openoffice-linux32-nightly

2014-07-03 Thread buildbot 
The Buildbot has detected a failed build on builder openoffice-linux32-nightly 
while building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/openoffice-linux32-nightly/builds/74

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 FAILED: failed

sincerely,
 -The Buildbot

buildbot failure in ASF Buildbot on openoffice-fbsd-nightly

2014-07-03 Thread buildbot 
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/66

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