diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-11-30 15:40:44 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-11-30 15:40:44 +0000 |
| commit | 5bb8c84f6c717b65c45c30f9d98ef80c62fa26fc (patch) | |
| tree | cccf14ba2396b12393a0e95f13d3d72a873837be | |
| parent | d4813204c6341ee55f51975da46ac12a1a3069bc (diff) | |
| parent | d45a148e0c593d30e149fee70e7fbbf0958a9f62 (diff) | |
slideshow1: merge with DEV300 m63
| -rw-r--r-- | sd/source/core/sdpage.cxx | 5 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 21 | ||||
| -rw-r--r-- | slideshow/util/makefile.mk | 4 | ||||
| -rw-r--r-- | slideshow/util/makefile.pmk | 4 |
4 files changed, 22 insertions, 12 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 58274ab3a009..7f80b5bd763a 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2882,6 +2882,11 @@ bool SdPage::checkVisibility( } } } + } // check for placeholders on master + else if( pCheckPage->IsMasterPage() && ( pVisualizedPage != pCheckPage ) ) + { + // presentation objects on master slide are always invisible if slide is shown. + return false; } } } diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index b13935699b0f..c495c69a55e8 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2346,16 +2346,21 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj if ( aPresentationText.Len() ) pPage->SetObjText( (SdrTextObj*)pText, pOutl, ePresKind, aPresentationText ); - SfxStyleSheet* pSheet2( pPage->GetStyleSheetForPresObj( ePresKind ) ); - if ( pSheet2 ) + if ( pPage->GetPageKind() != PK_NOTES ) { - SfxItemSet& rItemSet = pSheet2->GetItemSet(); - rItemSet.Put( (SdrTextLeftDistItem&)pText->GetMergedItem( SDRATTR_TEXT_LEFTDIST ) ); - rItemSet.Put( (SdrTextRightDistItem&)pText->GetMergedItem( SDRATTR_TEXT_RIGHTDIST ) ); - rItemSet.Put( (SdrTextUpperDistItem&)pText->GetMergedItem( SDRATTR_TEXT_UPPERDIST ) ); - rItemSet.Put( (SdrTextLowerDistItem&)pText->GetMergedItem( SDRATTR_TEXT_LOWERDIST ) ); + SfxStyleSheet* pSheet2( pPage->GetStyleSheetForPresObj( ePresKind ) ); + if ( pSheet2 ) + { + SfxItemSet& rItemSet = pSheet2->GetItemSet(); + rItemSet.Put( (SdrTextLeftDistItem&)pText->GetMergedItem( SDRATTR_TEXT_LEFTDIST ) ); + rItemSet.Put( (SdrTextRightDistItem&)pText->GetMergedItem( SDRATTR_TEXT_RIGHTDIST ) ); + rItemSet.Put( (SdrTextUpperDistItem&)pText->GetMergedItem( SDRATTR_TEXT_UPPERDIST ) ); + rItemSet.Put( (SdrTextLowerDistItem&)pText->GetMergedItem( SDRATTR_TEXT_LOWERDIST ) ); + rItemSet.Put( (SdrTextVertAdjustItem&)pText->GetMergedItem( SDRATTR_TEXT_VERTADJUST ) ); + rItemSet.Put( (SdrTextHorzAdjustItem&)pText->GetMergedItem( SDRATTR_TEXT_HORZADJUST ) ); + } + pText->NbcSetStyleSheet( pSheet2, FALSE ); } - pText->NbcSetStyleSheet( pSheet2, TRUE ); SfxItemSet aTempAttr( mpDoc->GetPool() ); SdrTextMinFrameHeightItem aMinHeight( pText->GetLogicRect().GetSize().Height() ); diff --git a/slideshow/util/makefile.mk b/slideshow/util/makefile.mk index 4b4008624c1e..aba4094b242f 100644 --- a/slideshow/util/makefile.mk +++ b/slideshow/util/makefile.mk @@ -41,8 +41,8 @@ ENABLE_EXCEPTIONS=TRUE # --- Common ---------------------------------------------------------- -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE +.IF "$(VERBOSE)"=="TRUE" +CDEFS+=-DVERBOSE .ENDIF SHL1DLLPRE= diff --git a/slideshow/util/makefile.pmk b/slideshow/util/makefile.pmk index 5aef116cd677..362e7f862a71 100644 --- a/slideshow/util/makefile.pmk +++ b/slideshow/util/makefile.pmk @@ -29,8 +29,8 @@ # #************************************************************************* -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE +.IF "$(VERBOSE)"=="TRUE" +CDEFS+=-DVERBOSE .ENDIF .IF "$(debug)"!="" || "$(DEBUG)"!="" |