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/40 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/40 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: r1599116 - /openoffice/ooo-site/trunk/content/de/about-ooo/about-mailinglist.html
Author: joesch Date: Mon Jun 2 08:15:33 2014 New Revision: 1599116 URL: http://svn.apache.org/r1599116 Log: CMS commit to ooo-site by joesch Modified: openoffice/ooo-site/trunk/content/de/about-ooo/about-mailinglist.html Modified: openoffice/ooo-site/trunk/content/de/about-ooo/about-mailinglist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/de/about-ooo/about-mailinglist.html?rev=1599116r1=1599115r2=1599116view=diff == --- openoffice/ooo-site/trunk/content/de/about-ooo/about-mailinglist.html (original) +++ openoffice/ooo-site/trunk/content/de/about-ooo/about-mailinglist.html Mon Jun 2 08:15:33 2014 @@ -88,7 +88,7 @@ Sammellieferung: ttusers-de-digest-sub tr tdbBeschreibung/b/td - tdHier findet die bprojektinterne Diskussionen der deutschsprachigen AOO-Community statt/b, beispielsweise Aktivitäten wie:br / + tdDiese Mailiungliste dient bausschlieÃlich/b der bprojektinternen/b Kommunikation der deutschsprachigen AOO-Community, beispielsweise Aktivitäten wie:br / ndash; Koordination von Ãbersetzungen,br / ndash; Messeauftritte organisieren,br / ndash; Stammtische planen.br /
svn commit: r910875 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/de/about-ooo/about-mailinglist.html
Author: buildbot Date: Mon Jun 2 08:18:04 2014 New Revision: 910875 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/about-ooo/about-mailinglist.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 08:18:04 2014 @@ -1 +1 @@ -1598974 +1599116 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 08:18:04 2014 @@ -1 +1 @@ -1598974 +1599116 Modified: websites/staging/ooo-site/trunk/content/de/about-ooo/about-mailinglist.html == --- websites/staging/ooo-site/trunk/content/de/about-ooo/about-mailinglist.html (original) +++ websites/staging/ooo-site/trunk/content/de/about-ooo/about-mailinglist.html Mon Jun 2 08:18:04 2014 @@ -106,7 +106,7 @@ Sammellieferung: ttusers-de-digest-sub tr tdbBeschreibung/b/td - tdHier findet die bprojektinterne Diskussionen der deutschsprachigen AOO-Community statt/b, beispielsweise Aktivitäten wie:br / + tdDiese Mailiungliste dient bausschlieÃlich/b der bprojektinternen/b Kommunikation der deutschsprachigen AOO-Community, beispielsweise Aktivitäten wie:br / ndash; Koordination von Ãbersetzungen,br / ndash; Messeauftritte organisieren,br / ndash; Stammtische planen.br /
svn commit: r910877 - in /websites/production/ooo-site: cgi-bin/ content/
Author: joesch Date: Mon Jun 2 08:19:02 2014 New Revision: 910877 Log: Publishing svnmucc operation to ooo-site site by joesch Added: websites/production/ooo-site/cgi-bin/ - copied from r910875, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r910875, websites/staging/ooo-site/trunk/content/
svn commit: r1599118 - /openoffice/site/trunk/content/native-lang.mdtext
Author: joesch Date: Mon Jun 2 08:22:09 2014 New Revision: 1599118 URL: http://svn.apache.org/r1599118 Log: CMS commit to openoffice by joesch Modified: openoffice/site/trunk/content/native-lang.mdtext Modified: openoffice/site/trunk/content/native-lang.mdtext URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/native-lang.mdtext?rev=1599118r1=1599117r2=1599118view=diff == --- openoffice/site/trunk/content/native-lang.mdtext (original) +++ openoffice/site/trunk/content/native-lang.mdtext Mon Jun 2 08:22:09 2014 @@ -34,7 +34,7 @@ moderators to be established. Initiate s Native language mailing lists (This list is manually maintained and may not be up to date): * users...@openoffice.apache.org (German users mailing list) -* dev...@openoffie.apache.org (German mailing list for community planning) +* dev...@openoffice.apache.org (German mailing list for community planning) * general...@openoffice.apache.org (General Japanese mailing list) * general...@openoffice.apache.org (General Spanish mailing list) * progetto...@openoffice.apache.org (Italian mailing list for project-related discussions)
svn commit: r910882 - /websites/production/openoffice/content/
Author: joesch Date: Mon Jun 2 08:22:37 2014 New Revision: 910882 Log: Publishing svnmucc operation to openoffice site by joesch Added: websites/production/openoffice/content/ - copied from r910881, websites/staging/openoffice/trunk/content/
svn commit: r910880 - in /websites/staging/openoffice/trunk/content: ./ native-lang.html
Author: buildbot Date: Mon Jun 2 08:22:13 2014 New Revision: 910880 Log: Staging update by buildbot for openoffice Modified: websites/staging/openoffice/trunk/content/ (props changed) websites/staging/openoffice/trunk/content/native-lang.html Propchange: websites/staging/openoffice/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 08:22:13 2014 @@ -1 +1 @@ -1598009 +1599118 Modified: websites/staging/openoffice/trunk/content/native-lang.html == --- websites/staging/openoffice/trunk/content/native-lang.html (original) +++ websites/staging/openoffice/trunk/content/native-lang.html Mon Jun 2 08:22:13 2014 @@ -127,7 +127,7 @@ moderators to be established. Initiate s pNative language mailing lists (This list is manually maintained and may not be up to date):/p ul liusers...@openoffice.apache.org (German users mailing list)/li -lidev...@openoffie.apache.org (German mailing list for community planning)/li +lidev...@openoffice.apache.org (German mailing list for community planning)/li ligeneral...@openoffice.apache.org (General Japanese mailing list)/li ligeneral...@openoffice.apache.org (General Spanish mailing list)/li liprogetto...@openoffice.apache.org (Italian mailing list for project-related discussions)/li
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/36 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: r1599163 - in /openoffice/trunk: ext_libraries/ ext_libraries/gtest/ ext_libraries/gtest/prj/ ext_libraries/gtest/win/ main/ main/sal/prj/ main/sal/qa/sal/ main/solenv/inc/
Author: jsc Date: Mon Jun 2 10:57:39 2014 New Revision: 1599163 URL: http://svn.apache.org/r1599163 Log: #125003# integrate googletest framework for general use for unit testing Added: openoffice/trunk/ext_libraries/gtest/ openoffice/trunk/ext_libraries/gtest/gtest_version.mk openoffice/trunk/ext_libraries/gtest/makefile.mk openoffice/trunk/ext_libraries/gtest/prj/ openoffice/trunk/ext_libraries/gtest/prj/build.lst openoffice/trunk/ext_libraries/gtest/prj/d.lst openoffice/trunk/ext_libraries/gtest/win/ openoffice/trunk/ext_libraries/gtest/win/Library_gtest.mk openoffice/trunk/ext_libraries/gtest/win/Makefile openoffice/trunk/ext_libraries/gtest/win/Module_gtest.mk openoffice/trunk/ext_libraries/gtest/win/Package_inc.mk Modified: openoffice/trunk/ext_libraries/Repository.mk openoffice/trunk/ext_libraries/RepositoryFixes.mk openoffice/trunk/main/configure.in openoffice/trunk/main/external_deps.lst openoffice/trunk/main/sal/prj/build.lst openoffice/trunk/main/sal/qa/sal/makefile.mk openoffice/trunk/main/sal/qa/sal/test_types.cxx openoffice/trunk/main/set_soenv.in openoffice/trunk/main/solenv/inc/_tg_app.mk openoffice/trunk/main/solenv/inc/libs.mk openoffice/trunk/main/solenv/inc/target.mk openoffice/trunk/main/solenv/inc/tg_app.mk Modified: openoffice/trunk/ext_libraries/Repository.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/Repository.mk?rev=1599163r1=1599162r2=1599163view=diff == --- openoffice/trunk/ext_libraries/Repository.mk (original) +++ openoffice/trunk/ext_libraries/Repository.mk Mon Jun 2 10:57:39 2014 @@ -32,4 +32,5 @@ $(eval $(call gb_Helper_register_librari libeay32 \ ssleay32 \ zlib \ -)) \ No newline at end of file + gtest \ +)) Modified: openoffice/trunk/ext_libraries/RepositoryFixes.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/RepositoryFixes.mk?rev=1599163r1=1599162r2=1599163view=diff == --- openoffice/trunk/ext_libraries/RepositoryFixes.mk (original) +++ openoffice/trunk/ext_libraries/RepositoryFixes.mk Mon Jun 2 10:57:39 2014 @@ -27,6 +27,7 @@ gb_Library_FILENAMES := $(patsubst expat gb_Library_FILENAMES := $(patsubst libeay32:ilibeay32%,libeay32:libeay32%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ssleay32:issleay32%,ssleay32:ssleay32%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst zlib:izlib%,zlib:zlib%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst gtest:igtest%,gtest:igtest%,$(gb_Library_FILENAMES)) endif #gb_Library_FILENAMES := $(patsubst apr-util:iapr-util%,apr:libapr-util-1%,$(gb_Library_FILENAMES)) Added: openoffice/trunk/ext_libraries/gtest/gtest_version.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/gtest/gtest_version.mk?rev=1599163view=auto == --- openoffice/trunk/ext_libraries/gtest/gtest_version.mk (added) +++ openoffice/trunk/ext_libraries/gtest/gtest_version.mk Mon Jun 2 10:57:39 2014 @@ -0,0 +1,24 @@ +#** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# License); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +#http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + +GTEST_MAJOR=1 +GTEST_MINOR=7 +GTEST_MICRO=0 Added: openoffice/trunk/ext_libraries/gtest/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/gtest/makefile.mk?rev=1599163view=auto == --- openoffice/trunk/ext_libraries/gtest/makefile.mk (added) +++ openoffice/trunk/ext_libraries/gtest/makefile.mk Mon Jun 2 10:57:39 2014 @@ -0,0 +1,100 @@
svn commit: r1599169 - /openoffice/trunk/main/vcl/aqua/source/gdi/ctlayout.cxx
Author: hdu
Date: Mon Jun 2 11:30:49 2014
New Revision: 1599169
URL: http://svn.apache.org/r1599169
Log:
#i125020# fix the calculation of the text-update rectangle in CoreText
by doing the calculation before CTLineDraw() updates the text position.
Requesting the update early is possible because that update region is
not used until AquaSalInstance::Yield().
Modified:
openoffice/trunk/main/vcl/aqua/source/gdi/ctlayout.cxx
Modified: openoffice/trunk/main/vcl/aqua/source/gdi/ctlayout.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/ctlayout.cxx?rev=1599169r1=1599168r2=1599169view=diff
==
--- openoffice/trunk/main/vcl/aqua/source/gdi/ctlayout.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/ctlayout.cxx Mon Jun 2 11:30:49
2014
@@ -265,13 +265,7 @@ void CTLayout::DrawText( SalGraphics rG
CGContextSetTextPosition( rAquaGraphics.mrContext, aTextPos.x,
aTextPos.y );
- // set the text color as fill color (see
kCTForegroundColorFromContextAttributeName)
- CGContextSetFillColor( rAquaGraphics.mrContext,
rAquaGraphics.maTextColor.AsArray() );
-
- // draw the text
- CTLineDraw( mpCTLine, rAquaGraphics.mrContext );
-
- // request an update of the changed window area
+ // request an update of the to-be-changed window area
if( rAquaGraphics.IsWindowGraphics() )
{
const CGRect aInkRect = CTLineGetImageBounds( mpCTLine,
rAquaGraphics.mrContext );
@@ -279,6 +273,12 @@ void CTLayout::DrawText( SalGraphics rG
rAquaGraphics.RefreshRect( aRefreshRect );
}
+ // set the text color as fill color (see
kCTForegroundColorFromContextAttributeName)
+ CGContextSetFillColor( rAquaGraphics.mrContext,
rAquaGraphics.maTextColor.AsArray() );
+
+ // draw the text
+ CTLineDraw( mpCTLine, rAquaGraphics.mrContext );
+
// restore the original graphic context transformations
CGContextRestoreGState( rAquaGraphics.mrContext );
}
svn commit: r1599173 - /openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx
Author: hdu Date: Mon Jun 2 11:47:23 2014 New Revision: 1599173 URL: http://svn.apache.org/r1599173 Log: #i125020# fix rounding error in AquaSalGraphics::RefreshRect() Rounding left and width down can accumulate a rounding error of almost two in the calculation of right. The existing code compensates for this by increasing the width by two, but since left has been decremented by one to accommodate for antialiasing artifacts this compensation is one to little. Y-pos and height have the same problems and get the matching fix. Modified: openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx Modified: openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx?rev=1599173r1=1599172r2=1599173view=diff == --- openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx (original) +++ openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx Mon Jun 2 11:47:23 2014 @@ -245,8 +245,8 @@ void AquaSalGraphics::RefreshRect(float // this helps with antialiased rendering const Rectangle aVclRect(Point(static_castlong int(lX-1), static_castlong int(lY-1) ), -Size( static_castlong int(lWidth+2), - static_castlong int(lHeight+2) ) ); +Size( static_castlong int(lWidth+3), + static_castlong int(lHeight+3) ) ); mpFrame-maInvalidRect.Union( aVclRect ); } }
svn propchange: r1599173 - svn:log
Author: hdu Revision: 1599173 Modified property: svn:log Modified: svn:log at Mon Jun 2 11:49:05 2014 -- --- svn:log (original) +++ svn:log Mon Jun 2 11:49:05 2014 @@ -3,5 +3,6 @@ Rounding left and width down can accumulate a rounding error of almost two in the calculation of right. The existing code compensates for this by increasing the width by two, but since left has been decremented by one to accommodate for -antialiasing artifacts this compensation is one to little. Y-pos and height have +antialiasing artifacts this compensation is one to few by itself and two to few +when accounting for antialiasing artifacts on the right. Y-pos and height have the same problems and get the matching fix.
svn commit: r1599174 - /openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx
Author: hdu
Date: Mon Jun 2 11:54:15 2014
New Revision: 1599174
URL: http://svn.apache.org/r1599174
Log:
#i125020# allow antialiasing on all update borders for Aqua graphics
Modified:
openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx
Modified: openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx?rev=1599174r1=1599173r2=1599174view=diff
==
--- openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx Mon Jun 2
11:54:15 2014
@@ -243,10 +243,13 @@ void AquaSalGraphics::RefreshRect(float
{
// update a little more around the designated rectangle
// this helps with antialiased rendering
+// Rounding down x and width can accumulate a rounding error of up to 2
+// The decrementing of x, the rounding error and the antialiasing
border
+// require that the width and the height need to be increased by four
const Rectangle aVclRect(Point(static_castlong int(lX-1),
static_castlong int(lY-1) ),
-Size( static_castlong int(lWidth+3),
- static_castlong int(lHeight+3) ) );
+Size( static_castlong int(lWidth+4),
+ static_castlong int(lHeight+4) ) );
mpFrame-maInvalidRect.Union( aVclRect );
}
}
svn commit: r1599230 - in /openoffice/trunk/main/sal: prj/build.lst qa/osl/condition/makefile.mk qa/osl/condition/osl_Condition.cxx qa/osl/condition/osl_Condition_Const.h
Author: jsc
Date: Mon Jun 2 14:47:08 2014
New Revision: 1599230
URL: http://svn.apache.org/r1599230
Log:
#125003# migrate sal/qa/osl/condition to gtest
Modified:
openoffice/trunk/main/sal/prj/build.lst
openoffice/trunk/main/sal/qa/osl/condition/makefile.mk
openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx
openoffice/trunk/main/sal/qa/osl/condition/osl_Condition_Const.h
Modified: openoffice/trunk/main/sal/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/prj/build.lst?rev=1599230r1=1599229r2=1599230view=diff
==
--- openoffice/trunk/main/sal/prj/build.lst (original)
+++ openoffice/trunk/main/sal/prj/build.lst Mon Jun 2 14:47:08 2014
@@ -15,6 +15,7 @@ sasal\osl\unx
nmake - u sa_oslu
sa sal\osl\all
nmake - all sa_oslall sa_tc.u sa_inc NULL
sa sal\util
nmake - all sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_kill.n
sa_onlineupdate.n sa_osln.n sa_oslp.p sa_oslu.u sa_rtl sa_textenc NULL
sa sal\qa\sal nmake - all sa_qa_sal sa_util NULL
+sa sal\qa\osl\condition nmake - all sa_qa_osl_condition sa_util NULL
sa sal\cppunittester nmake - all sa_cppunittester sa_cpprt.u sa_util NULL
sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_cppunittester sa_util
NULL
Modified: openoffice/trunk/main/sal/qa/osl/condition/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/condition/makefile.mk?rev=1599230r1=1599229r2=1599230view=diff
==
--- openoffice/trunk/main/sal/qa/osl/condition/makefile.mk (original)
+++ openoffice/trunk/main/sal/qa/osl/condition/makefile.mk Mon Jun 2 14:47:08
2014
@@ -24,7 +24,7 @@
PRJ=..$/..$/..
PRJNAME=sal
-TARGET=qa_osl_condition
+TARGET=sal_ut_osl_condition
ENABLE_EXCEPTIONS=TRUE
@@ -35,22 +35,19 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
-# BEGIN
-# auto generated Target:Condition by codegen.pl
-SHL1OBJS= \
- $(SLO)$/osl_Condition.obj
+.IF $(ENABLE_UNIT_TESTS) != YES
+all:
+ @echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
+APP1OBJS = $(OBJ)/osl_Condition.obj
+APP1RPATH = NONE
+APP1STDLIBS = $(GTESTLIB) $(SALLIB)
+APP1TARGET = sal_ut_osl_condition
+APP1TEST = enabled
+#APP1TEST = disabled
-SHL1TARGET= osl_Condition
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+.INCLUDE: target.mk
-SHL1IMPLIB= i$(SHL1TARGET)
-
-DEF1NAME=$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-# auto generated Target:Condition
-# END --
-
-# --- Targets --
-
-.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
+.ENDIF
Modified: openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx?rev=1599230r1=1599229r2=1599230view=diff
==
--- openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx (original)
+++ openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx Mon Jun 2
14:47:08 2014
@@ -29,6 +29,8 @@
//
#include osl_Condition_Const.h
+#include gtest/gtest.h
+
using namespaceosl;
using namespacertl;
@@ -41,8 +43,8 @@ using namespace rtl;
*/
inline void printBool( sal_Bool bOk )
{
- t_print(#printBool# );
- ( sal_True == bOk ) ? t_print(TRUE!\n ): t_print(FALSE!\n );
+ printf(#printBool# );
+ ( sal_True == bOk ) ? printf(TRUE!\n ): printf(FALSE!\n );
}
/** print a UNI_CODE String.
@@ -51,9 +53,9 @@ inline void printUString( const ::rtl::O
{
rtl::OString aString;
- t_print(#printUString_u# );
+ printf(#printUString_u# );
aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
- t_print(%s\n, aString.getStr( ) );
+ printf(%s\n, aString.getStr( ) );
}
/** wait _nSec seconds.
@@ -61,7 +63,7 @@ inline void printUString( const ::rtl::O
void thread_sleep( sal_Int32 _nSec )
{
/// print statement in thread process must use fflush() to force
display.
- t_print(# wait %d seconds. , _nSec );
+ printf(# wait %d seconds. , _nSec );
fflush( stdout );
#ifdef WNT //Windows
@@ -70,7 +72,7 @@ void thread_sleep( sal_Int32 _nSec )
#if ( defined UNX ) || ( defined OS2 ) //Unix
sleep( _nSec );
#endif
- t_print(# done\n );
svn commit: r1599233 [4/9] - in /openoffice/trunk/main: cui/source/factory/ cui/source/inc/ cui/source/tabpages/ sc/source/core/data/ svx/ svx/inc/svx/ svx/inc/svx/sdr/attribute/ svx/source/dialog/ sv
Modified: openoffice/trunk/main/sw/source/core/unocore/unomap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/unocore/unomap.cxx?rev=1599233r1=1599232r2=1599233view=diff
==
--- openoffice/trunk/main/sw/source/core/unocore/unomap.cxx (original)
+++ openoffice/trunk/main/sw/source/core/unocore/unomap.cxx Mon Jun 2 15:00:50
2014
@@ -585,6 +585,14 @@ const SfxItemPropertyMapEntry* SwUnoProp
COMMON_TEXT_CONTENT_PROPERTIES
{ SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAME),
RES_TXTATR_CHARFMT, CPPU_E2T(CPPUTYPE_OUSTRING),
PropertyAttribute::MAYBEVOID, 0},\
{ SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAMES),
FN_UNO_CHARFMT_SEQUENCE, CPPU_E2T(CPPUTYPE_OUSTRINGS),
PropertyAttribute::MAYBEVOID, 0},\
+
+// added FillProperties for SW, same as
FILL_PROPERTIES in svx
+// but need own defines in Writer due to later association
of strings
+// and uno types (see loop at end of this method and
definition of SW_PROP_NMID)
+// This entry is for adding that properties to style
import/export
+// Added for paragraph backgrounds, this is for
paragraph itself
+FILL_PROPERTIES_SW
+
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aParagraphMap_Impl;
@@ -612,6 +620,14 @@ const SfxItemPropertyMapEntry* SwUnoProp
TABSTOPS_MAP_ENTRY
COMMON_TEXT_CONTENT_PROPERTIES
{ SW_PROP_NMID(UNO_NAME_PARA_AUTO_STYLE_NAME),
RES_AUTO_STYLE, CPPU_E2T(CPPUTYPE_OUSTRING),
PropertyAttribute::MAYBEVOID, 0},
+
+// added FillProperties for SW, same as
FILL_PROPERTIES in svx
+// but need own defines in Writer due to later association
of strings
+// and uno types (see loop at end of this method and
definition of SW_PROP_NMID)
+// This entry is for adding that properties to style
import/export
+// Added for paragraph backgrounds, this is for
Paragraph AutoStyles
+FILL_PROPERTIES_SW
+
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aAutoParaStyleMap;
@@ -727,6 +743,14 @@ const SfxItemPropertyMapEntry* SwUnoProp
static SfxItemPropertyMapEntry aParaStyleMap [] =
{
COMMON_PARA_STYLE_PROPERTIES
+
+// added FillProperties for SW, same as
FILL_PROPERTIES in svx
+// but need own defines in Writer due to later association
of strings
+// and uno types (see loop at end of this method and
definition of SW_PROP_NMID)
+// This entry is for adding that properties to style
import/export
+// Added for paragraph backgrounds, this is for
Paragraph Styles
+FILL_PROPERTIES_SW
+
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aParaStyleMap;
@@ -738,6 +762,14 @@ const SfxItemPropertyMapEntry* SwUnoProp
{
COMMON_PARA_STYLE_PROPERTIES
{ SW_PROP_NMID(UNO_NAME_PARA_STYLE_CONDITIONS),
FN_UNO_PARA_STYLE_CONDITIONS, CPPU_E2T(CPPUTYPE_SEQNAMEDVALUE),
PropertyAttribute::MAYBEVOID, 0},
+
+// added FillProperties for SW, same as
FILL_PROPERTIES in svx
+// but need own defines in Writer due to later association
of strings
+// and uno types (see loop at end of this method and
definition of SW_PROP_NMID)
+// This entry is for adding that properties to style
import/export
+// Added for paragraph backgrounds, this is for
Paragraph Styles
+FILL_PROPERTIES_SW
+
{0,0,0,0,0,0}
};
aMapEntriesArr[nPropertyId] = aParaStyleMap;
@@ -855,56 +887,59 @@ const SfxItemPropertyMapEntry* SwUnoProp
{
SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE), RES_BOX,
CPPU_E2T(CPPUTYPE_INT32), 0, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },
{ SW_PROP_NMID(UNO_NAME_SHADOW_FORMAT),
RES_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PROPERTY_NONE,
CONVERT_TWIPS},
- {
SW_PROP_NMID(UNO_NAME_HEADER_BACK_COLOR), FN_UNO_HEADER_BACKGROUND,
CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR
},
- // {
SW_PROP_NMID(UNO_NAME_HEADER_GRAPHIC), FN_UNO_HEADER_BACKGROUND,
svn commit: r1599233 [9/9] - in /openoffice/trunk/main: cui/source/factory/ cui/source/inc/ cui/source/tabpages/ sc/source/core/data/ svx/ svx/inc/svx/ svx/inc/svx/sdr/attribute/ svx/source/dialog/ sv
Modified: openoffice/trunk/main/xmloff/source/text/txtstyli.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/text/txtstyli.cxx?rev=1599233r1=1599232r2=1599233view=diff
==
--- openoffice/trunk/main/xmloff/source/text/txtstyli.cxx (original)
+++ openoffice/trunk/main/xmloff/source/text/txtstyli.cxx Mon Jun 2 15:00:50
2014
@@ -19,8 +19,6 @@
*
*/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include precompiled_xmloff.hxx
@@ -35,7 +33,6 @@
#include xmloff/xmltkmap.hxx
#include xmloff/xmltoken.hxx
#include xmloff/xmluconv.hxx
-
#include com/sun/star/beans/XMultiPropertySet.hpp
#include com/sun/star/container/XNameContainer.hpp
#include com/sun/star/document/XEventsSupplier.hpp
@@ -43,7 +40,6 @@
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/style/ParagraphStyleCategory.hpp
#include com/sun/star/style/XStyle.hpp
-
#include tools/debug.hxx
#include tools/diagnose_ex.h
@@ -53,6 +49,10 @@
#include utility
#include vector
+//
+#include xmlsdtypes.hxx
+#include xmloff/xmlerror.hxx
+
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
@@ -418,28 +418,25 @@ void XMLTextStyleContext::Finish( sal_Bo
}
void XMLTextStyleContext::FillPropertySet(
- const ReferenceXPropertySet rPropSet )
+const ReferenceXPropertySet rPropSet )
{
- // imitate the FillPropertySet of the super class, so we get a chance to
- // catch the combined characters attribute
-
- // imitate XMLPropStyleContext::FillPropertySet(...)
- UniReference SvXMLImportPropertyMapper xImpPrMap =
- ((SvXMLStylesContext
*)GetStyles())-GetImportPropertyMapper(GetFamily());
- DBG_ASSERT( xImpPrMap.is(), Where is the import prop mapper? );
- if( xImpPrMap.is() )
- {
-
- // imitate SvXMLImportPropertyMapper::FillPropertySet(...)
-
- // The reason for this is that we have no other way to
- // efficiently intercept the value of combined characters. To
- // get that value, we could iterate through the map once more,
- // but instead we chose to insert the code into this
- // iteration. I haven't been able to come up with a much more
- // intelligent solution.
+// imitate the FillPropertySet of the super class, so we get a chance to
+// catch the combined characters attribute
+// imitate XMLPropStyleContext::FillPropertySet(...)
+SvXMLStylesContext* pSvXMLStylesContext = static_cast SvXMLStylesContext*
(GetStyles());
+UniReference SvXMLImportPropertyMapper xImpPrMap =
pSvXMLStylesContext-GetImportPropertyMapper(GetFamily());
+DBG_ASSERT(xImpPrMap.is(),Where is the import prop mapper?);
+if(xImpPrMap.is())
+{
+// imitate SvXMLImportPropertyMapper::FillPropertySet(...)
+// The reason for this is that we have no other way to
+// efficiently intercept the value of combined characters. To
+// get that value, we could iterate through the map once more,
+// but instead we chose to insert the code into this
+// iteration. I haven't been able to come up with a much more
+// intelligent solution.
struct _ContextID_Index_Pair aContextIDs[] =
{
{ CTF_COMBINED_CHARACTERS_FIELD, -1 },
@@ -449,28 +446,56 @@ void XMLTextStyleContext::FillPropertySe
{ CTF_FONTFAMILYNAME, -1 },
{ CTF_FONTFAMILYNAME_CJK, -1 },
{ CTF_FONTFAMILYNAME_CTL, -1 },
+
+//UUU need special handling for DrawingLayer FillStyle names
+{ CTF_FILLGRADIENTNAME, -1 },
+{ CTF_FILLTRANSNAME, -1 },
+{ CTF_FILLHATCHNAME, -1 },
+{ CTF_FILLBITMAPNAME, -1 },
+
{ -1, -1 }
};
-// get property set info
-Reference XPropertySetInfo xInfo( rPropSet-getPropertySetInfo(),
UNO_SET_THROW );
+// the style families associated with the same index modulo 4
+static sal_uInt16 aFamilies[] =
+{
+XML_STYLE_FAMILY_SD_GRADIENT_ID,
+XML_STYLE_FAMILY_SD_GRADIENT_ID,
+XML_STYLE_FAMILY_SD_HATCH_ID,
+XML_STYLE_FAMILY_SD_FILL_IMAGE_ID
+};
+// get property set info
+Reference XPropertySetInfo xInfo;
+UniReference XMLPropertySetMapper rPropMapper;
bool bAutomatic = false;
-if( ((SvXMLStylesContext *)GetStyles())-IsAutomaticStyle()
-( GetFamily() == XML_STYLE_FAMILY_TEXT_TEXT || GetFamily() ==
XML_STYLE_FAMILY_TEXT_PARAGRAPH ) )
+
+if(pSvXMLStylesContext-IsAutomaticStyle()
+(XML_STYLE_FAMILY_TEXT_TEXT == GetFamily() ||
XML_STYLE_FAMILY_TEXT_PARAGRAPH == GetFamily()))
{
bAutomatic = true;
+
svn commit: r1599233 [7/9] - in /openoffice/trunk/main: cui/source/factory/ cui/source/inc/ cui/source/tabpages/ sc/source/core/data/ svx/ svx/inc/svx/ svx/inc/svx/sdr/attribute/ svx/source/dialog/ sv
Added: openoffice/trunk/main/xmloff/inc/xmlsdtypes.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/inc/xmlsdtypes.hxx?rev=1599233view=auto == --- openoffice/trunk/main/xmloff/inc/xmlsdtypes.hxx (added) +++ openoffice/trunk/main/xmloff/inc/xmlsdtypes.hxx Mon Jun 2 15:00:50 2014 @@ -0,0 +1,208 @@ +/** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +#ifndef _XMLSDTYPES_HXX +#define _XMLSDTYPES_HXX + +//#include xmloff/xmlnume.hxx +//#include xmloff/maptype.hxx +#include xmloff/xmltypes.hxx +//#include xmloff/xmlement.hxx +//#include xmloff/prhdlfac.hxx +//#include xmloff/xmlprmap.hxx +//#include xmloff/XMLTextListAutoStylePool.hxx +//#include xmloff/xmlexppr.hxx + +// +// types of own properties + +#defineXML_SD_TYPE_STROKE (XML_SD_TYPES_START + 0) +#defineXML_SD_TYPE_PRESPAGE_TYPE (XML_SD_TYPES_START + 1) +#defineXML_SD_TYPE_PRESPAGE_STYLE (XML_SD_TYPES_START + 2) +#defineXML_SD_TYPE_PRESPAGE_SPEED (XML_SD_TYPES_START + 3) +#defineXML_SD_TYPE_PRESPAGE_DURATION (XML_SD_TYPES_START + 4) +#defineXML_SD_TYPE_PRESPAGE_VISIBILITY (XML_SD_TYPES_START + 5) +#define XML_SD_TYPE_MARKER (XML_SD_TYPES_START + 6 ) +#define XML_SD_TYPE_OPACITY (XML_SD_TYPES_START + 7 ) +#define XML_SD_TYPE_LINEJOIN (XML_SD_TYPES_START + 8 ) +#define XML_SD_TYPE_FILLSTYLE (XML_SD_TYPES_START + 9 ) +#define XML_SD_TYPE_GRADIENT (XML_SD_TYPES_START + 10 ) +#define XML_SD_TYPE_GRADIENT_STEPCOUNT (XML_SD_TYPES_START + 11 ) +#define XML_SD_TYPE_SHADOW (XML_SD_TYPES_START + 12 ) +#define XML_SD_TYPE_TEXT_CROSSEDOUT (XML_SD_TYPES_START + 13 ) +#define XML_SD_TYPE_NUMBULLET (XML_SD_TYPES_START + 14 ) +#define XML_SD_TYPE_WRITINGMODE (XML_SD_TYPES_START + 15 ) +#define XML_SD_TYPE_BITMAP_MODE (XML_SD_TYPES_START + 16 ) +#define XML_SD_TYPE_BITMAPREPOFFSETX (XML_SD_TYPES_START + 17 ) +#define XML_SD_TYPE_BITMAPREPOFFSETY (XML_SD_TYPES_START + 18 ) +#define XML_SD_TYPE_FILLBITMAPSIZE (XML_SD_TYPES_START + 19 ) +#define XML_SD_TYPE_LOGICAL_SIZE (XML_SD_TYPES_START + 20 ) +#define XML_SD_TYPE_BITMAP_REFPOINT (XML_SD_TYPES_START + 21 ) +#define XML_SD_TYPE_PRESPAGE_BACKSIZE (XML_SD_TYPES_START + 22 ) +#define XML_TYPE_TEXT_ANIMATION_BLINKING (XML_SD_TYPES_START + 23 ) +#define XML_TYPE_TEXT_ANIMATION_STEPS (XML_SD_TYPES_START + 24 ) +#define XML_SD_TYPE_TEXT_ALIGN (XML_SD_TYPES_START + 25 ) +#define XML_SD_TYPE_VERTICAL_ALIGN (XML_SD_TYPES_START + 26 ) +#define XML_SD_TYPE_FITTOSIZE (XML_SD_TYPES_START + 27 ) +#define XML_SD_TYPE_MEASURE_HALIGN (XML_SD_TYPES_START + 28 ) +#define XML_SD_TYPE_MEASURE_VALIGN (XML_SD_TYPES_START + 29 ) +#define XML_SD_TYPE_MEASURE_UNIT (XML_SD_TYPES_START + 30 ) +#define XML_SD_TYPE_MEASURE_PLACING
svn commit: r1599235 - /openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx
Author: jsc Date: Mon Jun 2 15:06:55 2014 New Revision: 1599235 URL: http://svn.apache.org/r1599235 Log: #125003# add include for Windows Modified: openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx Modified: openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx?rev=1599235r1=1599234r2=1599235view=diff == --- openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx (original) +++ openoffice/trunk/main/sal/qa/osl/condition/osl_Condition.cxx Mon Jun 2 15:06:55 2014 @@ -29,6 +29,10 @@ // #include osl_Condition_Const.h +#ifdef WNT +#include Windows.h +#endif + #include gtest/gtest.h using namespaceosl;
buildbot success in ASF Buildbot on aoo-w7snap
The Buildbot has detected a passing build on builder aoo-w7snap while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/aoo-w7snap/builds/5 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-win7 Build Reason: The Nightly scheduler named 'aoo-win7-snapshot' triggered this build Build Source Stamp: [branch openoffice/tags/SNAPSHOT] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
svn commit: r1599302 - /openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js
Author: marcus Date: Mon Jun 2 18:35:42 2014 New Revision: 1599302 URL: http://svn.apache.org/r1599302 Log: Reworked the items for the platform select box Modified: openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js Modified: openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js?rev=1599302r1=1599301r2=1599302view=diff == --- openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js Mon Jun 2 18:35:42 2014 @@ -34,13 +34,13 @@ var LP_LANG = [ ast, bg, cs, da var SDK_LANG = [ en-US ]; // OS data for the select element. -var SEL_OS = [ Win_x86_install, Windows (EXE), .exe, - Linux_x86-64_install-deb, Linux 64-bit (x86-64) (DEB), .tar.gz, - Linux_x86-64_install-rpm, Linux 64-bit (x86-64) (RPM), .tar.gz, - Linux_x86_install-deb,Linux 32-bit (x86) (DEB),.tar.gz, - Linux_x86_install-rpm,Linux 32-bit (x86) (RPM),.tar.gz, - MacOS_x86-64_install, OS X 64-bit (x86-64) (DMG), .dmg, - MacOS_x86_install,OS X 32-bit (x86) (DMG), .dmg ]; +var SEL_OS = [ win32, Windows (EXE), .exe, + lnx64d, Linux 64-bit (x86-64) (DEB), .tar.gz, + lnx64r, Linux 64-bit (x86-64) (RPM), .tar.gz, + lnx32d, Linux 32-bit (x86) (DEB), .tar.gz, + lnx32r, Linux 32-bit (x86) (RPM), .tar.gz, + mac64, OS X 64-bit (x86-64) (DMG), .dmg, + mac32, OS X 32-bit (x86) (DMG), .dmg ]; /* var SEL_OS = [ win32, Windows 32-bit (x86) (EXE), Win_x86_install, .exe,
svn commit: r1599303 [1/2] - /openoffice/ooo-site/trunk/content/download/test/release_matrix_droplist.js
Author: marcus Date: Mon Jun 2 18:38:49 2014 New Revision: 1599303 URL: http://svn.apache.org/r1599303 Log: Removed the platform data as it is no longer needed Modified: openoffice/ooo-site/trunk/content/download/test/release_matrix_droplist.js
svn commit: r910980 [1/2] - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/release_matrix_droplist.js
Author: buildbot Date: Mon Jun 2 18:40:33 2014 New Revision: 910980 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/release_matrix_droplist.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 18:40:33 2014 @@ -1 +1 @@ -1599302 +1599303 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 18:40:33 2014 @@ -1 +1 @@ -1599302 +1599303
svn commit: r1599304 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Mon Jun 2 18:40:40 2014
New Revision: 1599304
URL: http://svn.apache.org/r1599304
Log:
Reworked the code for finding the correct platform to assemble the download link
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1599304r1=1599303r2=1599304view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Mon
Jun 2 18:40:40 2014
@@ -83,7 +83,9 @@ function initVars() {
LANG_ARRAY = ;// This array contains
all language specific data.
UI_PLATFORM = ;// The platform as
readable string.
UI_PLATFORM_NO_SUP = ;// The platform as
readable string, if not supported.
- URL_PLATFORM= ;// The platform as
part of the download URL.
+ PLATFORM= ;// The platform in
short form.
+ PLATFORM_FULL = ;// The platform as
part of the download URL (full install).
+ PLATFORM_LP = ;// The platform as
part of the download URL (langpack).
OLD_PLATFORM= false; // Is the browser
platform old (true) or not (false)?
RELEASE_PLATFORM_POS_FULL = 0; // The position of the
platform in the release matrix array (full install).
RELEASE_PLATFORM_POS_LP = 0; // The position of the
platform in the release matrix array (langpack).
@@ -112,8 +114,8 @@ function initVars() {
SOURCEFORGE_BASE_URL= ;// The base URL for
all binary files on Sourceforge.
SOURCEFORGE_PREV_URL= ;// The base URL for
all binary files (prev. version) on Sourceforge.
ASF_BASE_URL= ;// The base URL for
all binary files on Apache.
- ASF_DIST_BASE_URL = ;// The base URL for
all checksum files on Apache.
- ASF_DIST_PREV_URL = ;// The base URL for
all checksum files (prev. version) on Apache.
+// ASF_DIST_BASE_URL = ;// The base URL for
all checksum files on Apache.
+// ASF_DIST_PREV_URL = ;// The base URL for
all checksum files (prev. version) on Apache.
ASF_ARC_BASE_URL= ;// The base URL for
all checksum files on Apache.
ASF_ARC_PREV_URL= ;// The base URL for
all checksum files (prev. version) on Apache.
SF = false; // Does the download
URL points to Soureforge?
@@ -320,7 +322,7 @@ function fillVerSel() {
* Depends on OS data from browser
*/
function setOSSel() {
- // Depending on $URL_PLATFORM assign the platform string of the release
matrix.
+ // Depending on $PLATFORM assign the platform string of the release
matrix.
var sel_os = document.getElementById( os );
// var sel_os_text =
document.download.os.options[document.download.os.selectedIndex].text;
// PLATFORM_SEL = sel_os.value;
@@ -328,7 +330,7 @@ function setOSSel() {
/*
alert(
+ setOSSel() : Before switch
+ \n\n
- + URL_PLATFORM: + \t\t\t + URL_PLATFORM
+ \n
+ + PLATFORM: + \t\t\t + PLATFORM
+ \n
+ sel_os.selectedIndex: + \t + sel_os.selectedIndex
+ \n
+ sel_os.value: + \t\t\t + sel_os.value
+ \n
+ sel_os_text:+ \t\t\t + sel_os_text
+ \n
@@ -337,17 +339,17 @@ function setOSSel() {
+ );
*/
-// URL_PLATFORM = ;
+// PLATFORM = ;
// Set the recognized browser platform as default for the select box.
// alert( SEL_OS.length: + SEL_OS.length / 3 );
-// alert( URL_PLATFORM: + URL_PLATFORM );
+// alert( PLATFORM: + PLATFORM );
// alert( sel_os.selectedIndex: + sel_os.selectedIndex );
// for( var i = 0; i SEL_OS.length; i = i + 3 ) {
for( var i = 0, j = SEL_OS.length; i j; i = i + 3 ) {
// If the platform was found, assign the found index to the
select box.
// alert( i: + i / 2 + \n + SEL_OS[ i ]: + SEL_OS[ i ] );
- if( SEL_OS[ i ] === URL_PLATFORM ) {
+ if( SEL_OS[ i ] === PLATFORM ) {
sel_os.selectedIndex = i / 3;
// alert( Assigned: + i / 3 );
svn commit: r910982 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Mon Jun 2 18:42:49 2014
New Revision: 910982
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_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 2 18:42:49 2014
@@ -1 +1 @@
-1599303
+1599304
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 2 18:42:49 2014
@@ -1 +1 @@
-1599303
+1599304
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Mon Jun 2 18:42:49 2014
@@ -83,7 +83,9 @@ function initVars() {
LANG_ARRAY = ;// This array contains
all language specific data.
UI_PLATFORM = ;// The platform as
readable string.
UI_PLATFORM_NO_SUP = ;// The platform as
readable string, if not supported.
- URL_PLATFORM= ;// The platform as
part of the download URL.
+ PLATFORM= ;// The platform in
short form.
+ PLATFORM_FULL = ;// The platform as
part of the download URL (full install).
+ PLATFORM_LP = ;// The platform as
part of the download URL (langpack).
OLD_PLATFORM= false; // Is the browser
platform old (true) or not (false)?
RELEASE_PLATFORM_POS_FULL = 0; // The position of the
platform in the release matrix array (full install).
RELEASE_PLATFORM_POS_LP = 0; // The position of the
platform in the release matrix array (langpack).
@@ -112,8 +114,8 @@ function initVars() {
SOURCEFORGE_BASE_URL= ;// The base URL for
all binary files on Sourceforge.
SOURCEFORGE_PREV_URL= ;// The base URL for
all binary files (prev. version) on Sourceforge.
ASF_BASE_URL= ;// The base URL for
all binary files on Apache.
- ASF_DIST_BASE_URL = ;// The base URL for
all checksum files on Apache.
- ASF_DIST_PREV_URL = ;// The base URL for
all checksum files (prev. version) on Apache.
+// ASF_DIST_BASE_URL = ;// The base URL for
all checksum files on Apache.
+// ASF_DIST_PREV_URL = ;// The base URL for
all checksum files (prev. version) on Apache.
ASF_ARC_BASE_URL= ;// The base URL for
all checksum files on Apache.
ASF_ARC_PREV_URL= ;// The base URL for
all checksum files (prev. version) on Apache.
SF = false; // Does the download
URL points to Soureforge?
@@ -320,7 +322,7 @@ function fillVerSel() {
* Depends on OS data from browser
*/
function setOSSel() {
- // Depending on $URL_PLATFORM assign the platform string of the release
matrix.
+ // Depending on $PLATFORM assign the platform string of the release
matrix.
var sel_os = document.getElementById( os );
// var sel_os_text =
document.download.os.options[document.download.os.selectedIndex].text;
// PLATFORM_SEL = sel_os.value;
@@ -328,7 +330,7 @@ function setOSSel() {
/*
alert(
+ setOSSel() : Before switch
+ \n\n
- + URL_PLATFORM: + \t\t\t + URL_PLATFORM
+ \n
+ + PLATFORM: + \t\t\t + PLATFORM
+ \n
+ sel_os.selectedIndex: + \t + sel_os.selectedIndex
+ \n
+ sel_os.value: + \t\t\t + sel_os.value
+ \n
+ sel_os_text:+ \t\t\t + sel_os_text
+ \n
@@ -337,17 +339,17 @@ function setOSSel() {
+ );
*/
-// URL_PLATFORM = ;
+// PLATFORM = ;
// Set the recognized browser platform as default for the select box.
// alert( SEL_OS.length: + SEL_OS.length / 3 );
-// alert( URL_PLATFORM: + URL_PLATFORM );
+// alert( PLATFORM: + PLATFORM );
// alert( sel_os.selectedIndex: + sel_os.selectedIndex );
// for( var i = 0; i SEL_OS.length; i = i + 3 ) {
for( var
svn commit: r1599313 - /openoffice/ooo-site/trunk/content/qa/issue_handling/bug_writing_guidelines.html
Author: marcus Date: Mon Jun 2 19:13:10 2014 New Revision: 1599313 URL: http://svn.apache.org/r1599313 Log: Fixed broken links Modified: openoffice/ooo-site/trunk/content/qa/issue_handling/bug_writing_guidelines.html Modified: openoffice/ooo-site/trunk/content/qa/issue_handling/bug_writing_guidelines.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/qa/issue_handling/bug_writing_guidelines.html?rev=1599313r1=1599312r2=1599313view=diff == --- openoffice/ooo-site/trunk/content/qa/issue_handling/bug_writing_guidelines.html (original) +++ openoffice/ooo-site/trunk/content/qa/issue_handling/bug_writing_guidelines.html Mon Jun 2 19:13:10 2014 @@ -7,7 +7,6 @@ body div class=app h2Issue Writing Guidelines/h2 -p$Date: 2007/02/23 11:26:39 $ /p h4Consider the rulesbr /h4 pWe strongly encourage you to read the a href=basic_rules.htmlBasic @@ -104,7 +103,7 @@ IssueTracker requires that you select a (If they all look meaningless, click on the Component link, which links to descriptions of each component, to help you make the best choice.) /blockquote blockquote ba - href=http://www.openoffice.org/scdocs/ddIssues_EnterModify.html#platform; + href=https://issues.apache.org/ooo/page.cgi?id=fields.html#rep_platform; Platform/a:nbsp;On which hardware platform did you find this issue? /b(e.g., Sun, PC)br If you know the issue happens on all hardware platforms, choose 'All'. @@ -118,14 +117,14 @@ listed. /blockquote blockquote br iHow important is the issue? /i/blockquote blockquote ba - href=http://www.openoffice.org/scdocs/ddIssues_EnterModify.html#issuetype; + href=https://issues.apache.org/ooo/page.cgi?id=fields.html#cf_bug_type; Issue Type/a: Is this a defect, enhancement, feature-request, task or patch?/bbr This item defaults to 'defect'. (To determine the most appropriate type of issue, click on the Issue Type link for a full explanation of each choice.) /blockquote blockquote ba - href=http://www.openoffice.org/scdocs/ddIssues_EnterModify.html#priority; + href=https://issues.apache.org/ooo/page.cgi?id=fields.html#priority; Priority/a: How much does the problem affect the product's emoverall/em usefullness?/bbr Developers use this field as emone/em measure how to priorize @@ -133,13 +132,13 @@ their work.br This item defaults to '3'. 1 is the highest (rarely used), 5 the lowest priority.br Please read the a - href=http://www.openoffice.org/scdocs/ddIssues_EnterModify.html#priority;definition + href=https://issues.apache.org/ooo/page.cgi?id=fields.html#priority;definition of issue priorities/a carefully before attempting to use P2 or even P1./blockquote blockquote br iWho will be following up on the issue?/i /blockquote blockquote ba - href=http://www.openoffice.org/scdocs/ddIssues_EnterModify.html#assignedto; + href=https://issues.apache.org/ooo/page.cgi?id=fields.html#assigned_to; Assigned To/a: Which engineer should be responsible for fixing this issue?/bbr IssueTracker will automatically assign the issue to a default engineer @@ -174,8 +173,8 @@ possible. A precise step-by-step descrip For crashing issues it might help to have additional information in case you're able to provide that:/blockquote blockquotebr - ba href=http://www.openoffice.org/scdocs/notargetmilestone.html;Target -Milestone/a:/b Think of it as a deadline; targets are not + ba href=https://issues.apache.org/ooo/page.cgi?id=fields.html#target_milestone; +Target Milestone/a:/b Think of it as a deadline; targets are not determined or next build--for most issues, stipulate not determined. ul
svn commit: r910984 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/qa/issue_handling/bug_writing_guidelines.html
Author: buildbot Date: Mon Jun 2 19:14:34 2014 New Revision: 910984 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/qa/issue_handling/bug_writing_guidelines.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 19:14:34 2014 @@ -1 +1 @@ -1599304 +1599313 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 19:14:34 2014 @@ -1 +1 @@ -1599304 +1599313 Modified: websites/staging/ooo-site/trunk/content/qa/issue_handling/bug_writing_guidelines.html == --- websites/staging/ooo-site/trunk/content/qa/issue_handling/bug_writing_guidelines.html (original) +++ websites/staging/ooo-site/trunk/content/qa/issue_handling/bug_writing_guidelines.html Mon Jun 2 19:14:34 2014 @@ -24,7 +24,6 @@ div class=app h2Issue Writing Guidelines/h2 -p$Date: 2007/02/23 11:26:39 $ /p h4Consider the rulesbr /h4 pWe strongly encourage you to read the a href=basic_rules.htmlBasic @@ -121,7 +120,7 @@ IssueTracker requires that you select a (If they all look meaningless, click on the Component link, which links to descriptions of each component, to help you make the best choice.) /blockquote blockquote ba - href=http://www.openoffice.org/scdocs/ddIssues_EnterModify.html#platform; + href=https://issues.apache.org/ooo/page.cgi?id=fields.html#rep_platform; Platform/a:nbsp;On which hardware platform did you find this issue? /b(e.g., Sun, PC)br If you know the issue happens on all hardware platforms, choose 'All'. @@ -135,14 +134,14 @@ listed. /blockquote blockquote br iHow important is the issue? /i/blockquote blockquote ba - href=http://www.openoffice.org/scdocs/ddIssues_EnterModify.html#issuetype; + href=https://issues.apache.org/ooo/page.cgi?id=fields.html#cf_bug_type; Issue Type/a: Is this a defect, enhancement, feature-request, task or patch?/bbr This item defaults to 'defect'. (To determine the most appropriate type of issue, click on the Issue Type link for a full explanation of each choice.) /blockquote blockquote ba - href=http://www.openoffice.org/scdocs/ddIssues_EnterModify.html#priority; + href=https://issues.apache.org/ooo/page.cgi?id=fields.html#priority; Priority/a: How much does the problem affect the product's emoverall/em usefullness?/bbr Developers use this field as emone/em measure how to priorize @@ -150,13 +149,13 @@ their work.br This item defaults to '3'. 1 is the highest (rarely used), 5 the lowest priority.br Please read the a - href=http://www.openoffice.org/scdocs/ddIssues_EnterModify.html#priority;definition + href=https://issues.apache.org/ooo/page.cgi?id=fields.html#priority;definition of issue priorities/a carefully before attempting to use P2 or even P1./blockquote blockquote br iWho will be following up on the issue?/i /blockquote blockquote ba - href=http://www.openoffice.org/scdocs/ddIssues_EnterModify.html#assignedto; + href=https://issues.apache.org/ooo/page.cgi?id=fields.html#assigned_to; Assigned To/a: Which engineer should be responsible for fixing this issue?/bbr IssueTracker will automatically assign the issue to a default engineer @@ -191,8 +190,8 @@ possible. A precise step-by-step descrip For crashing issues it might help to have additional information in case you're able to provide that:/blockquote blockquotebr - ba href=http://www.openoffice.org/scdocs/notargetmilestone.html;Target -Milestone/a:/b Think of it as a deadline; targets are not + ba href=https://issues.apache.org/ooo/page.cgi?id=fields.html#target_milestone; +Target Milestone/a:/b Think of it as a deadline; targets are not determined or next build--for most issues, stipulate not determined. ul
svn commit: r910986 - in /websites/production/ooo-site: cgi-bin/ content/
Author: marcus Date: Mon Jun 2 19:16:41 2014 New Revision: 910986 Log: Publishing svnmucc operation to ooo-site site by marcus Added: websites/production/ooo-site/cgi-bin/ - copied from r910985, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r910985, websites/staging/ooo-site/trunk/content/
svn commit: r1599323 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Mon Jun 2 19:33:33 2014
New Revision: 1599323
URL: http://svn.apache.org/r1599323
Log:
Fixed error: Make a download possible when browsing from an unsupported
platform but changing the platform manual via select box
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1599323r1=1599322r2=1599323view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Mon
Jun 2 19:33:33 2014
@@ -962,6 +962,11 @@ function showErrorMessage( error_text )
document.getElementById( dl_err).style.cursor =
default;
document.getElementById( dl_err).style.display=
inline-block;
+ // Delete previously set string to get the possibility back to choose a
different platform
+ // and then to assemble a new download link.
+ UI_PLATFORM_NO_SUP = ;
+
+ // Set some error flags.
SF = false;
OTHER = false;
ARCHIVE = false;
@@ -1203,7 +1208,7 @@ function getLinkSel() {
}
*/
// If recognized platform is not Windows, Linux or Mac, show the
none-availability to the user.
- if( UI_PLATFORM_NO_SUP !== false ) {
+ if( UI_PLATFORM_NO_SUP !== ) {
// Show an error message that the chosen items do not lead to a
download.
error_text = bProblem:/b Apache OpenOffice + VERSION_SEL
+ is not available for b
+ UI_PLATFORM_NO_SUP + /b.
@@ -1410,7 +1415,7 @@ function getPlatform() {
var ua = navigator.userAgent.toLowerCase(); // Get
the User Agent string in lower cases.
var av = navigator.appVersion.toLowerCase();// Get
the application version in lower cases.
UI_PLATFORM= ;//
Delete previously set string.
- UI_PLATFORM_NO_SUP = false; //
Delete previously set string.
+ UI_PLATFORM_NO_SUP = ;//
Delete previously set string.
PLATFORM = ;//
Delete previously set string.
EXTENSION = ;//
Delete previously set string.
@@ -1487,7 +1492,8 @@ function getPlatform() {
if( os.indexOf( x11 ) !== -1 )
UI_PLATFORM_NO_SUP = unknown OS (X11 support);
// If $UI_PLATFORM_NO_SUP is already filled, something was
recognized and no more work is needed.
- if( UI_PLATFORM_NO_SUP !== false )
+
+ if( UI_PLATFORM_NO_SUP !== )
return PLATFORM;
// Windows?
svn commit: r1599326 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus Date: Mon Jun 2 19:40:14 2014 New Revision: 1599326 URL: http://svn.apache.org/r1599326 Log: Fixed typos Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1599326r1=1599325r2=1599326view=diff == --- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Mon Jun 2 19:40:14 2014 @@ -30,7 +30,7 @@ + p + ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' + liSelect your favorite operating system, language and version below./li - + liVerify that these oprions do not lead to valied download links./li + + liVerify that these options do not lead to valid download links./li + liClick on the following link to update the table below:/li + ol style='list-style: none none none;' + lia style='font-size: 1.2em; color: red;' href='javascript:void( 0 )'
svn commit: r910991 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/analyze_droplist.html
Author: buildbot Date: Mon Jun 2 19:40:51 2014 New Revision: 910991 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/analyze_droplist.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 19:40:51 2014 @@ -1 +1 @@ -1599323 +1599326 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 19:40:51 2014 @@ -1 +1 @@ -1599323 +1599326 Modified: websites/staging/ooo-site/trunk/content/download/test/analyze_droplist.html == --- websites/staging/ooo-site/trunk/content/download/test/analyze_droplist.html (original) +++ websites/staging/ooo-site/trunk/content/download/test/analyze_droplist.html Mon Jun 2 19:40:51 2014 @@ -46,7 +46,7 @@ + p + ol style='padding: 0px 0px 0px 15px; list-style: disc outside none;' + liSelect your favorite operating system, language and version below./li - + liVerify that these oprions do not lead to valied download links./li + + liVerify that these options do not lead to valid download links./li + liClick on the following link to update the table below:/li + ol style='list-style: none none none;' + lia style='font-size: 1.2em; color: red;' href='javascript:void( 0 )'
svn commit: r1599328 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Mon Jun 2 19:44:54 2014
New Revision: 1599328
URL: http://svn.apache.org/r1599328
Log:
Fixed typos
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1599328r1=1599327r2=1599328view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Mon
Jun 2 19:44:54 2014
@@ -1316,7 +1316,7 @@ function getLinkSel() {
// Set the values in the sub-green box for the 3 text lines.
document.getElementById( dl_rel_info ).innerHTML =
bRelease info:/b + REL_TEXT;
- document.getElementById( dl_f_info).innerHTML =
bFull installation:/b Filesize ~ + FILESIZE_FULL + MByte | Signatures
and hashes: ;
+ document.getElementById( dl_f_info).innerHTML =
bFull installation:/b File size ~ + FILESIZE_FULL + MByte | Signatures
and hashes: ;
document.getElementById( dl_f_chk_keys).href =
LINK_CHK_KEYS;
document.getElementById( dl_f_chk_keys).innerHTML =
KEYS;
document.getElementById( dl_f_chk_keys).title = KEYS
signature file;
@@ -1332,7 +1332,7 @@ function getLinkSel() {
document.getElementById( dl_f_chk_sha256 ).href =
LINK_CHK_SHA256_FULL;
document.getElementById( dl_f_chk_sha256 ).innerHTML =
SHA256;
document.getElementById( dl_f_chk_sha256 ).title =
SHA256 hash for: + FILENAME_FULL;
- document.getElementById( dl_lp_info ).innerHTML =
bLanguage pack:/b Filesize ~ + FILESIZE_LP + MByte | Signatures and
hashes: ;
+ document.getElementById( dl_lp_info ).innerHTML =
bLanguage pack:/b File size ~ + FILESIZE_LP + MByte | Signatures and
hashes: ;
document.getElementById( dl_lp_chk_keys ).href =
LINK_CHK_KEYS;
document.getElementById( dl_lp_chk_keys ).innerHTML =
KEYS;
document.getElementById( dl_lp_chk_keys ).title = KEYS
signature file;
svn commit: r910993 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Mon Jun 2 19:45:27 2014
New Revision: 910993
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_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 2 19:45:27 2014
@@ -1 +1 @@
-1599326
+1599328
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 2 19:45:27 2014
@@ -1 +1 @@
-1599326
+1599328
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Mon Jun 2 19:45:27 2014
@@ -1316,7 +1316,7 @@ function getLinkSel() {
// Set the values in the sub-green box for the 3 text lines.
document.getElementById( dl_rel_info ).innerHTML =
bRelease info:/b + REL_TEXT;
- document.getElementById( dl_f_info).innerHTML =
bFull installation:/b Filesize ~ + FILESIZE_FULL + MByte | Signatures
and hashes: ;
+ document.getElementById( dl_f_info).innerHTML =
bFull installation:/b File size ~ + FILESIZE_FULL + MByte | Signatures
and hashes: ;
document.getElementById( dl_f_chk_keys).href =
LINK_CHK_KEYS;
document.getElementById( dl_f_chk_keys).innerHTML =
KEYS;
document.getElementById( dl_f_chk_keys).title = KEYS
signature file;
@@ -1332,7 +1332,7 @@ function getLinkSel() {
document.getElementById( dl_f_chk_sha256 ).href =
LINK_CHK_SHA256_FULL;
document.getElementById( dl_f_chk_sha256 ).innerHTML =
SHA256;
document.getElementById( dl_f_chk_sha256 ).title =
SHA256 hash for: + FILENAME_FULL;
- document.getElementById( dl_lp_info ).innerHTML =
bLanguage pack:/b Filesize ~ + FILESIZE_LP + MByte | Signatures and
hashes: ;
+ document.getElementById( dl_lp_info ).innerHTML =
bLanguage pack:/b File size ~ + FILESIZE_LP + MByte | Signatures and
hashes: ;
document.getElementById( dl_lp_chk_keys ).href =
LINK_CHK_KEYS;
document.getElementById( dl_lp_chk_keys ).innerHTML =
KEYS;
document.getElementById( dl_lp_chk_keys ).title = KEYS
signature file;
svn commit: r1599330 - /openoffice/ooo-site/trunk/content/download/test/index_droplist.html
Author: marcus Date: Mon Jun 2 19:49:16 2014 New Revision: 1599330 URL: http://svn.apache.org/r1599330 Log: Open the download in a new browser tab Modified: openoffice/ooo-site/trunk/content/download/test/index_droplist.html Modified: openoffice/ooo-site/trunk/content/download/test/index_droplist.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/index_droplist.html?rev=1599330r1=1599329r2=1599330view=diff == --- openoffice/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ openoffice/ooo-site/trunk/content/download/test/index_droplist.html Mon Jun 2 19:49:16 2014 @@ -234,8 +234,8 @@ // Both download text buttons. + div class='dl-txt-btn' + h3 style='display: inline; cursor: default;' -+ a id='dl_f_link' style='padding: 5px 5px 5px 5px;' href='' title=''/a -+ a id='dl_lp_link' style='padding: 5px 5px 5px 5px;' href='' title=''/a ++ a id='dl_f_link' style='padding: 5px 5px 5px 5px;' href='' title='' target='_blank'/a ++ a id='dl_lp_link' style='padding: 5px 5px 5px 5px;' href='' title='' target='_blank'/a + /h3 + br /br / + /div
svn commit: r910994 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/index_droplist.html
Author: buildbot Date: Mon Jun 2 19:49:52 2014 New Revision: 910994 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/index_droplist.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 19:49:52 2014 @@ -1 +1 @@ -1599328 +1599330 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 19:49:52 2014 @@ -1 +1 @@ -1599328 +1599330 Modified: websites/staging/ooo-site/trunk/content/download/test/index_droplist.html == --- websites/staging/ooo-site/trunk/content/download/test/index_droplist.html (original) +++ websites/staging/ooo-site/trunk/content/download/test/index_droplist.html Mon Jun 2 19:49:52 2014 @@ -250,8 +250,8 @@ // Both download text buttons. + div class='dl-txt-btn' + h3 style='display: inline; cursor: default;' -+ a id='dl_f_link' style='padding: 5px 5px 5px 5px;' href='' title=''/a -+ a id='dl_lp_link' style='padding: 5px 5px 5px 5px;' href='' title=''/a ++ a id='dl_f_link' style='padding: 5px 5px 5px 5px;' href='' title='' target='_blank'/a ++ a id='dl_lp_link' style='padding: 5px 5px 5px 5px;' href='' title='' target='_blank'/a + /h3 + br /br / + /div
svn commit: r1599340 - /openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Author: marcus
Date: Mon Jun 2 20:17:11 2014
New Revision: 1599340
URL: http://svn.apache.org/r1599340
Log:
Updated text, updated variables, moved the link 'Update the table' below the
green box
Modified:
openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
Modified: openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html?rev=1599340r1=1599339r2=1599340view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html
(original)
+++ openoffice/ooo-site/trunk/content/download/test/analyze_droplist.html Mon
Jun 2 20:17:11 2014
@@ -29,18 +29,13 @@
+ p
+ ol style='padding: 0px 0px 0px 15px; list-style: disc outside
none;'
- + liSelect your favorite operating system, language and version
below./li
- + liVerify that these options do not lead to valid download
links./li
- + liClick on the following link to update the table below:/li
- + ol style='list-style: none none none;'
- + lia style='font-size: 1.2em; color: red;'
href='javascript:void( 0 )'
- + title='Put the selected options as values into the table below.'
onclick='updateTable(); return false;'
- + buUpdate the table below/u/b/a/li
- + /ol
+ + liSelect your favorite operating system, language and version in
the green below./li
+ + liVerify that these options bstill do not/b lead to valid
download links./li
+ + liClick on the link \Update the table\ below the green box./li
+ liCopy the complete table (really, from top to bottom)./li
+ br /
+ liThen create a new mail./li
- + liWrite a problem description (what do you see and what do you
expect)./li
+ + liWrite a problem description (what does not work and what do you
expect)./li
+ liAlso add details about your operating system./li
+ liPaste the copied data at the end./li
+ liFinally, send the mail to:
@@ -166,7 +161,18 @@
pnbsp;/p
/div
-div style=float: left;
+div style=clear: both; float: left;
+ p
+a style=padding: 0px 0px 0px 15px; font-size: 1.2em;
href=javascript:void( 0 )
+ title=Put the selected options as values into the table below.
onclick=updateTable(); return false;
+ bClick here to update the table/b
+/a
+ /p
+
+ pnbsp;/p
+/div
+
+div style=clear: both; float: left;
script type=text/javascript
document.write( div style='float: left;'
@@ -213,7 +219,9 @@
+ trtdRelease matrix language array data
/tdtd/td/tr/* RELEASE_LANG */
+ trtdUI platform name
/tdtd/td/tr/* UI_PLATFORM */
+ trtdUI platform name (not supported)
/tdtd/td/tr/* UI_PLATFORM_NO_SUP */
- + trtdURL platform name
/tdtd/td/tr/* URL_PLATFORM */
+ + trtdPlatform (short)
/tdtd/td/tr/* PLATFORM */
+ + trtdURL platform name (full)
/tdtd/td/tr/* PLATFORM_FULL */
+ + trtdURL platform name (lp)
/tdtd/td/tr/* PLATFORM_LP */
+ trtdURL platform name (from select box)
/tdtd/td/tr/* PLATFORM_SEL */
+ trtdVersion (from select box)
/tdtd/td/tr/* VERSION_SEL */
+ trtdFile name (full)
/tdtd/td/tr/* FILENAME_FULL */
@@ -242,10 +250,10 @@
function updateTable() {
// All variables and functions that should be shown in the table.
elements = [LANG_ARRAY[ 2 ], LANG_ISO, LANG_SEL, LANG_ARRAY,
RELEASE_PLATFORM_POS_FULL, RELEASE_PLATFORM_POS_LP,
- RELEASE_PLATFORM, RELEASE_LANG, UI_PLATFORM,
UI_PLATFORM_NO_SUP, URL_PLATFORM, PLATFORM_SEL,
- VERSION_SEL, FILENAME_FULL, FILENAME_LP, EXTENSION,
FILESIZE_FULL, FILESIZE_LP, REL_TEXT, LINK_FULL,
- LINK_LP, LINK_CHK_MD5_FULL, LINK_CHK_MD5_LP,
SOURCEFORGE_BASE_URL, ASF_ARC_BASE_URL, getLinkSel(),
- isLangSupported(), OLD_PLATFORM, SF, OTHER, ARCHIVE,
ERROR ];
+ RELEASE_PLATFORM, RELEASE_LANG, UI_PLATFORM,
UI_PLATFORM_NO_SUP, PLATFORM, PLATFORM_FULL, PLATFORM_LP,
+ PLATFORM_SEL, VERSION_SEL, FILENAME_FULL, FILENAME_LP,
EXTENSION, FILESIZE_FULL, FILESIZE_LP,
+ REL_TEXT, LINK_FULL, LINK_LP, LINK_CHK_MD5_FULL,
LINK_CHK_MD5_LP, SOURCEFORGE_BASE_URL,
+ ASF_ARC_BASE_URL, getLinkSel(), isLangSupported(),
OLD_PLATFORM, SF, OTHER, ARCHIVE, ERROR ];
// Assign the respective table cell with the variable or function.
// Start with the 20th row (i = 19) in the 2nd cell (1), count through
the elements array (j):
@@ -260,7 +268,6 @@
!-- Every new
svn commit: r910997 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/analyze_droplist.html
Author: buildbot
Date: Mon Jun 2 20:18:21 2014
New Revision: 910997
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/analyze_droplist.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 2 20:18:21 2014
@@ -1 +1 @@
-1599330
+1599340
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 2 20:18:21 2014
@@ -1 +1 @@
-1599330
+1599340
Modified:
websites/staging/ooo-site/trunk/content/download/test/analyze_droplist.html
==
--- websites/staging/ooo-site/trunk/content/download/test/analyze_droplist.html
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/analyze_droplist.html
Mon Jun 2 20:18:21 2014
@@ -45,18 +45,13 @@
+ p
+ ol style='padding: 0px 0px 0px 15px; list-style: disc outside
none;'
- + liSelect your favorite operating system, language and version
below./li
- + liVerify that these options do not lead to valid download
links./li
- + liClick on the following link to update the table below:/li
- + ol style='list-style: none none none;'
- + lia style='font-size: 1.2em; color: red;'
href='javascript:void( 0 )'
- + title='Put the selected options as values into the table below.'
onclick='updateTable(); return false;'
- + buUpdate the table below/u/b/a/li
- + /ol
+ + liSelect your favorite operating system, language and version in
the green below./li
+ + liVerify that these options bstill do not/b lead to valid
download links./li
+ + liClick on the link \Update the table\ below the green box./li
+ liCopy the complete table (really, from top to bottom)./li
+ br /
+ liThen create a new mail./li
- + liWrite a problem description (what do you see and what do you
expect)./li
+ + liWrite a problem description (what does not work and what do you
expect)./li
+ liAlso add details about your operating system./li
+ liPaste the copied data at the end./li
+ liFinally, send the mail to:
@@ -182,7 +177,18 @@
pnbsp;/p
/div
-div style=float: left;
+div style=clear: both; float: left;
+ p
+a style=padding: 0px 0px 0px 15px; font-size: 1.2em;
href=javascript:void( 0 )
+ title=Put the selected options as values into the table below.
onclick=updateTable(); return false;
+ bClick here to update the table/b
+/a
+ /p
+
+ pnbsp;/p
+/div
+
+div style=clear: both; float: left;
script type=text/javascript
document.write( div style='float: left;'
@@ -229,7 +235,9 @@
+ trtdRelease matrix language array data
/tdtd/td/tr/* RELEASE_LANG */
+ trtdUI platform name
/tdtd/td/tr/* UI_PLATFORM */
+ trtdUI platform name (not supported)
/tdtd/td/tr/* UI_PLATFORM_NO_SUP */
- + trtdURL platform name
/tdtd/td/tr/* URL_PLATFORM */
+ + trtdPlatform (short)
/tdtd/td/tr/* PLATFORM */
+ + trtdURL platform name (full)
/tdtd/td/tr/* PLATFORM_FULL */
+ + trtdURL platform name (lp)
/tdtd/td/tr/* PLATFORM_LP */
+ trtdURL platform name (from select box)
/tdtd/td/tr/* PLATFORM_SEL */
+ trtdVersion (from select box)
/tdtd/td/tr/* VERSION_SEL */
+ trtdFile name (full)
/tdtd/td/tr/* FILENAME_FULL */
@@ -258,10 +266,10 @@
function updateTable() {
// All variables and functions that should be shown in the table.
elements = [LANG_ARRAY[ 2 ], LANG_ISO, LANG_SEL, LANG_ARRAY,
RELEASE_PLATFORM_POS_FULL, RELEASE_PLATFORM_POS_LP,
- RELEASE_PLATFORM, RELEASE_LANG, UI_PLATFORM,
UI_PLATFORM_NO_SUP, URL_PLATFORM, PLATFORM_SEL,
- VERSION_SEL, FILENAME_FULL, FILENAME_LP, EXTENSION,
FILESIZE_FULL, FILESIZE_LP, REL_TEXT, LINK_FULL,
- LINK_LP, LINK_CHK_MD5_FULL, LINK_CHK_MD5_LP,
SOURCEFORGE_BASE_URL, ASF_ARC_BASE_URL, getLinkSel(),
- isLangSupported(), OLD_PLATFORM, SF, OTHER, ARCHIVE,
ERROR ];
+ RELEASE_PLATFORM, RELEASE_LANG, UI_PLATFORM,
UI_PLATFORM_NO_SUP, PLATFORM, PLATFORM_FULL, PLATFORM_LP,
+ PLATFORM_SEL, VERSION_SEL, FILENAME_FULL, FILENAME_LP,
EXTENSION, FILESIZE_FULL, FILESIZE_LP,
+ REL_TEXT,
svn commit: r1599364 - /openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js
Author: marcus Date: Mon Jun 2 21:26:45 2014 New Revision: 1599364 URL: http://svn.apache.org/r1599364 Log: Added item 'other' in OS select box to refer to porting webpage, added item 'older' to refer to the archive Modified: openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js Modified: openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js?rev=1599364r1=1599363r2=1599364view=diff == --- openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js (original) +++ openoffice/ooo-site/trunk/content/download/test/globalvars_droplist.js Mon Jun 2 21:26:45 2014 @@ -34,13 +34,14 @@ var LP_LANG = [ ast, bg, cs, da var SDK_LANG = [ en-US ]; // OS data for the select element. -var SEL_OS = [ win32, Windows (EXE), .exe, - lnx64d, Linux 64-bit (x86-64) (DEB), .tar.gz, - lnx64r, Linux 64-bit (x86-64) (RPM), .tar.gz, - lnx32d, Linux 32-bit (x86) (DEB), .tar.gz, - lnx32r, Linux 32-bit (x86) (RPM), .tar.gz, - mac64, OS X 64-bit (x86-64) (DMG), .dmg, - mac32, OS X 32-bit (x86) (DMG), .dmg ]; +var SEL_OS = [ win32, Windows (EXE), .exe, + lnx64d, Linux 64-bit (x86-64) (DEB), .tar.gz, + lnx64r, Linux 64-bit (x86-64) (RPM), .tar.gz, + lnx32d, Linux 32-bit (x86) (DEB), .tar.gz, + lnx32r, Linux 32-bit (x86) (RPM), .tar.gz, + mac64, OS X 64-bit (x86-64) (DMG), .dmg, + mac32, OS X 32-bit (x86) (DMG), .dmg, + other, More platforms / operating systems, ]; /* var SEL_OS = [ win32, Windows 32-bit (x86) (EXE), Win_x86_install, .exe, @@ -95,7 +96,8 @@ var SEL_LANG = [ ast, Asturian (A // Version data for the select element. var SEL_VER= [ 4.1.0, 4.1.0, 4.0.1, 4.0.1, - 4.0.0, 4.0.0 ]; + 4.0.0, 4.0.0, + older, Older releases ]; // Install type data for the select element. // var SEL_TYPE= [ e1, Choose install type, e2, ---,
svn commit: r911005 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/globalvars_droplist.js
Author: buildbot Date: Mon Jun 2 21:27:21 2014 New Revision: 911005 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/globalvars_droplist.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 21:27:21 2014 @@ -1 +1 @@ -1599340 +1599364 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 21:27:21 2014 @@ -1 +1 @@ -1599340 +1599364 Modified: websites/staging/ooo-site/trunk/content/download/test/globalvars_droplist.js == --- websites/staging/ooo-site/trunk/content/download/test/globalvars_droplist.js (original) +++ websites/staging/ooo-site/trunk/content/download/test/globalvars_droplist.js Mon Jun 2 21:27:21 2014 @@ -34,13 +34,14 @@ var LP_LANG = [ ast, bg, cs, da var SDK_LANG = [ en-US ]; // OS data for the select element. -var SEL_OS = [ win32, Windows (EXE), .exe, - lnx64d, Linux 64-bit (x86-64) (DEB), .tar.gz, - lnx64r, Linux 64-bit (x86-64) (RPM), .tar.gz, - lnx32d, Linux 32-bit (x86) (DEB), .tar.gz, - lnx32r, Linux 32-bit (x86) (RPM), .tar.gz, - mac64, OS X 64-bit (x86-64) (DMG), .dmg, - mac32, OS X 32-bit (x86) (DMG), .dmg ]; +var SEL_OS = [ win32, Windows (EXE), .exe, + lnx64d, Linux 64-bit (x86-64) (DEB), .tar.gz, + lnx64r, Linux 64-bit (x86-64) (RPM), .tar.gz, + lnx32d, Linux 32-bit (x86) (DEB), .tar.gz, + lnx32r, Linux 32-bit (x86) (RPM), .tar.gz, + mac64, OS X 64-bit (x86-64) (DMG), .dmg, + mac32, OS X 32-bit (x86) (DMG), .dmg, + other, More platforms / operating systems, ]; /* var SEL_OS = [ win32, Windows 32-bit (x86) (EXE), Win_x86_install, .exe, @@ -95,7 +96,8 @@ var SEL_LANG = [ ast, Asturian (A // Version data for the select element. var SEL_VER= [ 4.1.0, 4.1.0, 4.0.1, 4.0.1, - 4.0.0, 4.0.0 ]; + 4.0.0, 4.0.0, + older, Older releases ]; // Install type data for the select element. // var SEL_TYPE= [ e1, Choose install type, e2, ---,
svn commit: r1599365 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Mon Jun 2 21:29:08 2014
New Revision: 1599365
URL: http://svn.apache.org/r1599365
Log:
Implemented code to link to the porting webpage (for more platforms) and
archive (for oler releases)
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1599365r1=1599364r2=1599365view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Mon
Jun 2 21:29:08 2014
@@ -1243,6 +1243,42 @@ function getLinkSel() {
return ERROR;
}
+ // If version is 'older', create a download link that leads to the
archive webpage.
+ if( VERSION_SEL === older ) {
+ // In general, reset the data for link, text and title of all
elements.
+ resetElements();
+
+ // Set the URL to the archive as download link.
+ LINK_FULL = http://www.openoffice.org/download/archive.html;;
+
+ // Set the values for only one download text button.
+ document.getElementById( dl_f_link ).href =
LINK_FULL;
+ document.getElementById( dl_f_link ).innerHTML =
Archive: Download from older releases;
+ document.getElementById( dl_f_link ).title =
Archive: Download from older releases;
+ document.getElementById( dl_f_link ).style.display =
inline;
+ document.getElementById( dl_lp_link ).style.display = none;
+ document.getElementById( sub_green_box ).style.display =
none;
+
+ return LINK_FULL;
+ }
+
+ // If platform is 'other', create a download link that leads to the
Porting webpage.
+ if( PLATFORM_SEL === other ) {
+ // In general, reset the data for link, text and title of all
elements.
+ resetElements();
+
+ // Set the URL to the archive as download link.
+ LINK_FULL = http://www.openoffice.org/porting/;;
+
+ // Set the values for only one download text button.
+ document.getElementById( dl_f_link ).href =
LINK_FULL;
+ document.getElementById( dl_f_link ).innerHTML =
Porting: Download from other 3rd party vendors;
+ document.getElementById( dl_f_link ).title =
Porting: Download from other 3rd party vendors;
+ document.getElementById( dl_lp_link ).style.display = none;
+
+ return LINK_FULL;
+ }
+
// If language is not supported, show the none-availability to the user.
if( ! isLangSupported() ) {
if( R_MODE === 1 ) {
@@ -1391,12 +1427,15 @@ function getLinkSel() {
}
// Set the cursor style for the 3 links with icon to a help
sign.
- document.getElementById( dl_hlp_img ).style.cursor =
help;
- document.getElementById( dl_hlp ).style.cursor =
help;
- document.getElementById( dl_chk_img ).style.cursor =
help;
- document.getElementById( dl_chk ).style.cursor =
help;
- document.getElementById( dl_rpt_img ).style.cursor =
help;
- document.getElementById( dl_rpt ).style.cursor =
help;
+ document.getElementById( dl_hlp_img ).style.cursor
= help;
+ document.getElementById( dl_hlp ).style.cursor
= help;
+ document.getElementById( dl_chk_img ).style.cursor
= help;
+ document.getElementById( dl_chk ).style.cursor
= help;
+ document.getElementById( dl_rpt_img ).style.cursor
= help;
+ document.getElementById( dl_rpt ).style.cursor
= help;
+
+ // Make the sub-green box and therefore all elements visible.
+ document.getElementById( sub_green_box).style.display
= block;
}
// alertDbg( getLinkSel(): End );
svn commit: r911006 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Mon Jun 2 21:29:40 2014
New Revision: 911006
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_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 2 21:29:40 2014
@@ -1 +1 @@
-1599364
+1599365
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 2 21:29:40 2014
@@ -1 +1 @@
-1599364
+1599365
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Mon Jun 2 21:29:40 2014
@@ -1243,6 +1243,42 @@ function getLinkSel() {
return ERROR;
}
+ // If version is 'older', create a download link that leads to the
archive webpage.
+ if( VERSION_SEL === older ) {
+ // In general, reset the data for link, text and title of all
elements.
+ resetElements();
+
+ // Set the URL to the archive as download link.
+ LINK_FULL = http://www.openoffice.org/download/archive.html;;
+
+ // Set the values for only one download text button.
+ document.getElementById( dl_f_link ).href =
LINK_FULL;
+ document.getElementById( dl_f_link ).innerHTML =
Archive: Download from older releases;
+ document.getElementById( dl_f_link ).title =
Archive: Download from older releases;
+ document.getElementById( dl_f_link ).style.display =
inline;
+ document.getElementById( dl_lp_link ).style.display = none;
+ document.getElementById( sub_green_box ).style.display =
none;
+
+ return LINK_FULL;
+ }
+
+ // If platform is 'other', create a download link that leads to the
Porting webpage.
+ if( PLATFORM_SEL === other ) {
+ // In general, reset the data for link, text and title of all
elements.
+ resetElements();
+
+ // Set the URL to the archive as download link.
+ LINK_FULL = http://www.openoffice.org/porting/;;
+
+ // Set the values for only one download text button.
+ document.getElementById( dl_f_link ).href =
LINK_FULL;
+ document.getElementById( dl_f_link ).innerHTML =
Porting: Download from other 3rd party vendors;
+ document.getElementById( dl_f_link ).title =
Porting: Download from other 3rd party vendors;
+ document.getElementById( dl_lp_link ).style.display = none;
+
+ return LINK_FULL;
+ }
+
// If language is not supported, show the none-availability to the user.
if( ! isLangSupported() ) {
if( R_MODE === 1 ) {
@@ -1391,12 +1427,15 @@ function getLinkSel() {
}
// Set the cursor style for the 3 links with icon to a help
sign.
- document.getElementById( dl_hlp_img ).style.cursor =
help;
- document.getElementById( dl_hlp ).style.cursor =
help;
- document.getElementById( dl_chk_img ).style.cursor =
help;
- document.getElementById( dl_chk ).style.cursor =
help;
- document.getElementById( dl_rpt_img ).style.cursor =
help;
- document.getElementById( dl_rpt ).style.cursor =
help;
+ document.getElementById( dl_hlp_img ).style.cursor
= help;
+ document.getElementById( dl_hlp ).style.cursor
= help;
+ document.getElementById( dl_chk_img ).style.cursor
= help;
+ document.getElementById( dl_chk ).style.cursor
= help;
+ document.getElementById( dl_rpt_img ).style.cursor
= help;
+ document.getElementById( dl_rpt ).style.cursor
= help;
+
+ // Make the sub-green box and therefore all elements visible.
+ document.getElementById( sub_green_box).style.display
= block;
}
// alertDbg( getLinkSel(): End );
svn commit: r1599378 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Mon Jun 2 22:11:57 2014
New Revision: 1599378
URL: http://svn.apache.org/r1599378
Log:
Updated code to recognize the used browser and platform/OS
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1599378r1=1599377r2=1599378view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Mon
Jun 2 22:11:57 2014
@@ -1450,9 +1450,10 @@ function getLinkSel() {
function getPlatform() {
// For more help or data see: http://www.useragentstring.com;.
- var os = navigator.platform.toLowerCase(); // Get
the platform string in lower cases.
- var ua = navigator.userAgent.toLowerCase(); // Get
the User Agent string in lower cases.
- var av = navigator.appVersion.toLowerCase();// Get
the application version in lower cases.
+ var av = navigator.appVersion.toLowerCase();// Get
the application version in lower case.
+ var os = navigator.platform.toLowerCase(); // Get
the platform string in lower case.
+ var ua = navigator.userAgent.toLowerCase(); // Get
the user agent string in lower case.
+ var ve = navigator.vendor.toLowerCase();// Get
the vendor string in lower case.
UI_PLATFORM= ;//
Delete previously set string.
UI_PLATFORM_NO_SUP = ;//
Delete previously set string.
PLATFORM = ;//
Delete previously set string.
@@ -1477,64 +1478,78 @@ function getPlatform() {
}
if( os ) {
- // Recognized but not supported platforms/OS, set
$UI_PLATFORM_NO_SUP to show it to the user.
- if( os.indexOf( aix ) !== -1 )
UI_PLATFORM_NO_SUP = IBM AIX;
- if( os.indexOf( alphaserver ) !== -1 )
UI_PLATFORM_NO_SUP = AlphaServer;
- if( os.indexOf( amiga ) !== -1 )
UI_PLATFORM_NO_SUP = AmigaOS;
- if( ua.indexOf( android ) !== -1 ||
- av.indexOf( android ) !== -1 )
UI_PLATFORM_NO_SUP = Android mobile devices;
- if( os.indexOf( arm ) !== -1 )
UI_PLATFORM_NO_SUP = ARM mobile devices;
+ // Recognized but *not supported* platforms/OS, set
$UI_PLATFORM_NO_SUP to show it to the user.
+
+ // Mobile devices.
+ if( ua.indexOf( android ) !== -1 )
+ if( ua.indexOf( nexus ) !== -1
+ ve.indexOf( google) !== -1 )
UI_PLATFORM_NO_SUP = Google Nexus;
+ else if( ua.indexOf( moble) !== -1 )
UI_PLATFORM_NO_SUP = mobile devices (Android);
+
+ if( os.indexOf( arm ) !== -1 )
UI_PLATFORM_NO_SUP = mobile devices (ARM processor);
if( ua.indexOf( blackberry) !== -1 )
UI_PLATFORM_NO_SUP = Blackberry smartphones;
if( ua.indexOf( brew ) !== -1 )
UI_PLATFORM_NO_SUP = smartphones (BREW);
+ if( ua.indexOf( ce.net) !== -1 )
UI_PLATFORM_NO_SUP = mobile phones (Windows CE);
+ if( ua.indexOf( galaxy) !== -1 )
UI_PLATFORM_NO_SUP = Samsung Galaxy;
+ if( ua.indexOf( hiptop) !== -1 )
UI_PLATFORM_NO_SUP = smartphones (Hiptop);
+ if( ua.indexOf( htc ) !== -1 )
UI_PLATFORM_NO_SUP = HTC mobile devices;
+ if( ua.indexOf( ipad ) !== -1 ||
+ ua.indexOf( iphone) !== -1 ||
+ ua.indexOf( ipod ) !== -1 )
UI_PLATFORM_NO_SUP = Apple iPhone/iPad/iPod;
+ if( ua.indexOf( kindle) !== -1 )
UI_PLATFORM_NO_SUP = Amazon Kindle;
+ if( ua.indexOf( lg) !== -1 )
UI_PLATFORM_NO_SUP = LG mobile devices;
+ if( ua.indexOf( nokia ) !== -1 )
UI_PLATFORM_NO_SUP = mobile phones (Nokia);
+ if( ua.indexOf( palm ) !== -1 )
UI_PLATFORM_NO_SUP = mobile phones (Palm OS);
+ if( ua.indexOf( pike ) !== -1 )
svn commit: r911010 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Mon Jun 2 22:12:30 2014
New Revision: 911010
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_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 2 22:12:30 2014
@@ -1 +1 @@
-1599365
+1599378
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 2 22:12:30 2014
@@ -1 +1 @@
-1599365
+1599378
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Mon Jun 2 22:12:30 2014
@@ -1450,9 +1450,10 @@ function getLinkSel() {
function getPlatform() {
// For more help or data see: http://www.useragentstring.com;.
- var os = navigator.platform.toLowerCase(); // Get
the platform string in lower cases.
- var ua = navigator.userAgent.toLowerCase(); // Get
the User Agent string in lower cases.
- var av = navigator.appVersion.toLowerCase();// Get
the application version in lower cases.
+ var av = navigator.appVersion.toLowerCase();// Get
the application version in lower case.
+ var os = navigator.platform.toLowerCase(); // Get
the platform string in lower case.
+ var ua = navigator.userAgent.toLowerCase(); // Get
the user agent string in lower case.
+ var ve = navigator.vendor.toLowerCase();// Get
the vendor string in lower case.
UI_PLATFORM= ;//
Delete previously set string.
UI_PLATFORM_NO_SUP = ;//
Delete previously set string.
PLATFORM = ;//
Delete previously set string.
@@ -1477,64 +1478,78 @@ function getPlatform() {
}
if( os ) {
- // Recognized but not supported platforms/OS, set
$UI_PLATFORM_NO_SUP to show it to the user.
- if( os.indexOf( aix ) !== -1 )
UI_PLATFORM_NO_SUP = IBM AIX;
- if( os.indexOf( alphaserver ) !== -1 )
UI_PLATFORM_NO_SUP = AlphaServer;
- if( os.indexOf( amiga ) !== -1 )
UI_PLATFORM_NO_SUP = AmigaOS;
- if( ua.indexOf( android ) !== -1 ||
- av.indexOf( android ) !== -1 )
UI_PLATFORM_NO_SUP = Android mobile devices;
- if( os.indexOf( arm ) !== -1 )
UI_PLATFORM_NO_SUP = ARM mobile devices;
+ // Recognized but *not supported* platforms/OS, set
$UI_PLATFORM_NO_SUP to show it to the user.
+
+ // Mobile devices.
+ if( ua.indexOf( android ) !== -1 )
+ if( ua.indexOf( nexus ) !== -1
+ ve.indexOf( google) !== -1 )
UI_PLATFORM_NO_SUP = Google Nexus;
+ else if( ua.indexOf( moble) !== -1 )
UI_PLATFORM_NO_SUP = mobile devices (Android);
+
+ if( os.indexOf( arm ) !== -1 )
UI_PLATFORM_NO_SUP = mobile devices (ARM processor);
if( ua.indexOf( blackberry) !== -1 )
UI_PLATFORM_NO_SUP = Blackberry smartphones;
if( ua.indexOf( brew ) !== -1 )
UI_PLATFORM_NO_SUP = smartphones (BREW);
+ if( ua.indexOf( ce.net) !== -1 )
UI_PLATFORM_NO_SUP = mobile phones (Windows CE);
+ if( ua.indexOf( galaxy) !== -1 )
UI_PLATFORM_NO_SUP = Samsung Galaxy;
+ if( ua.indexOf( hiptop) !== -1 )
UI_PLATFORM_NO_SUP = smartphones (Hiptop);
+ if( ua.indexOf( htc ) !== -1 )
UI_PLATFORM_NO_SUP = HTC mobile devices;
+ if( ua.indexOf( ipad ) !== -1 ||
+ ua.indexOf( iphone) !== -1 ||
+ ua.indexOf( ipod ) !== -1 )
UI_PLATFORM_NO_SUP = Apple iPhone/iPad/iPod;
+ if( ua.indexOf( kindle) !== -1 )
UI_PLATFORM_NO_SUP = Amazon
svn commit: r1599382 - /openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Author: marcus
Date: Mon Jun 2 22:30:56 2014
New Revision: 1599382
URL: http://svn.apache.org/r1599382
Log:
Changed the order (first 'other platforms' then 'older releases', updated text
Modified:
openoffice/ooo-site/trunk/content/download/test/download_droplist.js
Modified: openoffice/ooo-site/trunk/content/download/test/download_droplist.js
URL:
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/test/download_droplist.js?rev=1599382r1=1599381r2=1599382view=diff
==
--- openoffice/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ openoffice/ooo-site/trunk/content/download/test/download_droplist.js Mon
Jun 2 22:30:56 2014
@@ -1243,38 +1243,38 @@ function getLinkSel() {
return ERROR;
}
- // If version is 'older', create a download link that leads to the
archive webpage.
- if( VERSION_SEL === older ) {
+ // If platform is 'other', create a download link that leads to the
Porting webpage.
+ if( PLATFORM_SEL === other ) {
// In general, reset the data for link, text and title of all
elements.
resetElements();
// Set the URL to the archive as download link.
- LINK_FULL = http://www.openoffice.org/download/archive.html;;
+ LINK_FULL = http://www.openoffice.org/porting/;;
// Set the values for only one download text button.
document.getElementById( dl_f_link ).href =
LINK_FULL;
- document.getElementById( dl_f_link ).innerHTML =
Archive: Download from older releases;
- document.getElementById( dl_f_link ).title =
Archive: Download from older releases;
- document.getElementById( dl_f_link ).style.display =
inline;
+ document.getElementById( dl_f_link ).innerHTML =
Porting: Download from other 3rd party vendors;
+ document.getElementById( dl_f_link ).title = Click
to browse to the porting webpage and download from other 3rd party vendors;
document.getElementById( dl_lp_link ).style.display = none;
- document.getElementById( sub_green_box ).style.display =
none;
return LINK_FULL;
}
- // If platform is 'other', create a download link that leads to the
Porting webpage.
- if( PLATFORM_SEL === other ) {
+ // If version is 'older', create a download link that leads to the
archive webpage.
+ if( VERSION_SEL === older ) {
// In general, reset the data for link, text and title of all
elements.
resetElements();
// Set the URL to the archive as download link.
- LINK_FULL = http://www.openoffice.org/porting/;;
+ LINK_FULL = http://www.openoffice.org/download/archive.html;;
// Set the values for only one download text button.
document.getElementById( dl_f_link ).href =
LINK_FULL;
- document.getElementById( dl_f_link ).innerHTML =
Porting: Download from other 3rd party vendors;
- document.getElementById( dl_f_link ).title =
Porting: Download from other 3rd party vendors;
+ document.getElementById( dl_f_link ).innerHTML =
Archive: Download from older releases;
+ document.getElementById( dl_f_link ).title = Click
to browse to the archive and download older releases;
+ document.getElementById( dl_f_link ).style.display =
inline;
document.getElementById( dl_lp_link ).style.display = none;
+ document.getElementById( sub_green_box ).style.display =
none;
return LINK_FULL;
}
svn commit: r911013 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/test/download_droplist.js
Author: buildbot
Date: Mon Jun 2 22:31:31 2014
New Revision: 911013
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_droplist.js
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 2 22:31:31 2014
@@ -1 +1 @@
-1599378
+1599382
Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 2 22:31:31 2014
@@ -1 +1 @@
-1599378
+1599382
Modified:
websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
==
--- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js
Mon Jun 2 22:31:31 2014
@@ -1243,38 +1243,38 @@ function getLinkSel() {
return ERROR;
}
- // If version is 'older', create a download link that leads to the
archive webpage.
- if( VERSION_SEL === older ) {
+ // If platform is 'other', create a download link that leads to the
Porting webpage.
+ if( PLATFORM_SEL === other ) {
// In general, reset the data for link, text and title of all
elements.
resetElements();
// Set the URL to the archive as download link.
- LINK_FULL = http://www.openoffice.org/download/archive.html;;
+ LINK_FULL = http://www.openoffice.org/porting/;;
// Set the values for only one download text button.
document.getElementById( dl_f_link ).href =
LINK_FULL;
- document.getElementById( dl_f_link ).innerHTML =
Archive: Download from older releases;
- document.getElementById( dl_f_link ).title =
Archive: Download from older releases;
- document.getElementById( dl_f_link ).style.display =
inline;
+ document.getElementById( dl_f_link ).innerHTML =
Porting: Download from other 3rd party vendors;
+ document.getElementById( dl_f_link ).title = Click
to browse to the porting webpage and download from other 3rd party vendors;
document.getElementById( dl_lp_link ).style.display = none;
- document.getElementById( sub_green_box ).style.display =
none;
return LINK_FULL;
}
- // If platform is 'other', create a download link that leads to the
Porting webpage.
- if( PLATFORM_SEL === other ) {
+ // If version is 'older', create a download link that leads to the
archive webpage.
+ if( VERSION_SEL === older ) {
// In general, reset the data for link, text and title of all
elements.
resetElements();
// Set the URL to the archive as download link.
- LINK_FULL = http://www.openoffice.org/porting/;;
+ LINK_FULL = http://www.openoffice.org/download/archive.html;;
// Set the values for only one download text button.
document.getElementById( dl_f_link ).href =
LINK_FULL;
- document.getElementById( dl_f_link ).innerHTML =
Porting: Download from other 3rd party vendors;
- document.getElementById( dl_f_link ).title =
Porting: Download from other 3rd party vendors;
+ document.getElementById( dl_f_link ).innerHTML =
Archive: Download from older releases;
+ document.getElementById( dl_f_link ).title = Click
to browse to the archive and download older releases;
+ document.getElementById( dl_f_link ).style.display =
inline;
document.getElementById( dl_lp_link ).style.display = none;
+ document.getElementById( sub_green_box ).style.display =
none;
return LINK_FULL;
}
svn commit: r1599387 - /openoffice/ooo-site/trunk/content/download/checksums.html
Author: marcus Date: Mon Jun 2 22:46:31 2014 New Revision: 1599387 URL: http://svn.apache.org/r1599387 Log: Fixed broken link Modified: openoffice/ooo-site/trunk/content/download/checksums.html Modified: openoffice/ooo-site/trunk/content/download/checksums.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/checksums.html?rev=1599387r1=1599386r2=1599387view=diff == --- openoffice/ooo-site/trunk/content/download/checksums.html (original) +++ openoffice/ooo-site/trunk/content/download/checksums.html Mon Jun 2 22:46:31 2014 @@ -283,7 +283,7 @@ title=Learn more about how to use maili h3Report broken links/h3 pPlease report any broken link or things you think that needs to be corrected on this webpage by sending a mail to: -a href=mailto:d...@openoffice.apache.org#63;subject=Possible%20broken%20link#58;%203.4.1_checksums; +a href=mailto:d...@openoffice.apache.org#63;subject=Possible%20broken%20link#58;%20Checksums; title=Development mailing list (to receive answers you need to be subscribed) Development mailing list/a.nbsp;b*)/b/p
svn commit: r911014 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/checksums.html
Author: buildbot Date: Mon Jun 2 22:47:06 2014 New Revision: 911014 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/checksums.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 22:47:06 2014 @@ -1 +1 @@ -1599382 +1599387 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 22:47:06 2014 @@ -1 +1 @@ -1599382 +1599387 Modified: websites/staging/ooo-site/trunk/content/download/checksums.html == --- websites/staging/ooo-site/trunk/content/download/checksums.html (original) +++ websites/staging/ooo-site/trunk/content/download/checksums.html Mon Jun 2 22:47:06 2014 @@ -299,7 +299,7 @@ title=Learn more about how to use maili h3Report broken links/h3 pPlease report any broken link or things you think that needs to be corrected on this webpage by sending a mail to: -a href=mailto:d...@openoffice.apache.org#63;subject=Possible%20broken%20link#58;%203.4.1_checksums; +a href=mailto:d...@openoffice.apache.org#63;subject=Possible%20broken%20link#58;%20Checksums; title=Development mailing list (to receive answers you need to be subscribed) Development mailing list/a.nbsp;b*)/b/p
svn commit: r911015 - in /websites/production/ooo-site: cgi-bin/ content/
Author: marcus Date: Mon Jun 2 22:50:58 2014 New Revision: 911015 Log: Publishing svnmucc operation to ooo-site site by marcus Added: websites/production/ooo-site/cgi-bin/ - copied from r911014, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r911014, websites/staging/ooo-site/trunk/content/
svn commit: r1599389 - /openoffice/ooo-site/trunk/content/index.html
Author: kschenk Date: Mon Jun 2 22:59:42 2014 New Revision: 1599389 URL: http://svn.apache.org/r1599389 Log: Removed some older blog posts. Modified: openoffice/ooo-site/trunk/content/index.html Modified: openoffice/ooo-site/trunk/content/index.html URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/index.html?rev=1599389r1=1599388r2=1599389view=diff == --- openoffice/ooo-site/trunk/content/index.html (original) +++ openoffice/ooo-site/trunk/content/index.html Mon Jun 2 22:59:42 2014 @@ -156,9 +156,6 @@ screen reader. /p p - em10 May:/embr /a href=https://blogs.apache.org/infra/entry/mail_outage; - OpenOffice mailing lists: service restored/a - br/ em29 April:/embr /a href=https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce; Apache OpenOffice 4.1.0 released/a br/ @@ -171,15 +168,6 @@ screen reader. em17 April:/embr /a href=https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56; 100 Million downloads/a br/ - em01 April:/embr /a href=https://blogs.apache.org/OOo/entry/apache_openoffice_4_2_to; - Apache OpenOffice 4.2 to Bring OpenCash Support/a - br/ - em10 March:/embr /a href=https://blogs.apache.org/OOo/entry/seeking_beta_testers_for_apache; - Announcing Apache OpenOffice 4.1.0 Beta/a - br/ - em20 February:/embr /a href=https://blogs.apache.org/OOo/entry/international_mother_language_day_2014; - International Mother Language Day 2014/a - br/ em31 December:/embr /a href=https://blogs.apache.org/OOo/entry/apache_openoffice_in_2013_a; Apache OpenOffice in 2013: a year in review/a br/
svn commit: r911016 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/index.html
Author: buildbot Date: Mon Jun 2 23:00:15 2014 New Revision: 911016 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/index.html Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 23:00:15 2014 @@ -1 +1 @@ -1599387 +1599389 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Jun 2 23:00:15 2014 @@ -1 +1 @@ -1599387 +1599389 Modified: websites/staging/ooo-site/trunk/content/index.html == --- websites/staging/ooo-site/trunk/content/index.html (original) +++ websites/staging/ooo-site/trunk/content/index.html Mon Jun 2 23:00:15 2014 @@ -172,9 +172,6 @@ screen reader. /p p - em10 May:/embr /a href=https://blogs.apache.org/infra/entry/mail_outage; - OpenOffice mailing lists: service restored/a - br/ em29 April:/embr /a href=https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce; Apache OpenOffice 4.1.0 released/a br/ @@ -187,15 +184,6 @@ screen reader. em17 April:/embr /a href=https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56; 100 Million downloads/a br/ - em01 April:/embr /a href=https://blogs.apache.org/OOo/entry/apache_openoffice_4_2_to; - Apache OpenOffice 4.2 to Bring OpenCash Support/a - br/ - em10 March:/embr /a href=https://blogs.apache.org/OOo/entry/seeking_beta_testers_for_apache; - Announcing Apache OpenOffice 4.1.0 Beta/a - br/ - em20 February:/embr /a href=https://blogs.apache.org/OOo/entry/international_mother_language_day_2014; - International Mother Language Day 2014/a - br/ em31 December:/embr /a href=https://blogs.apache.org/OOo/entry/apache_openoffice_in_2013_a; Apache OpenOffice in 2013: a year in review/a br/
svn commit: r911017 - in /websites/production/ooo-site: cgi-bin/ content/
Author: kschenk Date: Mon Jun 2 23:04:47 2014 New Revision: 911017 Log: Publishing svnmucc operation to ooo-site site by kschenk Added: websites/production/ooo-site/cgi-bin/ - copied from r911016, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r911016, websites/staging/ooo-site/trunk/content/
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/41 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 build --all sincerely, -The Buildbot
buildbot failure in ASF Buildbot on aoo-win7
The Buildbot has detected a failed build on builder aoo-win7 while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/aoo-win7/builds/41 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 FAILED: failed build.pl --all sincerely, -The Buildbot
buildbot failure in ASF Buildbot on openoffice-linux64-nightly
The Buildbot has detected a failed build on builder openoffice-linux64-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/37 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 FAILED: failed build --all sincerely, -The Buildbot
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/35 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
