sw/source/filter/ww8/ww8par.cxx | 23 +++++------------------ vcl/source/outdev/map.cxx | 8 ++++---- 2 files changed, 9 insertions(+), 22 deletions(-)
New commits: commit b6bee78750a84e9598d836223bf9a0937893dcc0 Author: Andras Timar <[email protected]> Date: Mon Nov 9 15:13:55 2015 +0100 translated German warnings Change-Id: Ibb42bfbbf8c7a1796998c5390e7d933009b3ab89 diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index 4e84033..70de3fb 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -1511,15 +1511,15 @@ static void verifyUnitSourceDest( MapUnit eUnitSource, MapUnit eUnitDest ) DBG_ASSERT( eUnitSource != MAP_SYSFONT && eUnitSource != MAP_APPFONT && eUnitSource != MAP_RELATIVE, - "Source MapUnit nicht erlaubt" ); + "Source MapUnit is not permitted" ); DBG_ASSERT( eUnitDest != MAP_SYSFONT && eUnitDest != MAP_APPFONT && eUnitDest != MAP_RELATIVE, - "Destination MapUnit nicht erlaubt" ); + "Destination MapUnit is not permitted" ); SAL_WARN_IF( eUnitSource == MAP_PIXEL, "vcl", - "MAP_PIXEL mit 72dpi angenaehert" ); + "MAP_PIXEL approximated with 72dpi" ); SAL_WARN_IF( eUnitDest == MAP_PIXEL, "vcl", - "MAP_PIXEL mit 72dpi angenaehert" ); + "MAP_PIXEL approximated with 72dpi" ); } #define ENTER3( eUnitSource, eUnitDest ) \ commit dad32b63f852716af94cf995696b62b6e60724bd Author: Andras Timar <[email protected]> Date: Wed Nov 4 16:08:32 2015 +0100 Revert "fix tdf#94818 while retaining the tdf#90504 fix" This reverts commit 959ac511dbebeb3983da92052ced837b39b74ed9. diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 0886deb..903f944 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -3530,24 +3530,11 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) } break; case 0x7: - { - bNewParaEnd = true; - WW8PLCFxDesc* pPap = m_pPlcxMan->GetPap(); - //The last paragraph of each cell is terminated by a special - //paragraph mark called a cell mark. Following the cell mark - //that ends the last cell of a table row, the table row is - //terminated by a special paragraph mark called a row mark - // - //So the 0x7 should be right at the end of the previous - //range to be a real cell-end. - if (pPap->nOrigStartPos == nCpOfs+nPosCp+1 || - pPap->nOrigStartPos == WW8_CP_MAX) - { - TabCellEnd(); // Table cell/row end - } - else - bParaMark = true; - } + bNewParaEnd = true; + if (m_pPlcxMan->GetPapPLCF()->Where() == nCpOfs+nPosCp+1) + TabCellEnd(); // Table cell/row end + else + bParaMark = true; break; case 0xf: if( !m_bSpec ) // "Satellite" _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
