diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 11:19:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 11:19:38 +0000 |
| commit | c2bfc4632b84322c3e1ba1fb0a156d0aee5d02f3 (patch) | |
| tree | 434458f66dc9270a8d5062a635c16f9751df424a /sw/source/ui/misc/docfnote.cxx | |
| parent | c3ab4aa7af02cb6d234023b4618fe0b952160556 (diff) | |
INTEGRATION: CWS swwarnings (1.16.222); FILE MERGED
2007/05/29 13:34:38 os 1.16.222.3: RESYNC: (1.16-1.17); FILE MERGED
2007/04/11 07:03:28 tl 1.16.222.2: #i69287# warning-free code
2007/03/26 12:09:12 tl 1.16.222.1: #i69287# warning-free code
Diffstat (limited to 'sw/source/ui/misc/docfnote.cxx')
| -rw-r--r-- | sw/source/ui/misc/docfnote.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index b2eb792828fb..39d2aa074b38 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docfnote.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: rt $ $Date: 2007-04-26 09:12:41 $ + * last change: $Author: hr $ $Date: 2007-09-27 12:19:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -122,7 +122,7 @@ SwFootNoteOptionDlg::SwFootNoteOptionDlg( Window *pParent, SwWrtShell &rS ) : AddTabPage( TP_ENDNOTEOPTION, SwEndNoteOptionPage::Create, 0 ); } -void SwFootNoteOptionDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void SwFootNoteOptionDlg::PageCreated( USHORT /*nId*/, SfxTabPage &rPage ) { ((SwEndNoteOptionPage&)rPage).SetShell( rSh ); } @@ -151,7 +151,7 @@ IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn ) SwEndNoteOptionPage::SwEndNoteOptionPage( Window *pParent, BOOL bEN, const SfxItemSet &rSet ) : SfxTabPage( pParent, SW_RES(bEN ? TP_ENDNOTEOPTION : TP_FOOTNOTEOPTION), rSet ), - aNumTypeFT (this, SW_RES( FT_NUMTYPE )), + aNumTypeFT (this, SW_RES( FT_NUMTYPE )), aNumViewBox (this, SW_RES( LB_NUMVIEW ), INSERT_NUM_EXTENDED_TYPES), aOffsetLbl (this, SW_RES( FT_OFFSET )), aOffsetFld (this, SW_RES( FLD_OFFSET )), @@ -172,10 +172,10 @@ SwEndNoteOptionPage::SwEndNoteOptionPage( Window *pParent, BOOL bEN, aPageTemplBox (this, SW_RES( LB_PAGE_TEMPL)), aTemplFL (this, SW_RES( FL_TEMPL )), - aFtnCharTextTemplLbl( this, SW_RES( FT_TEXT_CHARFMT)), - aFtnCharTextTemplBox( this, SW_RES( LB_TEXT_CHARFMT)), aFtnCharAnchorTemplLbl( this, SW_RES( FT_ANCHR_CHARFMT)), aFtnCharAnchorTemplBox( this, SW_RES( LB_ANCHR_CHARFMT)), + aFtnCharTextTemplLbl( this, SW_RES( FT_TEXT_CHARFMT)), + aFtnCharTextTemplBox( this, SW_RES( LB_TEXT_CHARFMT)), aCharTemplFL( this, SW_RES(FL_CHAR_TEMPL)), aContLbl (this, SW_RES( FT_CONT )), @@ -284,8 +284,8 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& ) } String sStr; - SwStyleNameMapper::FillUIName( bEndNote ? RES_POOLCOLL_ENDNOTE - : RES_POOLCOLL_FOOTNOTE, sStr ); + SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(bEndNote ? RES_POOLCOLL_ENDNOTE + : RES_POOLCOLL_FOOTNOTE), sStr ); if(LISTBOX_ENTRY_NOTFOUND == aParaTemplBox.GetEntryPos( sStr ) ) aParaTemplBox.InsertEntry( sStr ); @@ -476,7 +476,7 @@ BOOL SwEndNoteOptionPage::FillItemSet( SfxItemSet & ) { SwEndNoteInfo *pInf = bEndNote ? new SwEndNoteInfo() : new SwFtnInfo(); - pInf->nFtnOffset = aOffsetFld.GetValue() -1; + pInf->nFtnOffset = static_cast< USHORT >(aOffsetFld.GetValue() -1); pInf->aFmt.SetNumberingType(aNumViewBox.GetSelectedNumberingType() ); pInf->SetPrefix(aPrefixED.GetText()); pInf->SetSuffix(aSuffixED.GetText()); |