diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 14:36:52 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 14:36:52 +0000 |
| commit | fc06a004ec783f4a6718444c235c622784bf81ea (patch) | |
| tree | 28df20b11c21ac5d8e34de53a1f2c952a9968ff1 /sw/source/filter/rtf/rtffly.cxx | |
| parent | 5f5edd395bec577fed6e3ae936e70c6cfaa726f7 (diff) | |
CWS-TOOLING: integrate CWS sw31bf03
2008-12-23 13:29:53 +0100 od r265778 : #i95626# method <SwRootFrm::GetCrsrOfst(..)>
- special handling, if given search coordination point
is beyond the root frame's area.
2008-12-22 15:46:13 +0100 od r265753 : #i95698# method <SwFrm::GetPrevSctLeaf(..)>
- step into table allowed, if section the <this> frame is in,
is also inside a table.
2008-12-22 11:29:56 +0100 od r265746 : #i83368# Assure that graphic inside table inside text frame inside table
is enclosed into own Writer fly frame nodes
Diffstat (limited to 'sw/source/filter/rtf/rtffly.cxx')
| -rw-r--r-- | sw/source/filter/rtf/rtffly.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx index 7f8e0f630d21..ad012153b78c 100644 --- a/sw/source/filter/rtf/rtffly.cxx +++ b/sw/source/filter/rtf/rtffly.cxx @@ -774,7 +774,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) else if( RTF_APOCTL == ((nToken = GetNextToken() ) & ~(0xff | RTF_SWGDEFS)) ) { - bReadSwFly = TRUE; // alles kommt in den akt. Fly + bReadSwFly = true; // alles kommt in den akt. Fly SvxLRSpaceItem aLR( RES_LR_SPACE ); SvxULSpaceItem aUL( RES_UL_SPACE ); nCols = USHRT_MAX; // neu aufsetzen @@ -1031,6 +1031,9 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) } } aFlyArr.Insert( pFlySave, nFlyArrCnt++ ); + // --> OD 2008-12-22 #i83368# - reset + mbReadCellWhileReadSwFly = false; + // <-- } } @@ -1089,7 +1092,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) */ if (!nAppliedProps) { - bReadSwFly = FALSE; + bReadSwFly = false; SkipToken( -1 ); return; } @@ -1232,7 +1235,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) } } - bReadSwFly = FALSE; + bReadSwFly = false; SkipToken( -1 ); } @@ -1243,7 +1246,11 @@ void SwRTFParser::InsPicture( const String& rGrfNm, const Graphic* pGrf, // kennzeichen fuer Swg-Dokumente: // (dann ist das FlyFmt fuer die Grafik!) SwGrfNode * pGrfNd; - if( bReadSwFly ) + // --> OD 2008-12-22 #i83368# + // Assure that graphic node is enclosed by fly frame node. +// if( bReadSwFly ) + if ( bReadSwFly && !mbReadCellWhileReadSwFly ) + // <-- { // erzeuge nur einen normalen GrafikNode und ersetze diesen gegen // den vorhandenen Textnode |