Skip to content

C
core
Kaydet (Commit) 5f62dd5e authored tarafından Philipp Lohmann [pl]'s avatar Philipp Lohmann [pl]
Dosyalara gözat
Seçenekler

merge with DEV300_m64

üst ab6ddd69 d45a148e
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 12 deletions
sd/source/core/sdpage.cxx
Dosyayı görüntüle @ 5f62dd5e
...@@ -2882,6 +2882,11 @@ bool SdPage::checkVisibility( ...@@ -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;
} }
} }
} }
......
sd/source/filter/ppt/pptin.cxx
Dosyayı görüntüle @ 5f62dd5e
...@@ -2346,16 +2346,21 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj ...@@ -2346,16 +2346,21 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
if ( aPresentationText.Len() ) if ( aPresentationText.Len() )
pPage->SetObjText( (SdrTextObj*)pText, pOutl, ePresKind, aPresentationText ); pPage->SetObjText( (SdrTextObj*)pText, pOutl, ePresKind, aPresentationText );
SfxStyleSheet* pSheet2( pPage->GetStyleSheetForPresObj( ePresKind ) ); if ( pPage->GetPageKind() != PK_NOTES )
if ( pSheet2 )
{ {
SfxItemSet& rItemSet = pSheet2->GetItemSet(); SfxStyleSheet* pSheet2( pPage->GetStyleSheetForPresObj( ePresKind ) );
rItemSet.Put( (SdrTextLeftDistItem&)pText->GetMergedItem( SDRATTR_TEXT_LEFTDIST ) ); if ( pSheet2 )
rItemSet.Put( (SdrTextRightDistItem&)pText->GetMergedItem( SDRATTR_TEXT_RIGHTDIST ) ); {
rItemSet.Put( (SdrTextUpperDistItem&)pText->GetMergedItem( SDRATTR_TEXT_UPPERDIST ) ); SfxItemSet& rItemSet = pSheet2->GetItemSet();
rItemSet.Put( (SdrTextLowerDistItem&)pText->GetMergedItem( SDRATTR_TEXT_LOWERDIST ) ); 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() ); SfxItemSet aTempAttr( mpDoc->GetPool() );
SdrTextMinFrameHeightItem aMinHeight( pText->GetLogicRect().GetSize().Height() ); SdrTextMinFrameHeightItem aMinHeight( pText->GetLogicRect().GetSize().Height() );
......
slideshow/util/makefile.mk
Dosyayı görüntüle @ 5f62dd5e
...@@ -41,8 +41,8 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -41,8 +41,8 @@ ENABLE_EXCEPTIONS=TRUE
# --- Common ---------------------------------------------------------- # --- Common ----------------------------------------------------------
.IF "$(verbose)"!="" || "$(VERBOSE)"!="" .IF "$(VERBOSE)"=="TRUE"
CDEFS+= -DVERBOSE CDEFS+=-DVERBOSE
.ENDIF .ENDIF
SHL1DLLPRE= SHL1DLLPRE=
......
slideshow/util/makefile.pmk
Dosyayı görüntüle @ 5f62dd5e
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
# #
#************************************************************************* #*************************************************************************
.IF "$(verbose)"!="" || "$(VERBOSE)"!="" .IF "$(VERBOSE)"=="TRUE"
CDEFS+= -DVERBOSE CDEFS+=-DVERBOSE
.ENDIF .ENDIF
.IF "$(debug)"!="" || "$(DEBUG)"!="" .IF "$(debug)"!="" || "$(DEBUG)"!=""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment