From 5151f058fe8724a33f283457351b848818a2090a Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau <hjs@openoffice.org>
Date: Thu, 25 Sep 2003 09:50:58 +0000
Subject: INTEGRATION: CWS os20 (1.11.206); FILE MERGED 2003/09/12 12:15:33 os
 1.11.206.1: #i16370# create temporary SfxItemSet to meet requirements of
 SfxTabPage::FillItemSet()

---
 sw/source/ui/misc/docfnote.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sw/source/ui/misc/docfnote.cxx')

diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index aed3d39d9276..cd214cffc24e 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docfnote.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: vg $ $Date: 2003-04-17 15:35:22 $
+ *  last change: $Author: hjs $ $Date: 2003-09-25 10:50:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -153,13 +153,13 @@ SwFootNoteOptionDlg::~SwFootNoteOptionDlg()
 
 IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn )
 {
-    SfxItemSet *pSet = 0;
+    SfxItemSet aDummySet(rSh.GetAttrPool(), 1, 1 );
     SfxTabPage *pPage = GetTabPage( TP_FOOTNOTEOPTION );
     if ( pPage )
-        pPage->FillItemSet( (SfxItemSet&)pSet );
+        pPage->FillItemSet( aDummySet );
     pPage = GetTabPage( TP_ENDNOTEOPTION  );
     if ( pPage )
-        pPage->FillItemSet( (SfxItemSet&)pSet );
+        pPage->FillItemSet( aDummySet );
     aOldOkHdl.Call( pBtn );
     return 0;
 }
@@ -490,7 +490,7 @@ SwCharFmt* lcl_GetCharFormat( SwWrtShell* pSh, const String& rCharFmtName )
     return pFmt;
 }
 
-BOOL SwEndNoteOptionPage::FillItemSet( SfxItemSet &rSet )
+BOOL SwEndNoteOptionPage::FillItemSet( SfxItemSet & )
 {
     SwEndNoteInfo *pInf = bEndNote ? new SwEndNoteInfo() : new SwFtnInfo();
 
-- 
cgit