Author: damjan
Date: Thu Feb 25 19:16:47 2016
New Revision: 1732348
URL: http://svn.apache.org/viewvc?rev=1732348&view=rev
Log:
Merge r1409465 from branches/gbuild:
writerfilter10: make compile on unxsols4.pro
BUILDS
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/oox/source/token/properties.pl
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 19:16:47 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409425,1409427-1409428,1409430,1409432-1409436,1409438,1409440,1409442,1409444-1409446,1409452,1409454,1409457,1409459-1409460,1409462-1409463,1409470
+/incubator/ooo/branches/gbuild:1409313-1409425,1409427-1409428,1409430,1409432-1409436,1409438,1409440,1409442,1409444-1409446,1409452,1409454,1409457,1409459-1409460,1409462-1409463,1409465,1409470
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified:
openoffice/branches/gbuild-reintegration/main/oox/source/token/properties.pl
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/oox/source/token/properties.pl?rev=1732348&r1=1732347&r2=1732348&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/oox/source/token/properties.pl
(original)
+++
openoffice/branches/gbuild-reintegration/main/oox/source/token/properties.pl
Thu Feb 25 19:16:47 2016
@@ -49,5 +49,5 @@ while( <> ) {
if( $op == 1 ) {
print( "const sal_Int32 PROP_COUNT = $i;\nconst sal_Int32 PROP_INVALID =
-1;\n" );
} elsif( $op == 2 ) {
- print( " \"\"" );
+ print( " \"\"\n" );
}
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk?rev=1732348&r1=1732347&r2=1732348&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/solaris.mk
Thu Feb 25 19:16:47 2016
@@ -264,7 +264,9 @@ gb_Library_PLAINLIBS_NONE += \
dl \
freetype \
jpeg \
+ nsl \
pthread \
+ socket \
X11 \
Xext \
SM \
