summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Specht <os@openoffice.org>2001-07-02 10:52:55 +0000
committerOliver Specht <os@openoffice.org>2001-07-02 10:52:55 +0000
commita7afc46b3766e4000ae5a9b8a914ede36bbd2991 (patch)
tree2b30c965e0a8b94baae549ab2d41a8775a42fbd4
parentdec377fd9ddd05a6e5277f81bb3628e88109d033 (diff)
#85609# dont allow counting by chapter an positon at end of document
-rw-r--r--sw/source/ui/misc/docfnote.cxx30
-rw-r--r--sw/source/ui/misc/impfnote.hxx11
2 files changed, 25 insertions, 16 deletions
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 63179e38f78c..612cad9ee6eb 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.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $
+ * last change: $Author: os $ $Date: 2001-07-02 11:52:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -206,15 +206,16 @@ SwEndNoteOptionPage::SwEndNoteOptionPage( Window *pParent, BOOL bEN,
aContFL (this, ResId( FL_CONT )),
aNumPage(aNumCountBox.GetEntry(FTNNUM_PAGE)),
+ aNumChapter(aNumCountBox.GetEntry(FTNNUM_CHAPTER)),
pSh( 0 ),
bPosDoc(FALSE),
bEndNote( bEN )
{
FreeResource();
- aPosPageBox.SetClickHdl(LINK(this, SwEndNoteOptionPage, PosPage));
- aPosChapterBox.SetClickHdl(LINK(this, SwEndNoteOptionPage, PosChapter));
- aNumCountBox.SetSelectHdl(LINK(this, SwEndNoteOptionPage, NumCount));
+ aPosPageBox.SetClickHdl(LINK(this, SwEndNoteOptionPage, PosPageHdl));
+ aPosChapterBox.SetClickHdl(LINK(this, SwEndNoteOptionPage, PosChapterHdl));
+ aNumCountBox.SetSelectHdl(LINK(this, SwEndNoteOptionPage, NumCountHdl));
}
@@ -262,6 +263,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
{
aPosChapterBox.Check();
aNumCountBox.RemoveEntry(aNumPage);
+ aNumCountBox.RemoveEntry(aNumChapter);
bPosDoc = TRUE;
}
// Verweistexte
@@ -355,7 +357,7 @@ SfxTabPage *SwEndNoteOptionPage::Create( Window *pParent, const SfxItemSet &rSet
inline void SwEndNoteOptionPage::SelectNumbering(int eNum)
{
aNumCountBox.SelectEntryPos(bPosDoc? (USHORT)eNum - 1: eNum);
- NumCount( &aNumCountBox );
+ NumCountHdl( &aNumCountBox );
}
@@ -390,12 +392,14 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell )
------------------------------------------------------------------------*/
-IMPL_LINK( SwEndNoteOptionPage, PosPage, Button *, EMPTYARG )
+IMPL_LINK( SwEndNoteOptionPage, PosPageHdl, Button *, EMPTYARG )
{
const SwFtnNum eNum = (const SwFtnNum)GetNumbering();
bPosDoc = FALSE;
- if(LISTBOX_ENTRY_NOTFOUND == aNumCountBox.GetEntryPos(aNumPage)) {
+ if(LISTBOX_ENTRY_NOTFOUND == aNumCountBox.GetEntryPos(aNumPage))
+ {
aNumCountBox.InsertEntry(aNumPage, FTNNUM_PAGE);
+ aNumCountBox.InsertEntry(aNumChapter, FTNNUM_CHAPTER);
SelectNumbering(eNum);
}
aPageTemplLbl.Enable(FALSE);
@@ -409,7 +413,7 @@ IMPL_LINK( SwEndNoteOptionPage, PosPage, Button *, EMPTYARG )
------------------------------------------------------------------------*/
-IMPL_LINK( SwEndNoteOptionPage, NumCount, ListBox*, EMPTYARG )
+IMPL_LINK( SwEndNoteOptionPage, NumCountHdl, ListBox*, EMPTYARG )
{
BOOL bEnable = TRUE;
if( aNumCountBox.GetEntryCount() - 1 != aNumCountBox.GetSelectEntryPos() )
@@ -430,18 +434,19 @@ IMPL_LINK( SwEndNoteOptionPage, NumCount, ListBox*, EMPTYARG )
------------------------------------------------------------------------*/
-IMPL_LINK_INLINE_START( SwEndNoteOptionPage, PosChapter, Button *, EMPTYARG )
+IMPL_LINK_INLINE_START( SwEndNoteOptionPage, PosChapterHdl, Button *, EMPTYARG )
{
if ( !bPosDoc )
SelectNumbering(FTNNUM_DOC);
bPosDoc = TRUE;
aNumCountBox.RemoveEntry(aNumPage);
+ aNumCountBox.RemoveEntry(aNumChapter);
aPageTemplLbl.Enable();
aPageTemplBox.Enable();
return 0;
}
-IMPL_LINK_INLINE_END( SwEndNoteOptionPage, PosChapter, Button *, EMPTYARG )
+IMPL_LINK_INLINE_END( SwEndNoteOptionPage, PosChapterHdl, Button *, EMPTYARG )
SwCharFmt* lcl_GetCharFormat( SwWrtShell* pSh, const String& rCharFmtName )
{
@@ -534,6 +539,9 @@ SfxTabPage *SwFootNoteOptionPage::Create(Window *pParent, const SfxItemSet &rSet
/*------------------------------------------------------------------------
$Log: not supported by cvs2svn $
+ Revision 1.5 2001/06/01 11:04:53 fme
+ Fix #86988#: Redesign of dialogs
+
Revision 1.4 2001/03/02 14:08:37 os
extended numbering types available
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index 21929d321832..4a3ad69c79de 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: impfnote.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: fme $ $Date: 2001-06-01 11:04:53 $
+ * last change: $Author: os $ $Date: 2001-07-02 11:52:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -118,6 +118,7 @@ class SwEndNoteOptionPage : public SfxTabPage
FixedLine aContFL;
String aNumPage;
+ String aNumChapter;
SwWrtShell *pSh;
BOOL bPosDoc;
BOOL bEndNote;
@@ -125,9 +126,9 @@ class SwEndNoteOptionPage : public SfxTabPage
inline void SelectNumbering(int eNum);
int GetNumbering() const;
- DECL_LINK( PosPage, Button * );
- DECL_LINK( PosChapter, Button * );
- DECL_LINK( NumCount, ListBox * );
+ DECL_LINK( PosPageHdl, Button * );
+ DECL_LINK( PosChapterHdl, Button * );
+ DECL_LINK( NumCountHdl, ListBox * );
public: