Author: ydario
Date: Mon Sep 14 16:46:56 2015
New Revision: 1702993
URL: http://svn.apache.org/r1702993
Log:
#i118923# merge OS/2 trunk changesets 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/solenv/inc/_tg_def.mk
openoffice/branches/AOO410/main/solenv/inc/svpm.h
openoffice/branches/AOO410/main/solenv/inc/tg_def.mk
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/vcl/Library_vcl.mk
openoffice/branches/AOO410/main/vcl/inc/os2/salframe.h
openoffice/branches/AOO410/main/vcl/os2/source/window/salframe.cxx
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 16:46:56 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,1702894,1702898
+/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,1702986,1702988
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 16:46:56 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,1702894,1702898
+/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,1702986,1702988
Propchange: openoffice/branches/AOO410/main/boost/boost-os2.patch
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 16:46:56 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,1702894,1702898
+/openoffice/trunk/main/boost/boost-os2.patch:1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898,1702986,1702988
Propchange: openoffice/branches/AOO410/main/dbaccess/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 16:46:56 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,1702894,1702898
+/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,1702986,1702988
Propchange: openoffice/branches/AOO410/main/drawinglayer/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 16:46:56 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,1702894,1702898
+/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,1702986,1702988
Propchange: openoffice/branches/AOO410/main/filter/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 16:46:56 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,1702894,1702898
+/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,1702986,1702988
Propchange: openoffice/branches/AOO410/main/jurt/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 16:46:56 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,1702894,1702898
+/openoffice/trunk/main/jurt:1571619,1571942,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898,1702986,1702988
Propchange: openoffice/branches/AOO410/main/sc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 16:46:56 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,1702894,1702898
+/openoffice/trunk/main/sc:1571617,1571902,1594864,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898,1702986,1702988
Propchange: openoffice/branches/AOO410/main/sd/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 16:46:56 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,1702894,1702898
+/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,1702986,1702988
Modified: openoffice/branches/AOO410/main/solenv/inc/_tg_def.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/solenv/inc/_tg_def.mk?rev=1702993&r1=1702992&r2=1702993&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/solenv/inc/_tg_def.mk (original)
+++ openoffice/branches/AOO410/main/solenv/inc/_tg_def.mk Mon Sep 14 16:46:56
2015
@@ -211,7 +211,7 @@ $(DEF1TARGETN) .PHONY :
.IF "$(DEFLIB1NAME)"!=""
@+echo $(SLB)/$(DEFLIB1NAME).lib
- @+emxexpr $(DEF1NAMELIST) | fix_exp_file >> [email protected]_ord
+ @+emxexp $(DEF1NAMELIST) | fix_exp_file >> [email protected]_ord
.ENDIF # "$(DEFLIB1NAME)"!=""
.IF "$(DEF1EXPORT1)"!=""
@@ -495,7 +495,7 @@ $(DEF2TARGETN) .PHONY :
.IF "$(DEFLIB2NAME)"!=""
@+echo $(SLB)/$(DEFLIB2NAME).lib
- @+emxexpr $(DEF2NAMELIST) | fix_exp_file >> [email protected]_ord
+ @+emxexp $(DEF2NAMELIST) | fix_exp_file >> [email protected]_ord
.ENDIF # "$(DEFLIB2NAME)"!=""
.IF "$(DEF2EXPORT1)"!=""
@@ -779,7 +779,7 @@ $(DEF3TARGETN) .PHONY :
.IF "$(DEFLIB3NAME)"!=""
@+echo $(SLB)/$(DEFLIB3NAME).lib
- @+emxexpr $(DEF3NAMELIST) | fix_exp_file >> [email protected]_ord
+ @+emxexp $(DEF3NAMELIST) | fix_exp_file >> [email protected]_ord
.ENDIF # "$(DEFLIB3NAME)"!=""
.IF "$(DEF3EXPORT1)"!=""
@@ -1063,7 +1063,7 @@ $(DEF4TARGETN) .PHONY :
.IF "$(DEFLIB4NAME)"!=""
@+echo $(SLB)/$(DEFLIB4NAME).lib
- @+emxexpr $(DEF4NAMELIST) | fix_exp_file >> [email protected]_ord
+ @+emxexp $(DEF4NAMELIST) | fix_exp_file >> [email protected]_ord
.ENDIF # "$(DEFLIB4NAME)"!=""
.IF "$(DEF4EXPORT1)"!=""
@@ -1347,7 +1347,7 @@ $(DEF5TARGETN) .PHONY :
.IF "$(DEFLIB5NAME)"!=""
@+echo $(SLB)/$(DEFLIB5NAME).lib
- @+emxexpr $(DEF5NAMELIST) | fix_exp_file >> [email protected]_ord
+ @+emxexp $(DEF5NAMELIST) | fix_exp_file >> [email protected]_ord
.ENDIF # "$(DEFLIB5NAME)"!=""
.IF "$(DEF5EXPORT1)"!=""
@@ -1631,7 +1631,7 @@ $(DEF6TARGETN) .PHONY :
.IF "$(DEFLIB6NAME)"!=""
@+echo $(SLB)/$(DEFLIB6NAME).lib
- @+emxexpr $(DEF6NAMELIST) | fix_exp_file >> [email protected]_ord
+ @+emxexp $(DEF6NAMELIST) | fix_exp_file >> [email protected]_ord
.ENDIF # "$(DEFLIB6NAME)"!=""
.IF "$(DEF6EXPORT1)"!=""
@@ -1915,7 +1915,7 @@ $(DEF7TARGETN) .PHONY :
.IF "$(DEFLIB7NAME)"!=""
@+echo $(SLB)/$(DEFLIB7NAME).lib
- @+emxexpr $(DEF7NAMELIST) | fix_exp_file >> [email protected]_ord
+ @+emxexp $(DEF7NAMELIST) | fix_exp_file >> [email protected]_ord
.ENDIF # "$(DEFLIB7NAME)"!=""
.IF "$(DEF7EXPORT1)"!=""
@@ -2199,7 +2199,7 @@ $(DEF8TARGETN) .PHONY :
.IF "$(DEFLIB8NAME)"!=""
@+echo $(SLB)/$(DEFLIB8NAME).lib
- @+emxexpr $(DEF8NAMELIST) | fix_exp_file >> [email protected]_ord
+ @+emxexp $(DEF8NAMELIST) | fix_exp_file >> [email protected]_ord
.ENDIF # "$(DEFLIB8NAME)"!=""
.IF "$(DEF8EXPORT1)"!=""
@@ -2483,7 +2483,7 @@ $(DEF9TARGETN) .PHONY :
.IF "$(DEFLIB9NAME)"!=""
@+echo $(SLB)/$(DEFLIB9NAME).lib
- @+emxexpr $(DEF9NAMELIST) | fix_exp_file >> [email protected]_ord
+ @+emxexp $(DEF9NAMELIST) | fix_exp_file >> [email protected]_ord
.ENDIF # "$(DEFLIB9NAME)"!=""
.IF "$(DEF9EXPORT1)"!=""
@@ -2767,7 +2767,7 @@ $(DEF10TARGETN) .PHONY :
.IF "$(DEFLIB10NAME)"!=""
@+echo $(SLB)/$(DEFLIB10NAME).lib
- @+emxexpr $(DEF10NAMELIST) | fix_exp_file >> [email protected]_ord
+ @+emxexp $(DEF10NAMELIST) | fix_exp_file >> [email protected]_ord
.ENDIF # "$(DEFLIB10NAME)"!=""
.IF "$(DEF10EXPORT1)"!=""
Modified: openoffice/branches/AOO410/main/solenv/inc/svpm.h
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/solenv/inc/svpm.h?rev=1702993&r1=1702992&r2=1702993&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/solenv/inc/svpm.h (original)
+++ openoffice/branches/AOO410/main/solenv/inc/svpm.h Mon Sep 14 16:46:56 2015
@@ -61,6 +61,9 @@ extern "C" {
#include <os2.h>
#include <unikbd.h>
+#ifdef VCL_OS2
+#include <pmbidi.h>
+#endif
#undef BOOL
#undef BYTE
Modified: openoffice/branches/AOO410/main/solenv/inc/tg_def.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/solenv/inc/tg_def.mk?rev=1702993&r1=1702992&r2=1702993&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/solenv/inc/tg_def.mk (original)
+++ openoffice/branches/AOO410/main/solenv/inc/tg_def.mk Mon Sep 14 16:46:56
2015
@@ -216,7 +216,7 @@ $(DEF$(TNR)TARGETN) .PHONY :
.IF "$(DEFLIB$(TNR)NAME)"!=""
@+echo $(SLB)/$(DEFLIB$(TNR)NAME).lib
- @+emxexpr $(DEF$(TNR)NAMELIST) | fix_exp_file >> [email protected]_ord
+ @+emxexp $(DEF$(TNR)NAMELIST) | fix_exp_file >> [email protected]_ord
.ENDIF # "$(DEFLIB$(TNR)NAME)"!=""
.IF "$(DEF$(TNR)EXPORT1)"!=""
Propchange: openoffice/branches/AOO410/main/svgio/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 16:46:56 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,1702894,1702898
+/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,1702986,1702988
Propchange: openoffice/branches/AOO410/main/svtools/source/graphic/grfmgr2.cxx
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 16:46:56 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,1702894,1702898
+/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,1702986,1702988
Propchange: openoffice/branches/AOO410/main/sw/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 16:46:56 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,1702894,1702898
+/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,1702986,1702988
Modified: openoffice/branches/AOO410/main/vcl/Library_vcl.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/vcl/Library_vcl.mk?rev=1702993&r1=1702992&r2=1702993&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/vcl/Library_vcl.mk (original)
+++ openoffice/branches/AOO410/main/vcl/Library_vcl.mk Mon Sep 14 16:46:56 2015
@@ -45,6 +45,12 @@ $(eval $(call gb_Library_set_include,vcl
-I$(OUTDIR)/inc \
$$(FREETYPE_CFLAGS) \
))
+ifeq ($(GUIBASE),os2)
+$(eval $(call gb_Library_set_include,vcl,\
+ $$(INCLUDE) \
+ -idirafter /@unixroot/usr/dev/toolkit452/h \
+))
+endif
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_set_cxxflags,vcl,\
$$(CXXFLAGS) \
Modified: openoffice/branches/AOO410/main/vcl/inc/os2/salframe.h
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/vcl/inc/os2/salframe.h?rev=1702993&r1=1702992&r2=1702993&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/vcl/inc/os2/salframe.h (original)
+++ openoffice/branches/AOO410/main/vcl/inc/os2/salframe.h Mon Sep 14 16:46:56
2015
@@ -27,10 +27,6 @@
#include <vcl/sysdata.hxx>
#include <salframe.hxx>
-#ifndef PM_BIDI_INCLUDED
-#include <pmbidi.h>
-#endif
-
#ifndef __UCONV_H__
#include <uconv.h>
#endif
Modified: openoffice/branches/AOO410/main/vcl/os2/source/window/salframe.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/vcl/os2/source/window/salframe.cxx?rev=1702993&r1=1702992&r2=1702993&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/vcl/os2/source/window/salframe.cxx
(original)
+++ openoffice/branches/AOO410/main/vcl/os2/source/window/salframe.cxx Mon Sep
14 16:46:56 2015
@@ -24,6 +24,7 @@
#define INCL_DOS
#define INCL_PM
#define INCL_WIN
+#define VCL_OS2
#include <svpm.h>
#include <string.h>
Propchange: openoffice/branches/AOO410/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 16:46:56 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,1702894,1702898
+/openoffice/trunk/test:1571617,1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898,1702986,1702988
Propchange:
openoffice/branches/AOO410/test/testcommon/source/org/openoffice/test/vcl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 16:46:56 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,1702894,1702898
+/openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:1621121,1623847,1623849-1623850,1642300-1642302,1702894,1702898,1702986,1702988
