You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pe...@apache.org on 2015/09/26 00:54:08 UTC
svn commit: r1705375 - in /openoffice/branches/AOO410/main: ./ sw/
sw/source/filter/ww8/dump/ww8scan.cxx sw/source/filter/ww8/ww8scan.cxx
Author: pescetti
Date: Fri Sep 25 22:54:08 2015
New Revision: 1705375
URL: http://svn.apache.org/viewvc?rev=1705375&view=rev
Log:
#i126558# Fix size of graphic objects in Word filter.
Patch by: Damjan Jovanovic <da...@apache.org>
Modified:
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/sw/ (props changed)
openoffice/branches/AOO410/main/sw/source/filter/ww8/dump/ww8scan.cxx
openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8scan.cxx
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 25 22:54:08 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,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,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,1633294,1633297,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,1700078,1700135,1702894,1702898,1702986,1702988,1705193,1705196,170519
9,1705276
+/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,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,1633294,1633297,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,1700078,1700135,1702894,1702898,1702986,1702988,1705193,1705196,170519
9,1705276,1705364
Propchange: openoffice/branches/AOO410/main/sw/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 25 22:54:08 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,1702986,1702988
+/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,1705364
Modified: openoffice/branches/AOO410/main/sw/source/filter/ww8/dump/ww8scan.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/filter/ww8/dump/ww8scan.cxx?rev=1705375&r1=1705374&r2=1705375&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sw/source/filter/ww8/dump/ww8scan.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/filter/ww8/dump/ww8scan.cxx Fri Sep 25 22:54:08 2015
@@ -1548,7 +1548,7 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTab
sal_uInt8 clxt;
pStr->Seek( nClxPos );
- while( 1 ) // Zaehle Zahl der Grpprls
+ while( nGrpprl < SAL_MAX_INT16 ) // Zaehle Zahl der Grpprls
{
*pStr >> clxt;
nLeft--;
@@ -1563,6 +1563,8 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTab
return 0; // schiefgegangen
pStr->SeekRel( nLen ); // ueberlies grpprl
}
+ if ( nGrpprl == SAL_MAX_INT16 )
+ return 0;
pStr->Seek( nClxPos );
nLeft = nClxLen;
pPieceGrpprls = new sal_uInt8*[nGrpprl + 1];
Modified: openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8scan.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8scan.cxx?rev=1705375&r1=1705374&r2=1705375&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8scan.cxx (original)
+++ openoffice/branches/AOO410/main/sw/source/filter/ww8/ww8scan.cxx Fri Sep 25 22:54:08 2015
@@ -1651,7 +1651,7 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTab
sal_uInt8 clxt;
pStr->Seek( nClxPos );
- while( 1 ) // Zaehle Zahl der Grpprls
+ while( nGrpprl < SAL_MAX_INT16 ) // Zaehle Zahl der Grpprls
{
*pStr >> clxt;
nLeft--;
@@ -1666,6 +1666,8 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTab
return 0; // schiefgegangen
pStr->SeekRel( nLen ); // ueberlies grpprl
}
+ if ( nGrpprl == SAL_MAX_INT16 )
+ return 0;
pStr->Seek( nClxPos );
nLeft = nClxLen;
pPieceGrpprls = new sal_uInt8*[nGrpprl + 1];