diff options
Diffstat (limited to 'sw/source/ui/chrdlg/numpara.cxx')
| -rw-r--r-- | sw/source/ui/chrdlg/numpara.cxx | 55 |
1 files changed, 8 insertions, 47 deletions
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 20b99cc492fb..0b3de84f24b9 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,8 +33,6 @@ #undef SW_DLLIMPLEMENTATION #endif - - #include "cmdid.h" #include "swtypes.hxx" #include "hintids.hxx" @@ -41,28 +40,24 @@ #include "helpid.h" #include <sfx2/objsh.hxx> #include <svx/htmlmode.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> #include <fmtline.hxx> #include <numpara.hxx> #include <numpara.hrc> -// --> OD 2008-04-14 #outlinelevel# + #include <app.hrc> -// <-- + // Globals ****************************************************************** -static sal_uInt16 __FAR_DATA aPageRg[] = { +static sal_uInt16 aPageRg[] = { FN_NUMBER_NEWSTART, FN_NUMBER_NEWSTART_AT, 0 }; -/*-----------------31.01.98 08:34------------------- ---------------------------------------------------*/ SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage(pParent, SW_RES(TP_NUMPARA), rAttr), @@ -80,9 +75,7 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent, aRestartParaCountCB ( this, SW_RES( CB_RESTART_PARACOUNT ) ), aRestartFT ( this, SW_RES( FT_RESTART_NO ) ), aRestartNF ( this, SW_RES( NF_RESTART_PARA ) ), - // --> OD 2008-04-14 #outlinelevel# msOutlineNumbering( SW_RES( STR_OUTLINE_NUMBERING ) ), - // <-- bModified(sal_False), bCurNumrule(sal_False) { @@ -114,36 +107,24 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent, aNewStartNF.SetAccessibleName(aNewStartNumberCB.GetText()); aNewStartNF.SetAccessibleRelationLabeledBy(&aNewStartNumberCB); } -/*-----------------31.01.98 08:34------------------- ---------------------------------------------------*/ SwParagraphNumTabPage::~SwParagraphNumTabPage() { } -/*-----------------31.01.98 08:38------------------- - ---------------------------------------------------*/ SfxTabPage* SwParagraphNumTabPage::Create( Window* pParent, const SfxItemSet& rSet ) { return new SwParagraphNumTabPage(pParent, rSet); } -/*-----------------31.01.98 08:38------------------- - ---------------------------------------------------*/ sal_uInt16* SwParagraphNumTabPage::GetRanges() { return aPageRg; } -/*-----------------31.01.98 08:38------------------- - ---------------------------------------------------*/ sal_Bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) { - //<-#outline level, added by zhaojianwei if( aOutlineLvLB.GetSelectEntryPos() != aOutlineLvLB.GetSavedValue()) { sal_uInt16 aOutlineLv = aOutlineLvLB.GetSelectEntryPos(); @@ -154,7 +135,7 @@ sal_Bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) delete pOutlineLv; bModified = sal_True; } - //<-end + if( aNumberStyleLB.GetSelectEntryPos() != aNumberStyleLB.GetSavedValue()) { String aStyle; @@ -193,9 +174,6 @@ sal_Bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) return bModified; } -/*-----------------31.01.98 08:38------------------- - ---------------------------------------------------*/ void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet ) { sal_Bool bHasNumberStyle = sal_False; @@ -223,7 +201,7 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet ) if(!aStyle.Len()) aStyle = aNumberStyleLB.GetEntry(0); - if( aStyle.EqualsAscii("Outline"))// == String::CreateFromAscii("Outline")) //maybe need modify,zhaojianwei + if( aStyle.EqualsAscii("Outline")) { aNumberStyleLB.InsertEntry( msOutlineNumbering ); aNumberStyleLB.SelectEntry( msOutlineNumbering ); @@ -297,23 +275,18 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet ) bModified = sal_False; } -/*-----------------31.01.98 08:38------------------- - ---------------------------------------------------*/ void SwParagraphNumTabPage::DisableOutline() { aOutlineLvFT.Disable(); aOutlineLvLB.Disable(); } + void SwParagraphNumTabPage::DisableNumbering() { aNumberStyleFT.Disable(); aNumberStyleLB.Disable(); } -/*-----------------31.01.98 08:38------------------- - ---------------------------------------------------*/ void SwParagraphNumTabPage::EnableNewStart() { aNewStartCB.Show(); @@ -321,9 +294,6 @@ void SwParagraphNumTabPage::EnableNewStart() aNewStartNF.Show(); } -/*-----------------31.01.98 08:56------------------- - ---------------------------------------------------*/ IMPL_LINK( SwParagraphNumTabPage, NewStartHdl_Impl, CheckBox*, EMPTYARG ) { sal_Bool bEnable = aNewStartCB.IsChecked(); @@ -332,9 +302,6 @@ IMPL_LINK( SwParagraphNumTabPage, NewStartHdl_Impl, CheckBox*, EMPTYARG ) return 0; } -/*-----------------05.02.98 10:01------------------- - ---------------------------------------------------*/ IMPL_LINK( SwParagraphNumTabPage, LineCountHdl_Impl, CheckBox* , EMPTYARG) { aRestartParaCountCB.Enable(aCountParaCB.IsChecked()); @@ -347,15 +314,8 @@ IMPL_LINK( SwParagraphNumTabPage, LineCountHdl_Impl, CheckBox* , EMPTYARG) return 0; } -/*-----------------05.02.98 13:39------------------- - ---------------------------------------------------*/ IMPL_LINK( SwParagraphNumTabPage, StyleHdl_Impl, ListBox*, pBox ) { -// String dd=aNumberStyleLB.GetSavedValue(); -// if( msOutlineNumbering == dd) - { - } sal_Bool bEnable = bCurNumrule || pBox->GetSelectEntryPos() > 0; aNewStartCB.Enable(bEnable); NewStartHdl_Impl(&aNewStartCB); @@ -364,3 +324,4 @@ IMPL_LINK( SwParagraphNumTabPage, StyleHdl_Impl, ListBox*, pBox ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |