Author: ydario
Date: Mon Sep 14 10:44:30 2015
New Revision: 1702902
URL: http://svn.apache.org/r1702902
Log:
#i118923# merge OS/2 trunk changesets from #i125592# #i118932# into AOO410
branch.
Modified:
openoffice/branches/AOO410/ (props changed)
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/boost/boost-os2.patch (props changed)
openoffice/branches/AOO410/main/dbaccess/ (props changed)
openoffice/branches/AOO410/main/drawinglayer/ (props changed)
openoffice/branches/AOO410/main/filter/ (props changed)
openoffice/branches/AOO410/main/jurt/ (props changed)
openoffice/branches/AOO410/main/sc/ (props changed)
openoffice/branches/AOO410/main/sd/ (props changed)
openoffice/branches/AOO410/main/set_soenv.in
openoffice/branches/AOO410/main/svgio/ (props changed)
openoffice/branches/AOO410/main/svtools/source/graphic/grfmgr2.cxx (props
changed)
openoffice/branches/AOO410/main/sw/ (props changed)
openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk
openoffice/branches/AOO410/test/ (props changed)
openoffice/branches/AOO410/test/testcommon/source/org/openoffice/test/vcl/
(props changed)
Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 10:44:30 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302
+/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 10:44:30 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main:1417739-1541842
/openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1642300-1642302,1677190,1687177,1692551,1700135
+/openoffice/trunk/main:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1642300-1642302,1677190,1687177,1692551,1700135,1702894,1702898
Propchange: openoffice/branches/AOO410/main/boost/boost-os2.patch
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 10:44:30 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/boost/boost-os2.patch:1417739-1541842
/openoffice/branches/ooxml-osba/main/boost/boost-os2.patch:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/boost/boost-os2.patch:1480411,1534063,1534098,1549902
-/openoffice/trunk/main/boost/boost-os2.patch:1621121,1623847,1623849-1623850,1642300-1642302
+/openoffice/trunk/main/boost/boost-os2.patch:1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898
Propchange: openoffice/branches/AOO410/main/dbaccess/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 10:44:30 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/dbaccess:1417739-1541842
/openoffice/branches/ooxml-osba/main/dbaccess:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/dbaccess:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/dbaccess:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1626099,1642300-1642302,1677190,1687177,1692551
+/openoffice/trunk/main/dbaccess:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1626099,1642300-1642302,1677190,1687177,1692551,1702894,1702898
Propchange: openoffice/branches/AOO410/main/drawinglayer/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 10:44:30 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/drawinglayer:1417739-1541842
/openoffice/branches/ooxml-osba/main/drawinglayer:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/drawinglayer:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/drawinglayer:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1612866,1621121,1623847,1623849-1623850,1642300-1642302
+/openoffice/trunk/main/drawinglayer:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1612866,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898
Propchange: openoffice/branches/AOO410/main/filter/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 10:44:30 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/filter:1417739-1541842
/openoffice/branches/ooxml-osba/main/filter:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/filter:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/filter:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1585498,1586242,1586249,1586325,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1607839,1621121,1623847,1623849-1623850,1642300-1642302,1692551
+/openoffice/trunk/main/filter:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1585498,1586242,1586249,1586325,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1607839,1621121,1623847,1623849-1623850,1642300-1642302,1692551,1702894,1702898
Propchange: openoffice/branches/AOO410/main/jurt/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 10:44:30 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/jurt:1417739-1541842
/openoffice/branches/ooxml-osba/main/jurt:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/jurt:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/jurt:1571619,1571942,1621121,1623847,1623849-1623850,1642300-1642302
+/openoffice/trunk/main/jurt:1571619,1571942,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898
Propchange: openoffice/branches/AOO410/main/sc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 10:44:30 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/sc:1417739-1541842
/openoffice/branches/ooxml-osba/main/sc:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/sc:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/sc:1571617,1571902,1594864,1621121,1623847,1623849-1623850,1642300-1642302
+/openoffice/trunk/main/sc:1571617,1571902,1594864,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898
Propchange: openoffice/branches/AOO410/main/sd/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 10:44:30 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/sd:1417739-1541842
/openoffice/branches/ooxml-osba/main/sd:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/sd:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/sd:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1609118,1621121,1623847,1623849-1623850,1642300-1642302
+/openoffice/trunk/main/sd:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1609118,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898
Modified: openoffice/branches/AOO410/main/set_soenv.in
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/set_soenv.in?rev=1702902&r1=1702901&r2=1702902&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/set_soenv.in (original)
+++ openoffice/branches/AOO410/main/set_soenv.in Mon Sep 14 10:44:30 2015
@@ -1990,7 +1990,7 @@ if ( $platform =~ m/os2/ )
ToFile( "LS", "ls.exe", "e" );
ToFile( "GNUCOPY", "cp.exe", "e" );
ToFile( "TOUCH", "touch", "e" );
- ToFile( "CONFIG_SITE", "/@unixroot/usr/share/config.site", "e" );
+ ToFile( "CONFIG_SITE", "/@unixroot/usr/share/config.legacy", "e" );
}
# $perlpre is only used for the following three variables
Propchange: openoffice/branches/AOO410/main/svgio/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 10:44:30 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/svgio:1417739-1541842
/openoffice/branches/ooxml-osba/main/svgio:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/svgio:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/svgio:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1607682,1610953,1621121,1623847,1623849-1623850,1642300-1642302
+/openoffice/trunk/main/svgio:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1607682,1610953,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898
Propchange: openoffice/branches/AOO410/main/svtools/source/graphic/grfmgr2.cxx
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 10:44:30 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/svtools/source/graphic/grfmgr2.cxx:1417739-1541842
/openoffice/branches/ooxml-osba/main/svtools/source/graphic/grfmgr2.cxx:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/svtools/source/graphic/grfmgr2.cxx:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/svtools/source/graphic/grfmgr2.cxx:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1621730,1623847,1623849-1623850,1642300-1642302
+/openoffice/trunk/main/svtools/source/graphic/grfmgr2.cxx:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1621730,1623847,1623849-1623850,1642300-1642302,1702894,1702898
Propchange: openoffice/branches/AOO410/main/sw/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 10:44:30 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/sw:1417739-1541842
/openoffice/branches/ooxml-osba/main/sw:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/sw:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/sw:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1605355,1605689,1606055,1606061,1607111,1607649,1608348,1608733,1610411,1610671,1611549,1612539,1621121,1623847,1623849-1623850,1642300-1642302
+/openoffice/trunk/main/sw:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1605355,1605689,1606055,1606061,1607111,1607649,1608348,1608733,1610411,1610671,1611549,1612539,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898
Modified: openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk?rev=1702902&r1=1702901&r2=1702902&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk (original)
+++ openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk Mon Sep 14
10:44:30 2015
@@ -137,6 +137,9 @@ RESLIB1IMAGES=$(PRJ)$/res
RESLIB1SRSFILES= $(SRSFILELIST)
SHL4TARGET=$(TARGET)
+.IF "$(GUI)"=="OS2"
+SHL4TARGET=xmlsecur
+.ENDIF
SHL4LIBS=\
$(SLB)$/helper.lib \
$(SLB)$/dialogs.lib \
Propchange: openoffice/branches/AOO410/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 10:44:30 2015
@@ -10,4 +10,4 @@
/openoffice/branches/ia2/test:1417739-1541842
/openoffice/branches/rejuvenate01/test:1534063
/openoffice/branches/sidebar/test:1415095-1466374
-/openoffice/trunk/test:1571617,1621121,1623847,1623849-1623850,1642300-1642302
+/openoffice/trunk/test:1571617,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898
Propchange:
openoffice/branches/AOO410/test/testcommon/source/org/openoffice/test/vcl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 10:44:30 2015
@@ -9,4 +9,4 @@
/openoffice/branches/ia2/test/testcommon/source/org/openoffice/test/vcl:1417739-1541842
/openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/vcl:1534063
/openoffice/branches/sidebar/test/testcommon/source/org/openoffice/test/vcl:1415095-1466374
-/openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:1621121,1623847,1623849-1623850,1642300-1642302
+/openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898
