diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 14:10:11 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 14:10:11 +0000 |
| commit | 4a82d5eb8269d762015fca9e3ea2cc572a8f5215 (patch) | |
| tree | 45391ad3ef4d232f9aef9b056d5b3b15dd17c5e2 /sd | |
| parent | b6f1e0ec6243371d1696afb9b615cc0b454a864e (diff) | |
INTEGRATION: CWS impress11ea (1.43.44); FILE MERGED
2004/06/03 10:07:58 sj 1.43.44.1: #i28010# now exporting the (display of master page object) feature
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 232d68ccad19..7173f7029365 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: eppt.cxx,v $ * - * $Revision: 1.43 $ + * $Revision: 1.44 $ * - * last change: $Author: rt $ $Date: 2004-04-02 14:58:07 $ + * last change: $Author: rt $ $Date: 2004-06-17 15:10:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1464,9 +1464,26 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum ) sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) ); if ( bHasBackground ) bHasBackground = ( aAny >>= aXBackgroundPropSet ); - sal_uInt16 nMode = 3; // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background - if ( !bHasBackground ) - nMode |= 4; + + sal_uInt16 nMode = 7; // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background + if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundVisible" ) ) ) ) + { + sal_Bool bBackgroundVisible; + if ( aAny >>= bBackgroundVisible ) + { + if ( !bBackgroundVisible ) + nMode &= ~4; + } + } + if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundObjectsVisible" ) ) ) ) + { + sal_Bool bBackgroundObjectsVisible; + if ( aAny >>= bBackgroundObjectsVisible ) + { + if ( !bBackgroundObjectsVisible ) + nMode &= ~1; + } + } const PHLayout& rLayout = ImplGetLayout( mXPagePropSet ); mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_Slide | nPageNum, mpStrm->Tell() ); |