diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-29 07:38:58 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-29 07:38:58 +0000 |
| commit | 970922619e8c7020799ec7179ad6eb5fc38c1dd2 (patch) | |
| tree | f00d37b424c9d1d3443fb3ca5b9f4d3ce349fd8c /sw/source/core/graphic/ndgrf.cxx | |
| parent | 3ba71034a7bba0b6a42f2b740475506aac5665f2 (diff) | |
INTEGRATION: CWS sw8u10bf04 (1.41.122); FILE MERGED
2007/12/13 13:52:50 od 1.41.122.1: #i80822# method <SwGrfNode::IsTransparent()>
- remove fix for internal issue 102099, because it's no longer
needed and causes wrong results for non-transparent graphics
Diffstat (limited to 'sw/source/core/graphic/ndgrf.cxx')
| -rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 500541d10aaf..a22dcccd4e01 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ndgrf.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: hr $ $Date: 2007-09-27 08:52:37 $ + * last change: $Author: vg $ $Date: 2008-01-29 08:38:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1192,14 +1192,17 @@ BOOL SwGrfNode::IsTransparent() const if( !bRet ) // ask the attribut bRet = 0 != GetSwAttrSet().GetTransparencyGrf().GetValue(); - /// 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; - } + // --> 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; } |