buildbot success in ASF Buildbot on openoffice-linux64-nightly

2014-11-28 Thread buildbot 
The Buildbot has detected a passing build on builder openoffice-linux64-nightly 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/openoffice-linux64-nightly/builds/204

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: r1642300 - /openoffice/trunk/main/configure.cmd

2014-11-28 Thread ydario 
Author: ydario
Date: Fri Nov 28 13:53:51 2014
New Revision: 1642300

URL: http://svn.apache.org/r1642300
Log:
#i125501# build fixes for enabling Category B also in OS/2 port.

Modified:
openoffice/trunk/main/configure.cmd

Modified: openoffice/trunk/main/configure.cmd
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.cmd?rev=1642300&r1=1642299&r2=1642300&view=diff
==
--- openoffice/trunk/main/configure.cmd (original)
+++ openoffice/trunk/main/configure.cmd Fri Nov 28 13:53:51 2014
@@ -27,5 +27,5 @@ SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_
 set config_shell=sh
 set perl_sh_dir=%UNIXROOT%/usr/bin
 
-sh ./configure --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg 
--without-stlport --with-system-icu --with-system-curl --with-system-python 
--with-system-openssl --with-system-libxml --with-system-libxslt 
--disable-werror --disable-mozilla --disable-odk --with-x=no 
--disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes 
--disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit 
--with-system-apr --with-system-apr-util --with-system-serf 
--with-system-coinmp | tee configure.log
+sh ./configure --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg 
--without-stlport --with-system-icu --with-system-curl --with-system-python 
--with-system-openssl --with-system-libxml --with-system-libxslt 
--disable-werror --disable-mozilla --disable-odk --with-x=no 
--disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes 
--disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit 
--with-system-apr --with-system-apr-util --with-system-serf 
--enable-bundled-dictionaries --enable-category-b --disable-nss-module 
--with-lang="de es fr it nl ru" | tee configure.log
 endlocal

svn commit: r1642301 - in /openoffice/trunk/main: ./ libxmlsec/ scp2/source/ooo/ xmlsecurity/prj/ xmlsecurity/source/xmlsec/nss/ xmlsecurity/util/

2014-11-28 Thread ydario 
Author: ydario
Date: Fri Nov 28 14:02:37 2014
New Revision: 1642301

URL: http://svn.apache.org/r1642301
Log:
#i125592# enable NSS modules also on OS/2 port.

Added:
openoffice/trunk/main/libxmlsec/xmlsec1-os2.patch
Modified:
openoffice/trunk/main/configure.cmd
openoffice/trunk/main/libxmlsec/makefile.mk
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
openoffice/trunk/main/xmlsecurity/prj/d.lst
openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk
openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
openoffice/trunk/main/xmlsecurity/util/makefile.mk

Modified: openoffice/trunk/main/configure.cmd
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.cmd?rev=1642301&r1=1642300&r2=1642301&view=diff
==
--- openoffice/trunk/main/configure.cmd (original)
+++ openoffice/trunk/main/configure.cmd Fri Nov 28 14:02:37 2014
@@ -27,5 +27,5 @@ SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_
 set config_shell=sh
 set perl_sh_dir=%UNIXROOT%/usr/bin
 
-sh ./configure --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg 
--without-stlport --with-system-icu --with-system-curl --with-system-python 
--with-system-openssl --with-system-libxml --with-system-libxslt 
--disable-werror --disable-mozilla --disable-odk --with-x=no 
--disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes 
--disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit 
--with-system-apr --with-system-apr-util --with-system-serf 
--enable-bundled-dictionaries --enable-category-b --disable-nss-module 
--with-lang="de es fr it nl ru" | tee configure.log
+sh ./configure --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg 
--without-stlport --with-system-icu --with-system-curl --with-system-python 
--with-system-openssl --with-system-libxml --with-system-libxslt 
--disable-werror --disable-mozilla --disable-odk --with-x=no 
--disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes 
--disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit 
--with-system-apr --with-system-apr-util --with-system-serf 
--enable-bundled-dictionaries --enable-category-b --with-lang="de es fr it nl 
ru" | tee configure.log
 endlocal

Modified: openoffice/trunk/main/libxmlsec/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/libxmlsec/makefile.mk?rev=1642301&r1=1642300&r2=1642301&view=diff
==
--- openoffice/trunk/main/libxmlsec/makefile.mk (original)
+++ openoffice/trunk/main/libxmlsec/makefile.mk Fri Nov 28 14:02:37 2014
@@ -63,6 +63,9 @@ PATCH_FILES=\
xmlsec1-mingw32.patch \
xmlsec1-mingw-keymgr-mscrypto.patch
 
+.IF "$(GUI)"=="OS2"
+PATCH_FILES+=xmlsec1-os2.patch
+.ENDIF
 
 ADDITIONAL_FILES= \
 include$/xmlsec$/mscrypto$/akmngr.h \
@@ -175,6 +178,9 @@ OUT2BIN+=src$/.libs$/libxmlsec1.dll src$
 OUT2LIB+=win32$/binaries$/*.lib
 OUT2BIN+=win32$/binaries$/*.dll
 .ENDIF
+.ELIF "$(OS)"=="OS2"
+OUT2LIB+=src$/.libs$/xmlsec1.lib src$/nss$/.libs$/xmlsec1-nss.lib
+OUT2BIN+=src$/xmlsec1.dll src$/nss$/xmlsec1n.dll
 .ELSE
 OUT2LIB+=src$/.libs$/libxmlsec1.a src$/nss$/.libs$/libxmlsec1-nss.a
 .ENDIF

Added: openoffice/trunk/main/libxmlsec/xmlsec1-os2.patch
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/libxmlsec/xmlsec1-os2.patch?rev=1642301&view=auto
==
--- openoffice/trunk/main/libxmlsec/xmlsec1-os2.patch (added)
+++ openoffice/trunk/main/libxmlsec/xmlsec1-os2.patch Fri Nov 28 14:02:37 2014
@@ -0,0 +1,94 @@
+--- misc/xmlsec1-1.2.14/src/Makefile.in2009-12-05 22:19:34.0 
+0100
 misc/build/xmlsec1-1.2.14/src/Makefile.in  2014-11-26 22:02:00.0 
+0100
+@@ -12,6 +12,11 @@
+ # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
++ 
++OS2_LA_NAME=xmlsec1
++OS2_DLL_NAME=xmlsec1
++OS2_DLL_OBJ=$(libxmlsec1_la_OBJECTS:%.lo=%.o)
++OS2_DLL_LIBS=-lxml2 -lz -lm -lurpo -lmmap -lpthread $(LIBS)
+ 
+ @SET_MAKE@
+ 
+@@ -736,7 +741,7 @@
+   done
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile $(LTLIBRARIES)
++all-am: Makefile $(LTLIBRARIES) $(OS2_DLL_NAME).dll
+ installdirs: installdirs-recursive
+ installdirs-am:
+   for dir in "$(DESTDIR)$(libdir)"; do \
+@@ -861,3 +866,13 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
++
++$(OS2_DLL_NAME).dll: lib$(OS2_LA_NAME).la
++  cp .libs/$(OS2_LA_NAME).a .libs/$(OS2_LA_NAME)_s.a
++  echo "LIBRARY $(OS2_DLL_NAME) INITINSTANCE TERMINSTANCE" > 
$(OS2_DLL_NAME).def
++  echo "DATA MULTIPLE" >> $(OS2_DLL_NAME).def
++  echo "EXPORTS" >> $(OS2_DLL_NAME).def
++  emxexp $(OS2_DLL_OBJ

svn commit: r1642302 - /openoffice/trunk/main/configure.cmd

2014-11-28 Thread ydario 
Author: ydario
Date: Fri Nov 28 14:05:44 2014
New Revision: 1642302

URL: http://svn.apache.org/r1642302
Log:
#i125592# enable NSS modules also on OS/2 port.

Modified:
openoffice/trunk/main/configure.cmd

Modified: openoffice/trunk/main/configure.cmd
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.cmd?rev=1642302&r1=1642301&r2=1642302&view=diff
==
--- openoffice/trunk/main/configure.cmd (original)
+++ openoffice/trunk/main/configure.cmd Fri Nov 28 14:05:44 2014
@@ -27,5 +27,5 @@ SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_
 set config_shell=sh
 set perl_sh_dir=%UNIXROOT%/usr/bin
 
-sh ./configure --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg 
--without-stlport --with-system-icu --with-system-curl --with-system-python 
--with-system-openssl --with-system-libxml --with-system-libxslt 
--disable-werror --disable-mozilla --disable-odk --with-x=no 
--disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes 
--disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit 
--with-system-apr --with-system-apr-util --with-system-serf 
--enable-bundled-dictionaries --enable-category-b --with-lang="de es fr it nl 
ru" | tee configure.log
+sh ./configure --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg 
--without-stlport --with-system-icu --with-system-curl --with-system-python 
--with-system-openssl --with-system-libxml --with-system-libxslt 
--disable-werror --disable-mozilla --disable-odk --with-x=no 
--disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes 
--disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit 
--with-system-apr --with-system-apr-util --with-system-serf --with-system-nss 
--enable-bundled-dictionaries --enable-category-b --with-lang="de es fr it nl 
ru" | tee configure.log
 endlocal

svn commit: r1642310 - in /openoffice/trunk/main: sw/source/filter/rtf/ sw/source/filter/ww8/ writerfilter/source/dmapper/

2014-11-28 Thread steve_y 
Author: steve_y
Date: Fri Nov 28 15:27:41 2014
New Revision: 1642310

URL: http://svn.apache.org/r1642310
Log:
Issue 125400 - CJK numbering ordered list fallback to Arabic numerals

Contributor: Mark Hung

Modified:
openoffice/trunk/main/sw/source/filter/rtf/rtfnum.cxx
openoffice/trunk/main/sw/source/filter/ww8/rtfattributeoutput.cxx
openoffice/trunk/main/sw/source/filter/ww8/wrtw8num.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par2.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx
openoffice/trunk/main/writerfilter/source/dmapper/ConversionHelper.cxx

Modified: openoffice/trunk/main/sw/source/filter/rtf/rtfnum.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/rtf/rtfnum.cxx?rev=1642310&r1=1642309&r2=1642310&view=diff
==
--- openoffice/trunk/main/sw/source/filter/rtf/rtfnum.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/rtf/rtfnum.cxx Fri Nov 28 15:27:41 
2014
@@ -57,6 +57,70 @@
 
 #define RTF_NUMRULE_NAME "RTF_Num"
 
+static sal_Int16 lcl_GetStyleForNFC( sal_Int16 nNFC)
+{
+static const sal_Int16 aMap[] =
+{
+style::NumberingType::ARABIC,   // 0 - Arabic (1, 2, 3)
+style::NumberingType::ROMAN_UPPER,  // 1 - Uppercase Roman 
numeral (I, II, III)
+style::NumberingType::ROMAN_LOWER,  // 2 - Lowercase Roman 
numeral (i, ii, iii)
+style::NumberingType::CHARS_UPPER_LETTER_N, // 3 - Uppercase letter 
(A, B, C)
+style::NumberingType::CHARS_LOWER_LETTER_N, // 4 - Lowercase letter 
(a, b, c)
+style::NumberingType::ARABIC,   // 5 - Ordinal number 
(1st, 2nd, 3rd)
+style::NumberingType::ARABIC,   // 6 - Cardinal text 
number (One, Two Three)
+style::NumberingType::ARABIC,   // 7 - Ordinal text number 
(First, Second, Third)
+style::NumberingType::NUMBER_NONE,  // 8 - Not defined
+style::NumberingType::NUMBER_NONE,  // 9 - Not defined
+style::NumberingType::NUMBER_LOWER_ZH,  // 10 - Kanji numbering 
without the digit character (*dbnum1).
+style::NumberingType::NUMBER_LOWER_ZH,  // 11 - Kanji numbering 
with the digit character (*dbnum2).
+style::NumberingType::AIU_HALFWIDTH_JA, // 12 - phonetic Katakana 
characters in "aiueo" order (*aiueo).
+style::NumberingType::IROHA_HALFWIDTH_JA,   // 13 - phonetic katakana 
characters in "iroha" order (*iroha).
+style::NumberingType::FULLWIDTH_ARABIC, // 14 - Double Byte 
character
+style::NumberingType::ARABIC,   // 15 - Single Byte 
character
+style::NumberingType::NUMBER_TRADITIONAL_JA,// 16 - Kanji numbering 3 
(*dbnum3).
+style::NumberingType::ARABIC,   // 17 - Kanji numbering 4 
(*dbnum4).
+style::NumberingType::ARABIC,   // 18 - Circle numbering 
(*circlenum). - decimalEnclosedCircleChinese
+style::NumberingType::FULLWIDTH_ARABIC, // 19 - Double-byte Arabic 
numbering
+style::NumberingType::AIU_FULLWIDTH_JA, // 20 - phonetic 
double-byte Katakana characters (*aiueo*dbchar).
+style::NumberingType::IROHA_FULLWIDTH_JA,   // 21 - phonetic 
double-byte katakana characters (*iroha*dbchar).
+style::NumberingType::ARABIC,   // 22 - Arabic with 
leading zero (01, 02, 03, ..., 10, 11)
+style::NumberingType::CHAR_SPECIAL, // 23 - Bullet (no number 
at all)
+style::NumberingType::HANGUL_SYLLABLE_KO,   // 24 - Korean numbering 2 
(*ganada).
+style::NumberingType::HANGUL_JAMO_KO,   // 25 - Korean numbering 1 
(*chosung).
+style::NumberingType::ARABIC,   // 26 - Chinese numbering 
1 (*gb1). - decimalEnclosedFullstop
+style::NumberingType::ARABIC,   // 27 - Chinese numbering 
2 (*gb2). - decimalEnclosedParen
+style::NumberingType::ARABIC,   // 28 - Chinese numbering 
3 (*gb3). - decimalEnclosedCircleChinese
+style::NumberingType::ARABIC,   // 29 - Chinese numbering 
4 (*gb4). - ideographEnclosedCircle
+style::NumberingType::TIAN_GAN_ZH,  // 30 - Chinese Zodiac 
numbering 1 (* zodiac1)
+style::NumberingType::DI_ZI_ZH, // 31 - Chinese Zodiac 
numbering 2 (* zodiac2)
+style::NumberingType::ARABIC,   // 32 - Chinese Zodiac 
numbering 3 (* zodiac3)
+style::NumberingType::NUMBER_LOWER_ZH,  // 33 - Taiwanese 
double-byte numbering 1
+style::NumberingType::NUMBER_UPPER_ZH_TW,   // 34 - Taiwanese 
double-byte numbering 2
+style::NumberingType::NUMBER_LOWER_ZH,  // 35 - Taiwanese 
double-byte numbering 3
+style::NumberingType::ARABIC,   // 36 - Taiwanese 
double-byte numbering 4
+style::NumberingType::NUMBER_LOWER_ZH,  // 37 - Chinese 
double-byte numbering 1
+style::Numberi

svn commit: r1642312 - /openoffice/trunk/main/svtools/source/svrtf/parrtf.cxx

2014-11-28 Thread steve_y 
Author: steve_y
Date: Fri Nov 28 15:30:07 2014
New Revision: 1642312

URL: http://svn.apache.org/r1642312
Log:
Issue 125495 - Awkward Chinese (ZH-TW) numbering suffix when importing RTF 
document

Contributor: Mark Hung

Modified:
openoffice/trunk/main/svtools/source/svrtf/parrtf.cxx

Modified: openoffice/trunk/main/svtools/source/svrtf/parrtf.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/svrtf/parrtf.cxx?rev=1642312&r1=1642311&r2=1642312&view=diff
==
--- openoffice/trunk/main/svtools/source/svrtf/parrtf.cxx (original)
+++ openoffice/trunk/main/svtools/source/svrtf/parrtf.cxx Fri Nov 28 15:30:07 
2014
@@ -649,20 +649,20 @@ void SvRTFParser::Continue( int nToken )
break;  // unbekannte Token ueberspringen
case RTF_NEXTTYPE:
case RTF_ANSITYPE:  
-SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_MS_1252 ); 
+SetEncoding( eCodeSet = RTL_TEXTENCODING_MS_1252 );
 break;
case RTF_MACTYPE:   
-SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_APPLE_ROMAN ); 
+SetEncoding( eCodeSet = RTL_TEXTENCODING_APPLE_ROMAN );
 break;
case RTF_PCTYPE:
-SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_IBM_437 ); 
+SetEncoding( eCodeSet = RTL_TEXTENCODING_IBM_437 );
 break;
case RTF_PCATYPE:   
-SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_IBM_850 ); 
+SetEncoding( eCodeSet = RTL_TEXTENCODING_IBM_850 );
 break;
case RTF_ANSICPG:
 eCodeSet = rtl_getTextEncodingFromWindowsCodePage(nTokenValue);
-SetSrcEncoding(eCodeSet);
+SetEncoding(eCodeSet);
break;
default:
 NEXTTOKEN:

buildbot failure in ASF Buildbot on openoffice-fbsd-nightly

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

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 configure bootstrap

Sincerely,
 -The Buildbot

buildbot success in ASF Buildbot on openoffice-linux32-nightly

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

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm2_ubuntu_32bit

Build Reason: The Nightly scheduler named 'openoffice-linux32-nightly' 
triggered this build
Build Source Stamp: [branch openoffice/trunk] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot success in ASF Buildbot on aoo-win7

2014-11-28 Thread buildbot 
The Buildbot has detected a passing build on builder aoo-win7 while building 
ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/aoo-win7/builds/229

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