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/71 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
svn commit: r1607011 [2/2] - in /openoffice/branches/AOO410: ./ main/ main/sfx2/inc/sfx2/ main/sw/inc/ main/sw/source/ui/app/
Modified: openoffice/branches/AOO410/main/sw/source/ui/app/docst.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/ui/app/docst.cxx?rev=1607011r1=1607010r2=1607011view=diff
==
--- openoffice/branches/AOO410/main/sw/source/ui/app/docst.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/ui/app/docst.cxx Tue Jul 1
08:14:18 2014
@@ -163,7 +163,7 @@ void SwDocShell::StateStyleSheet(SfxIte
SfxTemplateItem aItem(nWhich, aName);
sal_uInt16 nMask = 0;
- if(
pDoc-get(IDocumentSettingAccess::HTML_MODE) )
+ if(
mpDoc-get(IDocumentSettingAccess::HTML_MODE) )
nMask = SWSTYLEBIT_HTML;
else
{
@@ -189,7 +189,7 @@ void SwDocShell::StateStyleSheet(SfxIte
case SID_STYLE_FAMILY3:
- if(
pDoc-get(IDocumentSettingAccess::HTML_MODE) )
+ if(
mpDoc-get(IDocumentSettingAccess::HTML_MODE) )
rSet.DisableItem( nWhich );
else
{
@@ -205,7 +205,7 @@ void SwDocShell::StateStyleSheet(SfxIte
case SID_STYLE_FAMILY4:
{
SvxHtmlOptions* pHtmlOpt =
SvxHtmlOptions::Get();
- if(
pDoc-get(IDocumentSettingAccess::HTML_MODE)
!pHtmlOpt-IsPrintLayoutExtension())
+ if(
mpDoc-get(IDocumentSettingAccess::HTML_MODE)
!pHtmlOpt-IsPrintLayoutExtension())
rSet.DisableItem( nWhich );
else
{
@@ -431,14 +431,14 @@ void SwDocShell::ExecStyleSheet( SfxRequ
break;
case SFX_STYLE_FAMILY_FRAME:
{
- SwFrmFmt* pFrm =
pWrtShell-GetCurFrmFmt();
+ SwFrmFmt* pFrm =
mpWrtShell-GetCurFrmFmt();
if( pFrm )
aParam =
pFrm-GetName();
}
break;
case SFX_STYLE_FAMILY_CHAR:
{
- SwCharFmt* pChar =
pWrtShell-GetCurCharFmt();
+ SwCharFmt* pChar =
mpWrtShell-GetCurCharFmt();
if( pChar )
aParam =
pChar-GetName();
}
@@ -523,7 +523,7 @@ sal_uInt16 SwDocShell::Edit(
SfxStyleSheetBase *pStyle = 0;
sal_uInt16 nRet = nMask;
- sal_Bool bModified = pDoc-IsModified();
+ sal_Bool bModified = mpDoc-IsModified();
if( bNew )
{
@@ -542,17 +542,16 @@ sal_uInt16 SwDocShell::Edit(
{
if(rParent.Len())
{
- SwTxtFmtColl* pColl =
pWrtShell-FindTxtFmtCollByName( rParent );
+ SwTxtFmtColl* pColl =
mpWrtShell-FindTxtFmtCollByName( rParent );
if(!pColl)
{
sal_uInt16 nId =
SwStyleNameMapper::GetPoolIdFromUIName(rParent,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
if(USHRT_MAX != nId)
-pColl = pWrtShell-GetTxtCollFromPool( nId );
+pColl = mpWrtShell-GetTxtCollFromPool( nId );
}
pDStyle-GetCollection()-SetDerivedFrom( pColl );
pDStyle-PresetParent( rParent );
- //#outline level,add by zhaojianwei
/*When a new paragraph style is
created based on a to outline style
assigned paragraph style, the
outline level attribute and the list
style attribute of the new
paragraph style have to be set to 0
@@ -563,12 +562,11 @@ sal_uInt16 SwDocShell::Edit(
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/66 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: r1607057 - /openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx
Author: alg
Date: Tue Jul 1 11:55:03 2014
New Revision: 1607057
URL: http://svn.apache.org/r1607057
Log:
i125187 more precision at ppt import where the BLIP graphic is located
Modified:
openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx
Modified: openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx?rev=1607057r1=1607056r2=1607057view=diff
==
--- openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx (original)
+++ openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx Tue Jul 1
11:55:03 2014
@@ -6054,25 +6054,46 @@ void SvxMSDffManager::GetDrawingGroupCon
nLenFBSE = nLength;
// ist FBSE gross genug fuer unsere Daten
sal_Bool bOk = ( nSkipBLIPLen + 4 + nSkipBLIPPos + 4 =
nLenFBSE );
+bool bBLIPIsDirectlyEmbedded(false);
- if( bOk )
- {
- rSt.SeekRel( nSkipBLIPLen );
- rSt nBLIPLen;
- rSt.SeekRel( nSkipBLIPPos );
- rSt nBLIPPos;
- bOk = rSt.GetError() == 0;
+if(bOk)
+{
+rSt.SeekRel(nSkipBLIPLen);
+rSt nBLIPLen;
- nLength -= nSkipBLIPLen+ 4 + nSkipBLIPPos + 4;
- }
+// #125187# do not simply skip these four bytes, but read
them. This value
+// is zero when the BLIP is embedded to the FBSE directly
following in the
+// stream, else 1. Use this as hint to be more reliable (see
below)
+rSt nBLIPPos;
+
+if(0 == nBLIPPos)
+{
+bBLIPIsDirectlyEmbedded = true;
+}
+
+rSt nBLIPPos;
+bOk = rSt.GetError() == 0;
+
+nLength -= nSkipBLIPLen + 4 + nSkipBLIPPos + 4;
+}
if( bOk )
{
- // Besonderheit:
- // Falls nBLIPLen kleiner ist als nLenFBSE UND
nBLIPPos Null ist,
- // nehmen wir an, dass das Bild IM FBSE drin
steht!
- if( (!nBLIPPos) (nBLIPLen nLenFBSE) )
- nBLIPPos = rSt.Tell() + 4;
+// #125187# the original check to test if the BLIP is
following embeded in the FBSE was
+// was (!nBLIPPos nBLIPLen nLenFBSE), but there are ppt
documents
+// where this is not sufficient (what means that for BLIPs in
the picture
+// stream the same conditions can be true sometimes). I
experimented with various
+// ppt files and detected that the four bytes before reading
the nBLIPPos
+// contain a flag which describes that embedding more
reliable, thus I will
+// use it here now in the form of the bBLIPIsDirectlyEmbedded
variable (see above).
+// This modification works with all ppt files I found which
use directly embedded
+// BLIPs and with the file which showed the error. More work
may be needed when
+// exceptions to this more strict schema may show up, though.
+if(0 == nBLIPPos nBLIPLen nLenFBSE
bBLIPIsDirectlyEmbedded)
+{
+// get BLIP file position as directly following embedded
+nBLIPPos = rSt.Tell() + 4;
+}
// Das hat ja fein geklappt!
// Wir merken uns, dass wir einen FBSE mehr im
Pointer Array haben.
svn commit: r1607062 - /openoffice/branches/AOO410/main/sw/source/ui/app/docshdrw.cxx
Author: jsc
Date: Tue Jul 1 12:51:44 2014
New Revision: 1607062
URL: http://svn.apache.org/r1607062
Log:
#124914# correct name of member variable, merged fix but removed code on trunk
Modified:
openoffice/branches/AOO410/main/sw/source/ui/app/docshdrw.cxx
Modified: openoffice/branches/AOO410/main/sw/source/ui/app/docshdrw.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/ui/app/docshdrw.cxx?rev=1607062r1=1607061r2=1607062view=diff
==
--- openoffice/branches/AOO410/main/sw/source/ui/app/docshdrw.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/ui/app/docshdrw.cxx Tue Jul 1
12:51:44 2014
@@ -58,7 +58,7 @@ using namespace ::com::sun::star;
void SwDocShell::InitDraw()
{
- SdrModel *pDrDoc = pDoc-GetDrawModel();
+ SdrModel *pDrDoc = mpDoc-GetDrawModel();
if( pDrDoc )
{
// Listen, bzw. Tables im ItemSet der DocShell anlegen
svn commit: r1607112 - /openoffice/trunk/main/xmloff/source/text/txtstyli.cxx
Author: alg
Date: Tue Jul 1 15:25:11 2014
New Revision: 1607112
URL: http://svn.apache.org/r1607112
Log:
corrected obviously wrong comparison
Modified:
openoffice/trunk/main/xmloff/source/text/txtstyli.cxx
Modified: openoffice/trunk/main/xmloff/source/text/txtstyli.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/text/txtstyli.cxx?rev=1607112r1=1607111r2=1607112view=diff
==
--- openoffice/trunk/main/xmloff/source/text/txtstyli.cxx (original)
+++ openoffice/trunk/main/xmloff/source/text/txtstyli.cxx Tue Jul 1 15:25:11
2014
@@ -539,7 +539,7 @@ void XMLTextStyleContext::FillPropertySe
(aContextIDs[1].nIndex == -1) ? makeAny( false ) :
GetProperties()[aContextIDs[1].nIndex].maValue );
}
-if(XML_STYLE_FAMILY_TABLE_TABLE == IsDefaultStyle() GetFamily())
+if(IsDefaultStyle() XML_STYLE_FAMILY_TABLE_TABLE == GetFamily())
{
OUString sCollapsingBorders(OUString( RTL_CONSTASCII_USTRINGPARAM(
CollapsingBorders ) ) );
DBG_ASSERT( rPropSet-getPropertySetInfo()-hasPropertyByName(
sCollapsingBorders ), property missing? );
svn commit: r1607164 - /openoffice/ooo-site/trunk/content/de/index.html
Author: marcus Date: Tue Jul 1 19:09:39 2014 New Revision: 1607164 URL: http://svn.apache.org/r1607164 Log: Fixed broken links Modified: openoffice/ooo-site/trunk/content/de/index.html Modified: openoffice/ooo-site/trunk/content/de/index.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/de/index.html?rev=1607164r1=1607163r2=1607164view=diff == --- openoffice/ooo-site/trunk/content/de/index.html (original) +++ openoffice/ooo-site/trunk/content/de/index.html Tue Jul 1 19:09:39 2014 @@ -126,7 +126,7 @@ screen reader. document.write( li + div class='action-download' + div class='action-text action-link' - + a href='download/index.html' + + a href='downloads/index.html' + h2Ich mouml;chte OpenOffice herunterladen/h2 + p style='font-size: 1.0em; font-weight: bold;'(Neueste Version: + VERSION + )/p + pLaden Sie Apache OpenOffice kostenlos herunter b(wirklich!)/b | @@ -147,7 +147,7 @@ screen reader. li div class=action-download div class=action-text action-link -a href=download/index.html +a href=downloads/index.html h2Ich mouml;chte OpenOffice herunterladen/h2 pLaden Sie Apache OpenOffice herunter./p /a
svn commit: r914644 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/de/index.html
Author: buildbot Date: Tue Jul 1 19:12:27 2014 New Revision: 914644 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/de/index.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Jul 1 19:12:27 2014 @@ -1 +1 @@ -1606933 +1607164 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Jul 1 19:12:27 2014 @@ -1 +1 @@ -1606933 +1607164 Modified: websites/staging/ooo-site/trunk/content/de/index.html == --- websites/staging/ooo-site/trunk/content/de/index.html (original) +++ websites/staging/ooo-site/trunk/content/de/index.html Tue Jul 1 19:12:27 2014 @@ -142,7 +142,7 @@ screen reader. document.write( li + div class='action-download' + div class='action-text action-link' - + a href='download/index.html' + + a href='downloads/index.html' + h2Ich mouml;chte OpenOffice herunterladen/h2 + p style='font-size: 1.0em; font-weight: bold;'(Neueste Version: + VERSION + )/p + pLaden Sie Apache OpenOffice kostenlos herunter b(wirklich!)/b | @@ -163,7 +163,7 @@ screen reader. li div class=action-download div class=action-text action-link -a href=download/index.html +a href=downloads/index.html h2Ich mouml;chte OpenOffice herunterladen/h2 pLaden Sie Apache OpenOffice herunter./p /a
svn commit: r1607168 - /openoffice/ooo-site/trunk/content/porting/index.html
Author: marcus Date: Tue Jul 1 19:14:09 2014 New Revision: 1607168 URL: http://svn.apache.org/r1607168 Log: Fixed wrong link, updated white-spaces Modified: openoffice/ooo-site/trunk/content/porting/index.html Modified: openoffice/ooo-site/trunk/content/porting/index.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/porting/index.html?rev=1607168r1=1607167r2=1607168view=diff == --- openoffice/ooo-site/trunk/content/porting/index.html (original) +++ openoffice/ooo-site/trunk/content/porting/index.html Tue Jul 1 19:14:09 2014 @@ -4,11 +4,12 @@ meta http-equiv=Content-Type content=text/html; charset=utf-8 / !-- link rel=Stylesheet href=styles/porting.css media=screen type=text/css / -- titleApache OpenOffice - Third-Party Ports and distributions/title - !-- style type=text/css + style type=text/css /* ![CDATA[ */ - @import styles/porting.css; + /* Exceptions on standard css ---*/ + /* @import styles/porting.css; */ /* ]] */ - /style -- + /style /head body @@ -18,118 +19,175 @@ h1Apache OpenOffice - Third-Party Ports and distributions/h1 p -The following list of third-party party ports and distributions is made -available as a service to the community. The Apache OpenOffice -project does not officially endorse or maintain these packages. If -you have a port or distribution that you want to be listed here please -send the details to our a href=mailto:d...@openoffice.apache.org;public mailing list/a. +The following list of third-party party ports and distributions is made available as a service to the community. The Apache +OpenOffice project does not officially endorse or maintain these packages. If you have a port or distribution that you want +to be listed here please send the details to our a href=mailto:d...@openoffice.apache.org;public mailing list/a. /p h2Ports and distributions available now/h2 -ul - li -h3a href=http://www.winpenpack.com/en/download.php?view.1341; title=X-ApacheOpenOffice -X-ApacheOpenOffice by winPenPack/a (Apache OpenOffice Portable version for Windows)/h3 -Apache OpenOffice re-packaged as a live/portable program by the winPenPack team, -allowing execution without further installation, from a USB Flash Drive or Hard Disk. - /li - li -h3a href=https://play.google.com/store/apps/details?id=com.andropenoffice; title=AndrOpen Office -AndrOpen Office/a (Android port of Apache OpenOffice)/h3 -AndrOpen Office is the world's first port of OpenOffice for Android. -It is made available on Google Play by the AndrOpen Office team and it requires Android 2.3 or later. - /li - li -h3a href=http://sourceforge.net/projects/apacheoo-deb/files/; -title=Unofficial Apache OpenOffice Debian/Ubuntu repository -Unofficial Apache OpenOffice Debian repository/a/h3 -A package repository by Marcelo Santana containing the same -Debian packages as the official version, to provide an -easier way for installation of Apache OpenOffice on Debian -and derivatives. For usage in Ubuntu, a -a href=http://almalivre.wordpress.com/2012/05/30/apache-openoffice-instalacao-via-repositorio-nao-oficial-para-debianubuntumint/;step-by-step guide/a - (with commentary in Portuguese) is available too. - /li - li -h3a href=http://people.apache.org/~arielch/packages/r1372282-glibc-2.5/; -title=Apache OpenOffice 3.4.1 for systems using glibc 2.5 -Apache OpenOffice 3.4.1 for Linux systems using glibc 2.5/a (32 and 64 bits)/h3 -A special build of Apache OpenOffice 3.4.1 by Ariel Constenla-Haile that will run on older -Linux distributions containing glibc 2.5 or 2.7, such as RHEL 5 and CentOS 5 (the official -3.4.1 builds -a href=https://issues.apache.org/ooo/show_bug.cgi?id=119385;require glibc 2.11/a. -Since Apache OpenOffice 4, the official builds work on systems with glibc 2.5). - /li - li -h3a href=http://www.prooo-box.org/; -title=PrOOo-Box -PrOOo-Box/a (German only)/h3 -A collection of open source applications for the office area, created by -German community members. The core of the collection is Apache OpenOffice. - /li -/ul +ul + li +h3 + a href=http://www.winpenpack.com/en/download.php?view.1341; +title=X-ApacheOpenOffice +X-ApacheOpenOffice by winPenPack + /a + (Apache OpenOffice Portable version for Windows) +/h3 +Apache OpenOffice re-packaged as a live/portable program by the winPenPack team, allowing execution
svn commit: r914645 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/porting/index.html
Author: buildbot Date: Tue Jul 1 19:15:43 2014 New Revision: 914645 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/porting/index.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Jul 1 19:15:43 2014 @@ -1 +1 @@ -1607164 +1607168 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Jul 1 19:15:43 2014 @@ -1 +1 @@ -1607164 +1607168 Modified: websites/staging/ooo-site/trunk/content/porting/index.html == --- websites/staging/ooo-site/trunk/content/porting/index.html (original) +++ websites/staging/ooo-site/trunk/content/porting/index.html Tue Jul 1 19:15:43 2014 @@ -6,11 +6,12 @@ meta http-equiv=Content-Type content=text/html; charset=utf-8 / !-- link rel=Stylesheet href=styles/porting.css media=screen type=text/css / -- titleApache OpenOffice - Third-Party Ports and distributions/title - !-- style type=text/css + style type=text/css /* ![CDATA[ */ - @import styles/porting.css; + /* Exceptions on standard css ---*/ + /* @import styles/porting.css; */ /* ]] */ - /style -- + /style !--#include virtual=/google-analytics.js -- !--#include virtual=/scripts/entourage.js -- @@ -34,118 +35,175 @@ h1Apache OpenOffice - Third-Party Ports and distributions/h1 p -The following list of third-party party ports and distributions is made -available as a service to the community. The Apache OpenOffice -project does not officially endorse or maintain these packages. If -you have a port or distribution that you want to be listed here please -send the details to our a href=mailto:d...@openoffice.apache.org;public mailing list/a. +The following list of third-party party ports and distributions is made available as a service to the community. The Apache +OpenOffice project does not officially endorse or maintain these packages. If you have a port or distribution that you want +to be listed here please send the details to our a href=mailto:d...@openoffice.apache.org;public mailing list/a. /p h2Ports and distributions available now/h2 -ul - li -h3a href=http://www.winpenpack.com/en/download.php?view.1341; title=X-ApacheOpenOffice -X-ApacheOpenOffice by winPenPack/a (Apache OpenOffice Portable version for Windows)/h3 -Apache OpenOffice re-packaged as a live/portable program by the winPenPack team, -allowing execution without further installation, from a USB Flash Drive or Hard Disk. - /li - li -h3a href=https://play.google.com/store/apps/details?id=com.andropenoffice; title=AndrOpen Office -AndrOpen Office/a (Android port of Apache OpenOffice)/h3 -AndrOpen Office is the world's first port of OpenOffice for Android. -It is made available on Google Play by the AndrOpen Office team and it requires Android 2.3 or later. - /li - li -h3a href=http://sourceforge.net/projects/apacheoo-deb/files/; -title=Unofficial Apache OpenOffice Debian/Ubuntu repository -Unofficial Apache OpenOffice Debian repository/a/h3 -A package repository by Marcelo Santana containing the same -Debian packages as the official version, to provide an -easier way for installation of Apache OpenOffice on Debian -and derivatives. For usage in Ubuntu, a -a href=http://almalivre.wordpress.com/2012/05/30/apache-openoffice-instalacao-via-repositorio-nao-oficial-para-debianubuntumint/;step-by-step guide/a - (with commentary in Portuguese) is available too. - /li - li -h3a href=http://people.apache.org/~arielch/packages/r1372282-glibc-2.5/; -title=Apache OpenOffice 3.4.1 for systems using glibc 2.5 -Apache OpenOffice 3.4.1 for Linux systems using glibc 2.5/a (32 and 64 bits)/h3 -A special build of Apache OpenOffice 3.4.1 by Ariel Constenla-Haile that will run on older -Linux distributions containing glibc 2.5 or 2.7, such as RHEL 5 and CentOS 5 (the official -3.4.1 builds -a href=https://issues.apache.org/ooo/show_bug.cgi?id=119385;require glibc 2.11/a. -Since Apache OpenOffice 4, the official builds work on systems with glibc 2.5). - /li - li -h3a href=http://www.prooo-box.org/; -title=PrOOo-Box -PrOOo-Box/a
svn commit: r1607169 - /openoffice/ooo-site/trunk/content/zh-tw/download/msg_prop_l10n_zh-tw.js
Author: marcus Date: Tue Jul 1 19:20:23 2014 New Revision: 1607169 URL: http://svn.apache.org/r1607169 Log: Updated strings, contributed by 'Hung Mark mark...@gmail.com' Modified: openoffice/ooo-site/trunk/content/zh-tw/download/msg_prop_l10n_zh-tw.js Modified: openoffice/ooo-site/trunk/content/zh-tw/download/msg_prop_l10n_zh-tw.js URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/zh-tw/download/msg_prop_l10n_zh-tw.js?rev=1607169r1=1607168r2=1607169view=diff == --- openoffice/ooo-site/trunk/content/zh-tw/download/msg_prop_l10n_zh-tw.js (original) +++ openoffice/ooo-site/trunk/content/zh-tw/download/msg_prop_l10n_zh-tw.js Tue Jul 1 19:20:23 2014 @@ -20,7 +20,7 @@ var l10n_download_headline_text = Ap // Download: Strings in the green box (used in index.html). var l10n_download_green_box_headline_text = ä¸è¼Apache OpenOffice; var l10n_download_green_box_headline_title = ä¸è¼Apache OpenOfficeï¼é¸æä½ å好çä½æ¥ç³»çµ±ãèªè¨åçæ¬; -var l10n_download_green_box_subtext1_text = 網ç«ç©ºéå¯åæ¼Sourceforge.net - ä¸ååä¿¡è³´ç網ç«; +var l10n_download_green_box_subtext1_text = ä¸è¼ç©ºéå¯åæ¼Sourceforge.net - ä¸ååä¿¡è³´ç網ç«; var l10n_download_green_box_subtext1_title = Apache OpenOffice äºé²ä½æªæ¡å¯åæ¼Sourceforge.net - ä¸ååä¿¡è³´ç網ç«; var l10n_download_green_box_subtext2_text = é¸æä½ å好çä½æ¥ç³»çµ±ãèªè¨å網ç«; var l10n_download_green_box_subtext2_title = é¸æä½ å好çä½æ¥ç³»çµ±ãèªè¨å網ç«; @@ -68,18 +68,18 @@ var l10n_nav_sysreq_title = 硬ç var l10n_nav_checksum_text = é©èä¸è¼å®æçæªæ¡; var l10n_nav_checksum_title= å¦ä½ä½¿ç¨ç°½ç« èéæ¹ç¢¼é©èä¸è¼å®æçæªæ¡?; var l10n_nav_license_text = ææ¬; -var l10n_nav_license_title = Apache OpenOffice License; +var l10n_nav_license_title = Apache OpenOffice使ç¨ææ¬è²æ; var l10n_nav_source_text = åå§ç¢¼; var l10n_nav_source_title = éå°åç¼äººå¡åå°æ¥ä½¿ç¨è ï¼ åå¾åå§ç¢¼å¾é ç·¨è¯Apache OpenOfficeã; var l10n_nav_build_text= ç·¨è¯æå¼; -var l10n_nav_build_title = éå°éç¼äººå¡åå°æ¥ä½¿ç¨è : å¦ä½å¾é ç·¨è¯ApacheOpenOfficeçæå¼; +var l10n_nav_build_title = éå°éç¼äººå¡åå°æ¥ä½¿ç¨è : å¦ä½å¾é ç·¨è¯Apache OpenOfficeçæå¼; var l10n_nav_sdk_text = è»é«éç¼å (SDK); var l10n_nav_sdk_title = éå°éç¼äººå¡: è»é«éç¼å ; // Documentation var l10n_nav_headline_2_text = 說ææ件; var l10n_nav_schedule_text = çæ¬ç¼è¡æé表; -var l10n_nav_schedule_title= æ°ç¼è¡çæ¬ä½æè¦å?; +var l10n_nav_schedule_title= æ°çæ¬é è¨ä½æç¼è¡?; var l10n_nav_hist_schedule_text= çæ¬ç¼è¡æ·å²; var l10n_nav_hist_schedule_title = èçæ¬æ¯ä½æç¼ä½ç?; var l10n_nav_inst_guide_text = å®è£æå¼; @@ -99,12 +99,12 @@ var l10n_nav_local_text = å¨å� var l10n_nav_local_title = ä»¥ä½ å好èªè¨æä¾çè³è¨åæå; var l10n_nav_stat_text = ä¸è¼çµ±è¨; var l10n_nav_stat_title= ä¸è¼åå ¶ä»çµ±è¨è³è¨; -var l10n_nav_mirrors1_text = å¦å¤çé¡å°ä¸è¼ç«é»#1; +var l10n_nav_mirrors1_text = é¡å°è¼é»#1; var l10n_nav_mirrors1_title= 使ç¨Apacheé¡å°ç¶²ç«ä¸è¼Apache OpenOffice; -var l10n_nav_mirrors2_text = å¦å¤çé¡å°ä¸è¼ç«é»#2; +var l10n_nav_mirrors2_text = é¡å°è¼é»#2; var l10n_nav_mirrors2_title= 使ç¨Apacheé¡å°ç¶²ç«ä¸è¼Apache OpenOffice; -var l10n_nav_porting_text = 第ä¸æ¹ç§»æ¤å³ç¼å¸çæ¬; -var l10n_nav_porting_title = ä¾èªç¬¬ä¸æ¹å» åæ製ä½ç移æ¤åç¼è¡çæ¬; +var l10n_nav_porting_text = 第ä¸æ¹ç§»æ¤åç¼ä½çæ¬; +var l10n_nav_porting_title = 第ä¸æ¹ä¾æåæ製ä½ç移æ¤åç¼è¡çæ¬; var l10n_nav_archive_text
svn commit: r914647 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/zh-tw/download/msg_prop_l10n_zh-tw.js
Author: buildbot Date: Tue Jul 1 19:21:14 2014 New Revision: 914647 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/download/msg_prop_l10n_zh-tw.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Jul 1 19:21:14 2014 @@ -1 +1 @@ -1607168 +1607169 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue Jul 1 19:21:14 2014 @@ -1 +1 @@ -1607168 +1607169 Modified: websites/staging/ooo-site/trunk/content/zh-tw/download/msg_prop_l10n_zh-tw.js == --- websites/staging/ooo-site/trunk/content/zh-tw/download/msg_prop_l10n_zh-tw.js (original) +++ websites/staging/ooo-site/trunk/content/zh-tw/download/msg_prop_l10n_zh-tw.js Tue Jul 1 19:21:14 2014 @@ -20,7 +20,7 @@ var l10n_download_headline_text = Ap // Download: Strings in the green box (used in index.html). var l10n_download_green_box_headline_text = ä¸è¼Apache OpenOffice; var l10n_download_green_box_headline_title = ä¸è¼Apache OpenOfficeï¼é¸æä½ å好çä½æ¥ç³»çµ±ãèªè¨åçæ¬; -var l10n_download_green_box_subtext1_text = 網ç«ç©ºéå¯åæ¼Sourceforge.net - ä¸ååä¿¡è³´ç網ç«; +var l10n_download_green_box_subtext1_text = ä¸è¼ç©ºéå¯åæ¼Sourceforge.net - ä¸ååä¿¡è³´ç網ç«; var l10n_download_green_box_subtext1_title = Apache OpenOffice äºé²ä½æªæ¡å¯åæ¼Sourceforge.net - ä¸ååä¿¡è³´ç網ç«; var l10n_download_green_box_subtext2_text = é¸æä½ å好çä½æ¥ç³»çµ±ãèªè¨å網ç«; var l10n_download_green_box_subtext2_title = é¸æä½ å好çä½æ¥ç³»çµ±ãèªè¨å網ç«; @@ -68,18 +68,18 @@ var l10n_nav_sysreq_title = 硬ç var l10n_nav_checksum_text = é©èä¸è¼å®æçæªæ¡; var l10n_nav_checksum_title= å¦ä½ä½¿ç¨ç°½ç« èéæ¹ç¢¼é©èä¸è¼å®æçæªæ¡?; var l10n_nav_license_text = ææ¬; -var l10n_nav_license_title = Apache OpenOffice License; +var l10n_nav_license_title = Apache OpenOffice使ç¨ææ¬è²æ; var l10n_nav_source_text = åå§ç¢¼; var l10n_nav_source_title = éå°åç¼äººå¡åå°æ¥ä½¿ç¨è ï¼ åå¾åå§ç¢¼å¾é ç·¨è¯Apache OpenOfficeã; var l10n_nav_build_text= ç·¨è¯æå¼; -var l10n_nav_build_title = éå°éç¼äººå¡åå°æ¥ä½¿ç¨è : å¦ä½å¾é ç·¨è¯ApacheOpenOfficeçæå¼; +var l10n_nav_build_title = éå°éç¼äººå¡åå°æ¥ä½¿ç¨è : å¦ä½å¾é ç·¨è¯Apache OpenOfficeçæå¼; var l10n_nav_sdk_text = è»é«éç¼å (SDK); var l10n_nav_sdk_title = éå°éç¼äººå¡: è»é«éç¼å ; // Documentation var l10n_nav_headline_2_text = 說ææ件; var l10n_nav_schedule_text = çæ¬ç¼è¡æé表; -var l10n_nav_schedule_title= æ°ç¼è¡çæ¬ä½æè¦å?; +var l10n_nav_schedule_title= æ°çæ¬é è¨ä½æç¼è¡?; var l10n_nav_hist_schedule_text= çæ¬ç¼è¡æ·å²; var l10n_nav_hist_schedule_title = èçæ¬æ¯ä½æç¼ä½ç?; var l10n_nav_inst_guide_text = å®è£æå¼; @@ -99,12 +99,12 @@ var l10n_nav_local_text = å¨å� var l10n_nav_local_title = ä»¥ä½ å好èªè¨æä¾çè³è¨åæå; var l10n_nav_stat_text = ä¸è¼çµ±è¨; var l10n_nav_stat_title= ä¸è¼åå ¶ä»çµ±è¨è³è¨; -var l10n_nav_mirrors1_text = å¦å¤çé¡å°ä¸è¼ç«é»#1; +var l10n_nav_mirrors1_text = é¡å°è¼é»#1; var l10n_nav_mirrors1_title= 使ç¨Apacheé¡å°ç¶²ç«ä¸è¼Apache OpenOffice; -var l10n_nav_mirrors2_text = å¦å¤çé¡å°ä¸è¼ç«é»#2; +var l10n_nav_mirrors2_text = é¡å°è¼é»#2; var l10n_nav_mirrors2_title= 使ç¨Apacheé¡å°ç¶²ç«ä¸è¼Apache OpenOffice; -var
svn commit: r914649 - in /websites/production/ooo-site: cgi-bin/ content/
Author: marcus Date: Tue Jul 1 19:30:52 2014 New Revision: 914649 Log: Publishing svnmucc operation to ooo-site site by marcus Added: websites/production/ooo-site/cgi-bin/ - copied from r914648, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r914648, websites/staging/ooo-site/trunk/content/
svn commit: r1607222 - in /openoffice/ooo-site/trunk/content/eu-test/download: index-new.html index.html
Author: robweir Date: Wed Jul 2 01:19:47 2014 New Revision: 1607222 URL: http://svn.apache.org/r1607222 Log: Place in new-style download page Added: openoffice/ooo-site/trunk/content/eu-test/download/index.html - copied unchanged from r1607221, openoffice/ooo-site/trunk/content/eu-test/download/index-new.html Removed: openoffice/ooo-site/trunk/content/eu-test/download/index-new.html
svn commit: r914705 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/eu-test/download/index-new.html content/eu-test/download/index.html
Author: buildbot
Date: Wed Jul 2 01:29:02 2014
New Revision: 914705
Log:
Staging update by buildbot for ooo-site
Removed:
websites/staging/ooo-site/trunk/content/eu-test/download/index-new.html
Modified:
websites/staging/ooo-site/trunk/cgi-bin/ (props changed)
websites/staging/ooo-site/trunk/content/ (props changed)
websites/staging/ooo-site/trunk/content/eu-test/download/index.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Jul 2 01:29:02 2014
@@ -1 +1 @@
-1607169
+1607222
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Jul 2 01:29:02 2014
@@ -1 +1 @@
-1607169
+1607222
Modified: websites/staging/ooo-site/trunk/content/eu-test/download/index.html
==
--- websites/staging/ooo-site/trunk/content/eu-test/download/index.html
(original)
+++ websites/staging/ooo-site/trunk/content/eu-test/download/index.html Wed Jul
2 01:29:02 2014
@@ -3,10 +3,6 @@
head
link href=/css/ooo.css rel=stylesheet type=text/css
-
-!--OOJP-20140518 line inserted in order to see off line how the file works --
-BASE href=http://www.openoffice.org;
-
meta http-equiv=Content-Type content=text/html; charset=utf-8 /
meta itemprop=name content=Download Apache OpenOffice /
meta itemprop=description content=Join the OpenOffice revolution, the
free office productivity suite with over 100 million trusted downloads. /
@@ -15,21 +11,23 @@
meta property=og:description content=Join the OpenOffice revolution, the
free office productivity suite with over 100 million trusted downloads. /
meta property=og:image
content=http://www.openoffice.org/images/aoo-logo-100x100.png; /
meta name=description content=Official Apache OpenOffice download page.
Join the OpenOffice revolution, the free office productivity suite with over
100 million trusted downloads. /
- titleApache OpenOffice Downloads - Official Site/title!--OOJP--
- script type=text/javascript src=/download/globalvars.js/script
- script type=text/javascript src=/download/languages.js/script
- script type=text/javascript src=/download/release_matrix.js/script
- script type=text/javascript src=/download/download.js/script
+ titleApache OpenOffice Downloads - Official Site/title
+ script type=text/javascript src=../../download/globalvars.js/script
+ script type=text/javascript src=msg_prop_l10n_eu.js/script
+ script type=text/javascript src=../../download/languages.js/script
+ script type=text/javascript
src=../../download/release_matrix.js/script
+ script type=text/javascript
src=../../download/boxed_download.js/script
+ script type=text/javascript src=../../download/download.js/script
style type=text/css
/* ![CDATA[ */
/* Exceptions on standard css ---*/
- @import /download/styles.css;
- @import /download/exceptions.css;
+ @import ../../download/styles.css;
+ @import ../../download/exceptions.css;
/* ]] */
/style
script
if (window.document.referrer.indexOf(shell.windows.com) != -1)
- location.href = /eu-test/why/why_odf.html;
+ location.href = ../why/why_odf.html;
function shareFacebook() {
_gaq.push(['_trackEvent','social', 'shareDownload', 'facebook']);
@@ -62,295 +60,198 @@
-div class=optionset
+div class=overall_optionset
- !-- Green: Stable release --
- !--OOJP-20140614
+ div class=optionset
+
+ !-- Text above the first colored box --
script type=text/javascript
- !-OOJP-
- // Set a specific language ISO code to force to assemble a certain localized
build as download URL
- var NL_LANGUAGE = ;
- // Get the download URL
- var LINK= getLink();
-
- if ( hasMirrorLink() ) {
-if ( LINK.toLowerCase().indexOf( sourceforge ) != -1 ) {
- // Download directly from a mirror with displayed platform and language.
- document.write( div class=\first button green\ id=\optionitem1\
onclick=\openItem('optionitem1','
- + LINK + '); + return false;\ );
- document.write( h2a href=' + LINK + ' title='Version + VERSION +
- Milestone + MILESTONE
- + - Build ID + BUILD + - SVN + SVN_REV + 'Download Apache
OpenOffice + VERSION + /a/h2
- + pa href=' + LINK + ' title='Version + VERSION + - Milestone
+ MILESTONE + - Build ID + BUILD
- + - SVN + SVN_REV + 'Click here for the most recent version
for:br /
- + b + UI_PLATFORM + /b and b + LANG_ARRAY[ 2 ] + /b (~ +
FILESIZE + MByte)/a/p );
-} else {
- // OS and/or package manager was not recognized, therefore use
other.html as download link.
- document.write( div class=\first button green\ id=\optionitem1\
buildbot failure in ASF Buildbot on openoffice-linux32-nightly
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/72 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
svn commit: r914708 - in /websites/production/ooo-site: cgi-bin/ content/
Author: robweir Date: Wed Jul 2 02:39:23 2014 New Revision: 914708 Log: Publishing svnmucc operation to ooo-site site by robweir Added: websites/production/ooo-site/cgi-bin/ - copied from r914707, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r914707, websites/staging/ooo-site/trunk/content/
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/64 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
