diff -uNr sd/source/ui/dlg/headerfooterdlg.cxx sd.new/source/ui/dlg/headerfooterdlg.cxx --- sd/source/ui/dlg/headerfooterdlg.cxx 2006-12-19 15:54:48.000000000 +0800 +++ sd.new/source/ui/dlg/headerfooterdlg.cxx 2006-12-19 15:53:16.000000000 +0800 @@ -233,6 +233,7 @@ bool mbHandoutMode; DECL_LINK( UpdateOnClickHdl, void * ); + DECL_LINK(OnTitleClickHdl, void * ); DECL_LINK( ClickApplyToAllHdl, void * ); DECL_LINK( ClickApplyHdl, void * ); DECL_LINK( ClickCancelHdl, void * ); @@ -455,6 +456,14 @@ change( pUndoGroup, mpDoc->GetSdPage( 0, PK_STANDARD ), aTempSettings ); } + else + { + // just hide them, plain simple UI feature + HeaderFooterSettings aTempSettings = mpDoc->GetSdPage( 0, PK_STANDARD )->getHeaderFooterSettings(); + aTempSettings = aNewSettings; + + change( pUndoGroup, mpCurrentPage, aTempSettings ); + } // now notes settings mpNotesHandoutsTabPage->getData( aNewSettings, bNewNotOnTitle ); @@ -585,6 +594,7 @@ maCBFooter.SetClickHdl( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) ); maCBHeader.SetClickHdl( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) ); maCBSlideNumber.SetClickHdl( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) ); + maCBNotOnTitle.SetClickHdl( LINK( this, HeaderFooterTabPage, OnTitleClickHdl )); maPBApplyToAll.SetClickHdl( LINK( this, HeaderFooterTabPage, ClickApplyToAllHdl ) ); maPBApply.SetClickHdl( LINK( this, HeaderFooterTabPage, ClickApplyHdl ) ); maPBCancel.SetClickHdl( LINK( this, HeaderFooterTabPage, ClickCancelHdl ) ); @@ -736,7 +746,41 @@ return 0; } +// ----------------------------------------------------------------------- + +IMPL_LINK( HeaderFooterTabPage, OnTitleClickHdl, void *, EMPTYARG ) +{ + if (maCBNotOnTitle.IsChecked()) + { + maCBDateTime.Check(FALSE); + maCBFooter.Check(FALSE); + } + else + { + maCBDateTime.Check(); + maCBFooter.Check(); + } + maRBDateTimeFixed.Enable( maCBDateTime.IsChecked() ); + maTBDateTimeFixed.Enable( maRBDateTimeFixed.IsChecked() && maCBDateTime.IsChecked() ); + maRBDateTimeAutomatic.Enable( maCBDateTime.IsChecked() ); + maCBDateTimeFormat.Enable( maCBDateTime.IsChecked() && maRBDateTimeAutomatic.IsChecked() ); + maFTDateTimeLanguage.Enable( maCBDateTime.IsChecked() && maRBDateTimeAutomatic.IsChecked() ); + maCBDateTimeLanguage.Enable( maCBDateTime.IsChecked() && maRBDateTimeAutomatic.IsChecked() ); + + maFTFooter.Enable( maCBFooter.IsChecked() ); + maTBFooter.Enable( maCBFooter.IsChecked() ); + + maFTHeader.Enable( maCBHeader.IsChecked() ); + maTBHeader.Enable( maCBHeader.IsChecked() ); + + HeaderFooterSettings aSettings; + bool bNotOnTitle; + getData( aSettings, bNotOnTitle ); + maCTPreview.update( aSettings ); + + return 0; +} // ----------------------------------------------------------------------- IMPL_LINK( HeaderFooterTabPage, ClickApplyToAllHdl, void *, EMPTYARG )