extensions.lst | 2 +- sw/source/core/layout/tabfrm.cxx | 4 +--- sw/source/core/txtnode/swfont.cxx | 2 +- sw/source/filter/ww8/dump/ww8scan.cxx | 9 +++++---- sw/source/filter/ww8/ww8scan.cxx | 9 +++++---- 5 files changed, 13 insertions(+), 13 deletions(-)
New commits: commit 4a070cd56ce6f4e0e7ec5a8eaad932c037ab57b4 Author: Andrea Pescetti <pesce...@apache.org> Date: Fri Sep 25 22:41:14 2015 +0000 #i126495# Update English dictionary to version 2015.09.01. diff --git a/extensions.lst b/extensions.lst index 7fabb517..e4a5732 100644 --- a/extensions.lst +++ b/extensions.lst @@ -39,7 +39,7 @@ # English dictionary [ language=en.* || language=de || language=it ] - 65580f36a52c38819db4d9c2a6656526 http://sourceforge.net/projects/aoo-extensions/files/17102/19/dict-en.oxt/download "dict-en.oxt" + 045c9cd45d6517c7304e77faeb502776 http://sourceforge.net/projects/aoo-extensions/files/17102/20/dict-en.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ] commit 763aa6721e4eb52756d97d79c1d9fad325765054 Author: Andrea Pescetti <pesce...@apache.org> Date: Fri Sep 25 22:38:10 2015 +0000 #i126556# Fix bookmarks import in Word filter. Patch by: Damjan Jovanovic <dam...@apache.org> diff --git a/sw/source/filter/ww8/dump/ww8scan.cxx b/sw/source/filter/ww8/dump/ww8scan.cxx index ed75c4c..563127d 100644 --- a/sw/source/filter/ww8/dump/ww8scan.cxx +++ b/sw/source/filter/ww8/dump/ww8scan.cxx @@ -3750,8 +3750,6 @@ WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTblSt, const WW8Fib& rFib) if( pBook[0]->GetIMax() < nIMax ) // Count of Bookmarks nIMax = pBook[0]->GetIMax(); - if( pBook[1]->GetIMax() < nIMax ) - nIMax = pBook[1]->GetIMax(); pStatus = new eBookStatus[ nIMax ]; memset( pStatus, 0, nIMax * sizeof( eBookStatus ) ); } @@ -3875,7 +3873,8 @@ long WW8PLCFx_Book::GetLen() const void WW8PLCFx_Book::SetStatus(sal_uInt16 nIndex, eBookStatus eStat ) { ASSERT(nIndex < nIMax, "set status of non existing bookmark!"); - pStatus[nIndex] = (eBookStatus)( pStatus[nIndex] | eStat ); + if ( nIndex < nIMax ) + pStatus[nIndex] = (eBookStatus)( pStatus[nIndex] | eStat ); } eBookStatus WW8PLCFx_Book::GetStatus() const diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 559469f..acf3a8e 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -4162,8 +4162,6 @@ WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTblSt, const WW8Fib& rFib) if( pBook[0]->GetIMax() < nIMax ) // Count of Bookmarks nIMax = pBook[0]->GetIMax(); - if( pBook[1]->GetIMax() < nIMax ) - nIMax = pBook[1]->GetIMax(); pStatus = new eBookStatus[ nIMax ]; memset( pStatus, 0, nIMax * sizeof( eBookStatus ) ); } @@ -4300,7 +4298,8 @@ long WW8PLCFx_Book::GetLen() const void WW8PLCFx_Book::SetStatus(sal_uInt16 nIndex, eBookStatus eStat ) { ASSERT(nIndex < nIMax, "set status of non existing bookmark!"); - pStatus[nIndex] = (eBookStatus)( pStatus[nIndex] | eStat ); + if ( nIndex < nIMax ) + pStatus[nIndex] = (eBookStatus)( pStatus[nIndex] | eStat ); } eBookStatus WW8PLCFx_Book::GetStatus() const commit 3010d353f9a44e853908a475432cae7d918276e6 Author: Andrea Pescetti <pesce...@apache.org> Date: Fri Sep 25 22:23:26 2015 +0000 #i107471# Fix alignment settings in CJK text. Patch by: Mark Hung <mark...@gmail.com> diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 68068df..c822014 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -5327,9 +5327,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) // --> OD 2008-07-16 #158225# no vertical alignment of covered cells !IsCoveredCell() && // <-- - // --> FME 2004-06-29 #116532# Do not consider vertical alignment in grid mode - !(pPg = FindPageFrm())->HasGrid() ) - // <-- + (pPg = FindPageFrm())!=NULL ) { if ( !Lower()->IsCntntFrm() && !Lower()->IsSctFrm() && !Lower()->IsTabFrm() ) { commit b607d0c3f495e15a18e277304943f9f7fe764895 Author: Andrea Pescetti <pesce...@apache.org> Date: Fri Sep 25 22:15:38 2015 +0000 #i126558# Fix size of graphic objects in Word filter. Patch by: Damjan Jovanovic <dam...@apache.org> diff --git a/sw/source/filter/ww8/dump/ww8scan.cxx b/sw/source/filter/ww8/dump/ww8scan.cxx index 72716d4..ed75c4c 100644 --- a/sw/source/filter/ww8/dump/ww8scan.cxx +++ b/sw/source/filter/ww8/dump/ww8scan.cxx @@ -1548,7 +1548,7 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF ) 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::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF ) 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]; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 72c77f0..559469f 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1651,7 +1651,7 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF ) 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::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF ) 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]; commit 45a011ea2b240da1e59a42d35da88ca048fb6da6 Author: Andrea Pescetti <pesce...@apache.org> Date: Fri Sep 25 21:55:21 2015 +0000 #i71292# Fix/remove conditional rotate for CJK. Patch by: Mark Hung <mark...@gmail.com> diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 03bf0b1..0d87bfc 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -167,7 +167,7 @@ void SwFont::SetVertical( sal_uInt16 nDir, const sal_Bool bVertFormat ) { bFntChg = sal_True; aSub[0].SetVertical( nDir, bVertFormat ); - aSub[1].SetVertical( nDir, bVertFormat || nDir > 1000 ); + aSub[1].SetVertical( nDir, bVertFormat ); aSub[2].SetVertical( nDir, bVertFormat ); } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits