summaryrefslogtreecommitdiff
path: root/sw/source/ui/envelp/envprt.cxx
diff options
context:
space:
mode:
authorgt <gt@openoffice.org>2002-07-23 07:25:36 +0000
committergt <gt@openoffice.org>2002-07-23 07:25:36 +0000
commit4c372b70bcb2c57d104aae34fd38803a190f477e (patch)
tree350370145f927161ee23b05723752618812b617c /sw/source/ui/envelp/envprt.cxx
parent3e3fd897226b00ba0df6d4eff44c6d5deaf09dff (diff)
#101614#, #101547# handling of pSet==NULL in DeactivatePage()
Diffstat (limited to 'sw/source/ui/envelp/envprt.cxx')
-rw-r--r--sw/source/ui/envelp/envprt.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index a69290dec7ce..3f503bae25e6 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: envprt.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: fme $ $Date: 2001-05-30 16:32:13 $
+ * last change: $Author: gt $ $Date: 2002-07-23 08:19:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -231,7 +231,8 @@ void SwEnvPrtPage::ActivatePage(const SfxItemSet& rSet)
int SwEnvPrtPage::DeactivatePage(SfxItemSet* pSet)
{
- FillItemSet(*pSet);
+ if( pSet )
+ FillItemSet(*pSet);
return SfxTabPage::LEAVE_PAGE;
}
@@ -293,6 +294,9 @@ void SwEnvPrtPage::Reset(const SfxItemSet& rSet)
// ----------------------------------------------------------------------------
/*
$Log: not supported by cvs2svn $
+Revision 1.2 2001/05/30 16:32:13 fme
+Fix #86988#: Redesign of dialogs
+
Revision 1.1.1.1 2000/09/18 17:14:35 hr
initial import