diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 14:45:43 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 14:45:43 +0000 |
| commit | 70de0c38fd177b3c95837118c5fb35e380c87e90 (patch) | |
| tree | bb54ac0c5769dcfc89fdaeb151ffac6eb18154de /sw/source/core/graphic | |
| parent | 5aff37cd51879a41365f2ceb0e927bdf57ffddb3 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'sw/source/core/graphic')
| -rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 7d5377c1f80d..9e1e5a95d835 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ndgrf.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: od $ $Date: 2002-09-17 13:47:09 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -164,8 +164,8 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, : SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ) { aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); - bInSwapIn = bChgTwipSize = bLoadLowResGrf = bFrameInPaint = - bScaleImageMap = FALSE; + bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = + bFrameInPaint = bScaleImageMap = FALSE; bGrafikArrived = TRUE; ReRead( rGrfName, rFltName, pGraphic, 0, FALSE ); } @@ -179,8 +179,8 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); if( rGrfObj.HasUserData() && rGrfObj.IsSwappedOut() ) aGrfObj.SetSwapState(); - bInSwapIn = bChgTwipSize = bLoadLowResGrf = bFrameInPaint = - bScaleImageMap = FALSE; + bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel= bLoadLowResGrf = + bFrameInPaint = bScaleImageMap = FALSE; bGrafikArrived = TRUE; } @@ -199,8 +199,8 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, Graphic aGrf; aGrf.SetDefaultType(); aGrfObj.SetGraphic( aGrf, rGrfName ); - bInSwapIn = bChgTwipSize = bLoadLowResGrf = bFrameInPaint = - bScaleImageMap = FALSE; + bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = + bFrameInPaint = bScaleImageMap = FALSE; bGrafikArrived = TRUE; InsertLink( rGrfName, rFltName ); |