diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-03-06 08:10:41 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-03-06 08:10:41 +0000 |
| commit | 34936b2b30eb2b90518f8ab11b7d0748dfa8e86c (patch) | |
| tree | 36a7cf9593904cecef254cf0b73f23185a74efc7 /svx/source | |
| parent | a1f8f494b0a4f892f1a23aada2c8ed25aaad7b94 (diff) | |
INTEGRATION: CWS impress85 (1.128.84); FILE MERGED
2006/02/16 12:12:36 sj 1.128.84.1: #i59807# applying graphic attributes also for calc
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/msfilter/msdffimp.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/svx/source/msfilter/msdffimp.cxx b/svx/source/msfilter/msdffimp.cxx index 01ba58b17227..fbc0f96c885d 100644 --- a/svx/source/msfilter/msdffimp.cxx +++ b/svx/source/msfilter/msdffimp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: msdffimp.cxx,v $ * - * $Revision: 1.129 $ + * $Revision: 1.130 $ * - * last change: $Author: kz $ $Date: 2006-02-01 19:01:26 $ + * last change: $Author: rt $ $Date: 2006-03-06 09:10:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -4495,13 +4495,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, Rect if ( nContrast || nBrightness || ( nGamma != 0x10000 ) || ( eDrawMode != GRAPHICDRAWMODE_STANDARD ) ) { - - // Was: currently the luminance and contrast items are available - // in impress only - // Now: available in writer as well, so logically only do - // hackery for excel import - if ( !(GetSvxMSDffSettings() & SVXMSDFF_SETTINGS_IMPORT_EXCEL) - && ( ( rObjData.nSpFlags & SP_FOLESHAPE ) == 0 ) ) + if ( ( rObjData.nSpFlags & SP_FOLESHAPE ) == 0 ) { if ( nBrightness ) rSet.Put( SdrGrafLuminanceItem( nBrightness ) ); |