diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-06-06 14:06:48 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-06-06 14:06:48 +0200 |
| commit | b6212a4a950d9091aaad62022216e8aaaa074965 (patch) | |
| tree | ed81e5f1845d4bb2dcb73e4da0c3b73d247ef0e9 /editeng | |
| parent | f5e719d38e855484905b8f761a6779788b589546 (diff) | |
| parent | e12af87ff5f4a0d7b10133a9b3ddc114765607d6 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-4'
Conflicts:
connectivity/qa/makefile.mk
sfx2/source/appl/appdata.cxx
sfx2/source/appl/appinit.cxx
sfx2/source/inc/appdata.hxx
sysui/desktop/productversion.mk
xmloff/source/forms/elementimport.cxx
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/rtf/rtfitem.cxx | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 7f94d5a721e4..d97c05b3d67f 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -1431,25 +1431,41 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet, case RTF_CLBRDRT: // Cell top border { if( bTableDef ) + { + if (nBorderTyp != 0) + SetBorderLine( nBorderTyp, aAttr, aBrd ); nBorderTyp = RTF_BRDRT; + } break; } case RTF_CLBRDRB: // Cell bottom border { if( bTableDef ) + { + if (nBorderTyp != 0) + SetBorderLine( nBorderTyp, aAttr, aBrd ); nBorderTyp = RTF_BRDRB; + } break; } case RTF_CLBRDRL: // Cell left border { if( bTableDef ) + { + if (nBorderTyp != 0) + SetBorderLine( nBorderTyp, aAttr, aBrd ); nBorderTyp = RTF_BRDRL; + } break; } case RTF_CLBRDRR: // Cell right border { if( bTableDef ) + { + if (nBorderTyp != 0) + SetBorderLine( nBorderTyp, aAttr, aBrd ); nBorderTyp = RTF_BRDRR; + } break; } |