diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-07-04 10:13:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-04 10:13:32 +0100 |
| commit | 6d4b1e18fc30eaeede2279e6baa74a524d59dc2a (patch) | |
| tree | e528c739694a7270c40b61e1c694fdb24aea9ba6 /sw/source/filter/ww8/ww8par2.cxx | |
| parent | 9a28ab67c1a274f016f88cdd94283fd5325ad30d (diff) | |
Related: #i115768# use cached data values instead of pointer to sprm cache
use cached data value in case underlying sprm cache goes away
Diffstat (limited to 'sw/source/filter/ww8/ww8par2.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index c9fbc8208497..e1c9d28dd056 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -549,8 +549,10 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd, to see if we are still in that frame. */ - aRet.mpSprm37 = pPlcxMan->HasParaSprm( bVer67 ? 37 : 0x2423 ); - aRet.mpSprm29 = pPlcxMan->HasParaSprm( bVer67 ? 29 : 0x261B ); + aRet.m_bHasSprm37 = pPlcxMan->HasParaSprm( bVer67 ? 37 : 0x2423 ); + const sal_uInt8 *pSrpm29 = pPlcxMan->HasParaSprm( bVer67 ? 29 : 0x261B ); + aRet.m_bHasSprm29 = pSrpm29 != NULL; + aRet.m_nSprm29 = pSrpm29 ? *pSrpm29 : 0; // Is there some frame data here bool bNowApo = aRet.HasFrame() || pTopLevelTable; |