merge with DEV300_m64

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;
             }
         }
     }

sd/source/filter/ppt/pptin.cxx

@@ -2346,6 +2346,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
                 if ( aPresentationText.Len() )
                     pPage->SetObjText( (SdrTextObj*)pText, pOutl, ePresKind, aPresentationText );
 
+                if ( pPage->GetPageKind() != PK_NOTES )
+                {
                     SfxStyleSheet* pSheet2( pPage->GetStyleSheetForPresObj( ePresKind ) );
                     if ( pSheet2 )
                     {
@@ -2354,8 +2356,11 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
                         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() );

slideshow/util/makefile.mk

@@ -41,8 +41,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Common ----------------------------------------------------------
 
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
+.IF "$(VERBOSE)"=="TRUE"
+CDEFS+=-DVERBOSE
 .ENDIF
 
 SHL1DLLPRE=

slideshow/util/makefile.pmk

@@ -29,8 +29,8 @@
 #
 #*************************************************************************
 
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
+.IF "$(VERBOSE)"=="TRUE"
+CDEFS+=-DVERBOSE
 .ENDIF
 
 .IF "$(debug)"!="" || "$(DEBUG)"!=""