summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/ww8par6.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/ww8/ww8par6.cxx')
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx22
1 files changed, 16 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 4923053da591..a9f95705289c 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1223,15 +1223,25 @@ static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRCVer9* brc, WW8PLCFx_Cp_FKP*
{
if( !bVer67 )
{
- sal_uInt8* pSprm[4];
+ sal_uInt8* pSprm[4];
- // sprmSBrcTop, sprmSBrcLeft, sprmSBrcBottom, sprmSBrcRight
- if( pSep->Find4Sprms( 0x702B, 0x702C, 0x702D, 0x702E,
- pSprm[0], pSprm[1], pSprm[2], pSprm[3] ) )
- {
+ if( pSep->Find4Sprms(
+ NS_sprm::LN_SBrcTop, NS_sprm::LN_SBrcLeft,
+ NS_sprm::LN_SBrcBottom, NS_sprm::LN_SBrcRight,
+ pSprm[0], pSprm[1], pSprm[2], pSprm[3] ) )
+ {
for( int i = 0; i < 4; ++i )
nBorder |= int(_SetWW8_BRC( 8, brc[ i ], pSprm[ i ] ))<<i;
- }
+ }
+ // Version 9 BRCs if present will override version 8
+ if( pSep->Find4Sprms(
+ NS_sprm::LN_SBorderTop, NS_sprm::LN_SBorderLeft,
+ NS_sprm::LN_SBorderBottom, NS_sprm::LN_SBorderRight,
+ pSprm[0], pSprm[1], pSprm[2], pSprm[3] ) )
+ {
+ for( int i = 0; i < 4; ++i )
+ nBorder |= int(_SetWW8_BRC( 9, brc[ i ], pSprm[ i ] ))<<i;
+ }
}
}
else