diff options
| author | gt <gt@openoffice.org> | 2002-07-23 07:34:47 +0000 |
|---|---|---|
| committer | gt <gt@openoffice.org> | 2002-07-23 07:34:47 +0000 |
| commit | 2138d72cd431ad7b6a455d9e222c9f6c0202ba41 (patch) | |
| tree | 5f6e9fb1caaf709029635a814dc48178e7291c33 /sd/source/ui/dlg/tpoption.cxx | |
| parent | dd194c4bb132a829d2933b8be457fc510722eabd (diff) | |
#101614#, #101547# handling of pSet==NULL in DeactivatePage()
Diffstat (limited to 'sd/source/ui/dlg/tpoption.cxx')
| -rw-r--r-- | sd/source/ui/dlg/tpoption.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 97b185f81119..5a4a74f30843 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tpoption.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: ka $ $Date: 2001-10-22 13:36:42 $ + * last change: $Author: gt $ $Date: 2002-07-23 08:34:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -457,7 +457,8 @@ int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pSet ) INT32 nX, nY; if( SetScale( aCbScale.GetText(), nX, nY ) ) { - FillItemSet( *pSet ); + if( pSet ) + FillItemSet( *pSet ); return( LEAVE_PAGE ); } WarningBox aWarnBox( GetParent(), WB_YES_NO, String( SdResId( STR_WARN_SCALE_FAIL ) ) ); @@ -466,7 +467,8 @@ int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pSet ) if( nReturn == RET_YES ) return( KEEP_PAGE ); - FillItemSet( *pSet ); + if( pSet ) + FillItemSet( *pSet ); return( LEAVE_PAGE ); } |