diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 08:52:09 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 08:52:09 +0000 |
| commit | e45538953f3045f177aa16cd4b80452088469cd3 (patch) | |
| tree | bb9da140c7bd5a4c9b528a4374d4c02cc4ee3e9f /sw/source/core/graphic/ndgrf.cxx | |
| parent | 7b657bfff75f000bbca8d1a06ab989c39fccddce (diff) | |
INTEGRATION: CWS swlists01 (1.42.34); FILE MERGED
2008/05/14 12:57:12 od 1.42.34.5: #i86732# remove no longer needed code
2008/05/08 16:31:22 od 1.42.34.4: RESYNC: (1.44-1.45); FILE MERGED
2008/04/16 08:44:53 od 1.42.34.3: #i86732# further changes/adjustments for new list handling
2008/03/20 14:20:58 od 1.42.34.2: RESYNC: (1.42-1.44); FILE MERGED
2008/03/06 09:50:42 od 1.42.34.1: #i86732# refactoring due to revised <SwFmt> interface
Diffstat (limited to 'sw/source/core/graphic/ndgrf.cxx')
| -rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 80d0ee6cef5d..5d715262cdf9 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ndgrf.cxx,v $ - * $Revision: 1.45 $ + * $Revision: 1.46 $ * * This file is part of OpenOffice.org. * @@ -492,7 +492,7 @@ short SwGrfNode::SwapIn( BOOL bWaitForData ) if( 1 == nRet ) { SwMsgPoolItem aMsg( RES_GRAPHIC_SWAPIN ); - SwCntntNode::Modify( &aMsg, &aMsg ); + Modify( &aMsg, &aMsg ); } } else @@ -739,7 +739,7 @@ void SwGrfNode::ScaleImageMap() if( bScale ) { aURL.GetMap()->Scale( aScaleX, aScaleY ); - pFmt->SetAttr( aURL ); + pFmt->SetFmtAttr( aURL ); } } @@ -1120,18 +1120,6 @@ BOOL SwGrfNode::IsTransparent() const if( !bRet ) // ask the attribut bRet = 0 != GetSwAttrSet().GetTransparencyGrf().GetValue(); - // --> OD 2007-12-13 #i80822# - // Fix is no longer needed and causes wrong results for non-transparent graphics -// /// OD 17.09.2002 #102099# - if return value is still FALSE and -// /// graphic is swapped out, assume that graphic is transparent. -// /// Thus, for safety reasons, paint errors are avoided, because the -// /// background is painted not only by the graphic node. -// if ( !bRet && aGrfObj.IsSwappedOut() ) -// { -// bRet = true; -// } - // <-- - return bRet; } |