diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-04-09 09:31:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-04-09 09:31:27 +0100 |
| commit | e8c667fcf38286ca9944dfca3c07b63f3939679b (patch) | |
| tree | 6f24d0de713104c869d95adf38aa9ef434d7f206 /sd/source/ui/unoidl/unopback.cxx | |
| parent | 92005938ab0d211ac9d49afc48bf218078fb1b5e (diff) | |
| parent | e725e315399f527e63f919a9a6861066b1f41512 (diff) | |
cmcfixes74: merge with DEV300 m76
Diffstat (limited to 'sd/source/ui/unoidl/unopback.cxx')
| -rw-r--r-- | sd/source/ui/unoidl/unopback.cxx | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 341cd0c53d40..1ac62fb1363f 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -65,21 +65,12 @@ const SvxItemPropertySet* ImplGetPageBackgroundPropertySet() UNO3_GETIMPLEMENTATION_IMPL( SdUnoPageBackground ); -SdUnoPageBackground::SdUnoPageBackground( SdDrawDocument* pDoc /* = NULL */, SdrObject* pObj /* = NULL */ ) throw() -: mpPropSet( ImplGetPageBackgroundPropertySet() ), mpSet( NULL ), mpDoc( pDoc ) -{ - if( pDoc ) - { - StartListening( *pDoc ); - mpSet = new SfxItemSet( pDoc->GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST ); - - if( pObj ) - mpSet->Put(pObj->GetMergedItemSet()); - } -} - -SdUnoPageBackground::SdUnoPageBackground( SdDrawDocument* pDoc, const SfxItemSet* pSet ) throw() -: mpPropSet( ImplGetPageBackgroundPropertySet() ), mpSet( NULL ), mpDoc( pDoc ) +SdUnoPageBackground::SdUnoPageBackground( + SdDrawDocument* pDoc /* = NULL */, + const SfxItemSet* pSet /* = NULL */) throw() +: mpPropSet(ImplGetPageBackgroundPropertySet()), + mpSet(NULL), + mpDoc(pDoc) { if( pDoc ) { |