[Libreoffice-commits] .: sw/source
David Tardon
dtardon at kemper.freedesktop.org
Sat Nov 27 00:03:03 PST 2010
sw/source/ui/fldui/flddinf.cxx | 6 --
sw/source/ui/fldui/fldedt.cxx | 8 ---
sw/source/ui/fldui/fldfunc.cxx | 2
sw/source/ui/fldui/fldmgr.cxx | 5 --
sw/source/ui/fldui/fldpage.cxx | 2
sw/source/ui/fldui/fldref.cxx | 7 ---
sw/source/ui/fldui/fldvar.cxx | 10 ----
sw/source/ui/fldui/inpdlg.cxx | 2
sw/source/ui/fmtui/tmpdlg.cxx | 17 --------
sw/source/ui/frmdlg/column.cxx | 2
sw/source/ui/frmdlg/cption.cxx | 1
sw/source/ui/index/cnttab.cxx | 79 --------------------------------------
sw/source/ui/index/swuiidxmrk.cxx | 2
sw/source/ui/index/toxmgr.cxx | 1
sw/source/ui/lingu/hhcwrp.cxx | 37 -----------------
sw/source/ui/lingu/olmenu.cxx | 21 +---------
sw/source/ui/lingu/sdrhhcwrap.cxx | 3 -
sw/source/ui/misc/bookmark.cxx | 1
sw/source/ui/misc/docfnote.cxx | 2
sw/source/ui/misc/glosbib.cxx | 10 ----
sw/source/ui/misc/glosdoc.cxx | 1
sw/source/ui/misc/insfnote.cxx | 20 ---------
sw/source/ui/misc/linenum.cxx | 15 -------
sw/source/ui/misc/num.cxx | 1
sw/source/ui/misc/outline.cxx | 44 ---------------------
sw/source/ui/misc/redlndlg.cxx | 15 -------
26 files changed, 11 insertions(+), 303 deletions(-)
New commits:
commit 27e79795f265dc243ffd49a17a8bf4d1dd9d7a1d
Author: Kayo Hamid <revol.code at yahoo.com>
Date: Sat Nov 27 09:02:53 2010 +0100
Clean code at writer
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index ec80dc0..78aed59 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -153,11 +153,7 @@ void __EXPORT SwFldDokInfPage::Reset(const SfxItemSet& )
{
uno::Reference< beans::XPropertySetInfo > xSetInfo = xCustomPropertySet->getPropertySetInfo();
const uno::Sequence< beans::Property > rProperties = xSetInfo->getProperties();
-// uno::Sequence< ::rtl::OUString > aPropertyNames(rProperties.getLength());
-// for (sal_Int32 i = 0; i < rProperties.getLength(); ++i) {
-// aPropertyNames[i] = rProperties[i].Name;
-// }
- //if ( !IsFldEdit() )
+
if( rProperties.getLength() )
{
pInfo = aTypeTLB.InsertEntry( String(SW_RES( STR_CUSTOM )) );
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 5e697ec..2b96b72 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -192,14 +192,6 @@ SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup)
uno::Reference< beans::XPropertySet > xUDProps(
xDocProps->getUserDefinedProperties(),
uno::UNO_QUERY_THROW);
-// uno::Reference< beans::XPropertySetInfo > xSetInfo
-// = xUDProps->getPropertySetInfo();
-// const uno::Sequence< beans::Property > props
-// = xSetInfo->getProperties();
-// uno::Sequence< ::rtl::OUString > names(props.getLength());
-// for (sal_Int32 i = 0; i < props.getLength(); ++i) {
-// names[i] = props[i].Name;
-// }
pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) );
pTabPage = SwFldDokInfPage::Create(this, *pSet);
nHelpId = HID_EDIT_FLD_DOKINF;
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index f88727c..1eef3d0 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -98,7 +98,6 @@ SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) :
aCond1ED.ShowBrackets(FALSE);
aCond2ED.ShowBrackets(FALSE);
-// SwWrtShell* pSh = (SwWrtShell*)ViewShell::GetCurrShell();
}
SwFldFuncPage::~SwFldFuncPage()
@@ -351,7 +350,6 @@ IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG )
case TYP_INPUTFLD:
aValueFT.SetText(SW_RESSTR(STR_PROMPT));
bValue = TRUE;
- // bShowSelection = TRUE;
break;
case TYP_COMBINED_CHARS:
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index a9451a7..94d2192 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -1336,11 +1336,6 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
pCurShell->EndAllAction();
return TRUE;
-/* // In der Tabelle Tabellenformeln einfuegen
- SwTblFieldType* pTyp = (SwTblFieldType*)pCurShell->GetFldType(
- 0, RES_TABLEFLD);
- pFld = new SwTblField(pTyp, rData.sPar2, nsSwGetSetExpType::GSE_EXPR, nFormatId);
- bTbl = TRUE;*/
}
else
{
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index e65e388..666a18c 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -71,7 +71,7 @@ SwFldPage::SwFldPage( Window *pParent, const ResId &rId,
m_bRefresh (FALSE),
m_bFirstHTMLInit (TRUE)
{
-// FreeResource();
+
}
SwFldPage::~SwFldPage()
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 1ac09ba..125081e 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -308,8 +308,6 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG )
case REF_BOOKMARK:
{
// --> OD 2007-11-14 #i83479#
-// sName = sBookmarkTxt;
-// nFlag = REFFLDFLAG_BOOKMARK;
SwGetRefField* pRefFld = dynamic_cast<SwGetRefField*>(GetCurField());
if ( pRefFld &&
pRefFld->IsRefToHeadingCrossRefBookmark() )
@@ -730,9 +728,7 @@ USHORT SwFldRefPage::FillFormatLB(USHORT nTypeId)
default:
// --> OD 2007-11-16 #i83479#
-// nSize = GetFldMgr().GetFormatCount( (REFFLDFLAG & nTypeId)
-// ? (USHORT)TYP_GETREFFLD : nTypeId,
-// FALSE, IsFldDlgHtmlMode() );
+
if ( REFFLDFLAG & nTypeId )
{
nSize = FMT_REF_ONLYSEQNO - FMT_REF_BEGIN + 1;
@@ -832,7 +828,6 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& )
switch(nTypeId)
{
case TYP_GETREFFLD:
- // aName = aSelectionLB.GetSelectEntry();
nSubType = REF_SETREFATTR;
break;
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 5d5f09d..f685f0f 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -280,7 +280,6 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
}
else
aValueED.SetText(pType->GetContent());
-// aValueED.SetText(pType->GetContent(aNumFormatLB.GetFormat()));
}
}
else
@@ -469,7 +468,6 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
case TYP_SEQFLD:
{
- // aNumRB.Check(TRUE);
bName = bValue = bSeparator = bChapterLevel = TRUE;
SwFieldType* pFldTyp;
@@ -1215,7 +1213,6 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& )
}
case TYP_SEQFLD:
{
- // nSubType = nsSwGetSetExpType::GSE_SEQ; // nsSwGetSetExpType::GSE_SEQ wird im Fldmgr fest gesetzt, kann also entfallen
nSubType = aChapterLevelLB.GetSelectEntryPos();
if (nSubType == 0)
nSubType = 0x7f;
@@ -1224,7 +1221,6 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& )
nSubType--;
String sSeparator(aSeparatorED.GetText().GetChar(0));
cSeparator = sSeparator.Len() ? sSeparator.GetChar(0) : ' ';
- //nSubType |= (USHORT)(((BYTE)) << 8);
}
break;
}
@@ -1274,14 +1270,12 @@ SelectionListBox::SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId )
long SelectionListBox::PreNotify( NotifyEvent& rNEvt )
{
long nHandled = ListBox::PreNotify( rNEvt );
- //BOOL bAddSel = FALSE;
if ( rNEvt.GetType() == EVENT_KEYUP )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
const KeyCode aKeyCode = pKEvt->GetKeyCode();
const USHORT nModifier = aKeyCode.GetModifier();
if( aKeyCode.GetCode() == KEY_SPACE && !nModifier)
-// bAddSel = TRUE;
bCallAddSelection = TRUE;
}
if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN )
@@ -1289,13 +1283,9 @@ long SelectionListBox::PreNotify( NotifyEvent& rNEvt )
const MouseEvent* pMEvt = rNEvt.GetMouseEvent();
if (pMEvt && (pMEvt->IsMod1() || pMEvt->IsMod2())) // Alt oder Ctrl
- //bAddSel = TRUE;
bCallAddSelection = TRUE;
}
-// if (bAddSel)
-// pDlg->AddSelection(this);
-
return nHandled;
}
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index ed62263..d6fecac 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -132,7 +132,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
// JP 31.3.00: Inputfields in readonly regions must be allowed to
// input any content. - 74639
BOOL bEnable = !rSh.IsCrsrReadonly();
- /*!rSh.IsReadOnlyAvailable() || !rSh.HasReadonlySel()*/;
+
aOKBT.Enable( bEnable );
aEditED.SetReadOnly( !bEnable );
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 12129d9..3deeda0 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -251,15 +251,6 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
AddTabPage( TP_MACRO_ASSIGN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), 0);
- // Auskommentiert wegen Bug #45776 (per default keine Breite&Groesse in Rahmenvorlagen)
-/* SwFmtFrmSize aSize( (const SwFmtFrmSize&)rBase.
- GetItemSet().Get(RES_FRM_SIZE));
- if( !aSize.GetWidth() )
- {
- aSize.SetWidth( DFLT_WIDTH );
- aSize.SetHeight( DFLT_HEIGHT );
- rBase.GetItemSet().Put( aSize );
- }*/
break;
}
// Seitenvorlagen
@@ -317,14 +308,6 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent,
AddTabPage( RID_SVXPAGE_NUM_OPTIONS );
AddTabPage( RID_SVXPAGE_NUM_POSITION );
-
-/* const SfxPoolItem* pItem;
- if(SFX_ITEM_SET == rBase.GetItemSet().GetItemState(
- FN_PARAM_ACT_NUMBER, FALSE, &pItem ))
- {
-// pActNum = (ActNumberFormat*)((const SwPtrItem*)pItem)->GetValue();
- }
-*/
}
break;
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 87069fc..a788db7 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -1054,8 +1054,6 @@ IMPL_LINK( SwColumnPage, Timeout, Timer *, EMPTYARG )
++nChanged;
else if(pModifiedField == &aEd3)
nChanged += 2;
- /*else if(pModifiedField == &aEd4)
- nChanged += 3;*/
long nNewWidth = (USHORT)
pModifiedField->DenormalizePercent(pModifiedField->GetValue(FUNIT_TWIP));
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index c15fe95..29d7239 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -419,7 +419,6 @@ void SwCaptionDialog::DrawSample()
case SVX_NUM_CHARS_LOWER_LETTER_N: aStr += 'a'; break;
case SVX_NUM_ROMAN_UPPER: aStr += 'I'; break;
case SVX_NUM_ROMAN_LOWER: aStr += 'i'; break;
- //case ARABIC:
default: aStr += '1'; break;
}
//#i61007# order of captions
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 71cea51..24bd655 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -191,8 +191,6 @@ class SwEntryBrowseBox : public SwEntryBrowseBox_Base
protected:
virtual sal_Bool SeekRow( long nRow );
-// virtual void PaintField( OutputDevice& rDev, const awt::Rectangle& rRect,
-// sal_uInt16 nColumnId ) const;
virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const;
virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol);
virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol);
@@ -586,13 +584,11 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox )
sal_Bool SwMultiTOXTabDialog::IsNoNum(SwWrtShell& rSh, const String& rName)
{
SwTxtFmtColl* pColl = rSh.GetParaStyle(rName);
- //if(pColl && pColl->GetOutlineLevel() == NO_NUMBERING) //#outline level,zhaojianwei
if(pColl && ! pColl->IsAssignedToListLevelOfOutlineStyle()) //<-end,zhaojianwei
return sal_True;
sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName(rName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL);
if(nId != USHRT_MAX &&
- //rSh.GetTxtCollFromPool(nId)->GetOutlineLevel() == NO_NUMBERING) //#outline level,zhaojianwei
! rSh.GetTxtCollFromPool(nId)->IsAssignedToListLevelOfOutlineStyle()) //<-end,zhaojianwei
return sal_True;
@@ -1368,7 +1364,6 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
aAreaFL.Show( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_INDEX|TO_TABLE|TO_OBJECT)) );
aFromHeadingsCB.Show( 0 != (nType & (TO_CONTENT)) );
- // aChapterDlgPB.Show( 0 != (nType & (TO_CONTENT)) );//#outline level,removed by zhaojianwei
aAddStylesCB.Show( 0 != (nType & (TO_CONTENT|TO_USER)) );
aAddStylesPB.Show( 0 != (nType & (TO_CONTENT|TO_USER)) );
@@ -1400,13 +1395,6 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
aSortAlgorithmFT.Show(bEnableSortLanguage);
aSortAlgorithmLB.Show(bEnableSortLanguage);
- //if(nType & TO_CONTENT) //#outline level,removed by zhaojianwei
- //{
- //Point aPos(aAddStylesPB.GetPosPixel());
- //aPos.X() = aChapterDlgPB.GetPosPixel().X();
- //aAddStylesPB.SetPosPixel(aPos);
- //}
- //else if( nType & TO_ILLUSTRATION )//<-removed end.
if( nType & TO_ILLUSTRATION ) //add by zhaojianwei
aCaptionSequenceLB.SelectEntry( SwStyleNameMapper::GetUIName(
RES_POOLCOLL_LABEL_ABB, aEmptyStr ));
@@ -1418,7 +1406,6 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
aAddStylesCB.SetText(sAddStyleUser);
// move left!
Point aPos(aAddStylesPB.GetPosPixel());
- // aPos.X() = aChapterDlgPB.GetPosPixel().X();
aPos.X() -= 2 * aAddStylesPB.GetSizePixel().Width();
aAddStylesPB.SetPosPixel(aPos);
}
@@ -1431,8 +1418,6 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
aKeyAsEntryCB.Show( 0 != (nType & TO_INDEX) );
aFromFileCB.Show( 0 != (nType & TO_INDEX) );
aAutoMarkPB.Show( 0 != (nType & TO_INDEX) );
-// aCreateAutoMarkPB.Show(nType &TO_INDEX);
-// aEditAutoMarkPB.Show(nType & TO_INDEX);
aIdxOptionsFL.Show( 0 != (nType & TO_INDEX) );
@@ -1478,7 +1463,6 @@ IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox )
pBox->Check(sal_True);
}
aAddStylesPB.Enable(aAddStylesCB.IsChecked());
- //aChapterDlgPB.Enable(aFromHeadingsCB.IsChecked());//#outline level,removed by zhaojianwei
}
if(TOX_USER == aCurType.eType)
{
@@ -1556,42 +1540,6 @@ IMPL_LINK(SwTOXSelectTabPage, TOXAreaHdl, ListBox*, pBox)
return 0;
}
-//#outline level, removed by zhaojianwei
-//It is no longer used!
-//IMPL_LINK(SwTOXSelectTabPage, ChapterHdl, PushButton*, pButton)
-//{
-// SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
-// SwWrtShell& rSh = pTOXDlg->GetWrtShell();
-//
-// SfxItemSet aTmp(rSh.GetView().GetPool(), FN_PARAM_1, FN_PARAM_1);
-// SwOutlineTabDialog* pDlg = new SwOutlineTabDialog(pButton, &aTmp, rSh);
-//
-// if(RET_OK == pDlg->Execute())
-// {
-// CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
-// SwForm* pForm = ((SwMultiTOXTabDialog*)GetTabDialog())->GetForm(aCurType);
-// // jetzt muss ueberprueft werden, ob dem sdbcx::Index Ueberschriftenvorlagen
-// // zugewiesen wurden
-// String sStr;
-// for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
-// {
-// sal_Bool bNum = !SwMultiTOXTabDialog::IsNoNum(rSh, pForm->GetTemplate( i + 1 ));
-// if(bNum)
-// {
-// //es gibt getrennte Resourcebereiche fuer die Inhaltsverzeichnisse
-// if(i < 5)
-// SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(RES_POOLCOLL_TOX_CNTNT1 + i), sStr );
-// else
-// SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(RES_POOLCOLL_TOX_CNTNT6 + i - 5), sStr );
-// pForm->SetTemplate( i + 1, sStr );
-// }
-// }
-//
-// }
-// delete pDlg;
-// return 0;
-//}
-
IMPL_LINK(SwTOXSelectTabPage, AddStylesHdl, PushButton*, pButton)
{
SwAddStylesDlg_Impl* pDlg = new SwAddStylesDlg_Impl(pButton,
@@ -1977,7 +1925,6 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
aLastTOXType.eType = (TOXTypes)USHRT_MAX;
aLastTOXType.nIndex = 0;
- //aLevelGBSize = aLevelGB.GetSizePixel();
aLevelFLSize = aLevelFT.GetSizePixel();
SetExchangeSupport();
@@ -2222,13 +2169,11 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
if(nDiff)
{
-// lcl_ChgWidth(aLevelFL, nDiff);
lcl_ChgWidth(aLevelFT, nDiff);
lcl_ChgWidth(aLevelLB, nDiff);
lcl_ChgXPos(aCharStyleFT, nDiff);
lcl_ChgXPos(aCharStyleLB, nDiff);
lcl_ChgWidth(aCharStyleLB, -nDiff);
- // lcl_ChgXPos(aEditStylePB, -nDiff);
lcl_ChgXPos(aFillCharFT, nDiff);
lcl_ChgXPos(aFillCharCB, nDiff);
lcl_ChgXPos(aTabPosFT, nDiff);
@@ -2311,8 +2256,6 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
aRelToStyleCB.SetPosPixel( bToxIsIndex ? aRelToStyleIdxPos
: aRelToStylePos );
-// aRecalcTabCB.Show( aCurType.eType == TOX_CONTENT);
-
aMainEntryStyleFT.Show( bToxIsIndex );
aMainEntryStyleLB.Show( bToxIsIndex );
aAlphaDelimCB.Show( bToxIsIndex );
@@ -2588,7 +2531,6 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken)
aCharStyleLB.SelectEntry(pToken->sCharStyleName);
else
aCharStyleLB.SelectEntry(sNoCharStyle);
- //StyleSelectHdl(&aCharStyleLB);
String sEntry = aCharStyleLB.GetSelectEntry();
aEditStylePB.Enable(sEntry != sNoCharStyle);
@@ -2613,13 +2555,6 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken)
}
//<---
//i53420
-//move into position the fixed text
-// aEntryOutlineLevelFT.SetPosPixel( aEntryOutlineLevelFTPosition );
-// // then the entry
-// Point aPoint;
-// aPoint.Y() = aEntryOutlineLevelFTPosition.Y();
-// aPoint.X() = aEntryOutlineLevelFTPosition.X() + nBiasToEntryPoint;
-// aEntryOutlineLevelNF.SetPosPixel( aPoint );
aEntryOutlineLevelNF.SetValue(pToken->nOutlineLevel);
}
@@ -2627,14 +2562,6 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken)
//i53420
if(pToken->eTokenType == TOKEN_ENTRY_NO)
{
-//move into position the fixed text
-// aEntryOutlineLevelFT.SetPosPixel( aChapterEntryFTPosition );
-// // then the entry
-// Point aPoint;
-// aPoint.Y() = aChapterEntryFTPosition.Y();
-// aPoint.X() = aChapterEntryFTPosition.X() + nBiasToEntryPoint;
-// aEntryOutlineLevelNF.SetPosPixel( aPoint );
-
aEntryOutlineLevelNF.SetValue(pToken->nOutlineLevel);
sal_uInt16 nFormat = 0;
if( pToken->nChapterFormat == CF_NUM_NOPREPST_TITLE )
@@ -2906,8 +2833,6 @@ SwTokenWindow::SwTokenWindow(SwTOXEntryTabPage* pParent, const ResId& rResId) :
SwTokenWindow::~SwTokenWindow()
{
-// for(sal_uInt16 i = GetItemCount(); i ; i--)
-// RemoveItem(i - 1);
for( sal_uInt32 n = 0; n < aControlList.Count(); ++n )
{
@@ -3061,8 +2986,6 @@ Control* SwTokenWindow::InsertItem(const String& rText, const SwFormToken& rToke
aControlList.Insert(pButton, aControlList.Count());
Size aEditSize(aControlSize);
aEditSize.Width() = pButton->GetTextWidth(rText) + 5;
-// pButton->SetControlBackground(aCtrlColor);
-// pButton->SetControlForeground(aTextColor);
pButton->SetSizePixel(aEditSize);
pButton->SetPrevNextLink(LINK(this, SwTokenWindow, NextItemBtnHdl));
pButton->SetGetFocusHdl(LINK(this, SwTokenWindow, TbxFocusBtnHdl));
@@ -3506,8 +3429,6 @@ BOOL SwTokenWindow::CreateQuickHelp(Control* pCtrl,
Rectangle aItemRect( aPos, pCtrl->GetSizePixel() );
if(rToken.eTokenType == TOKEN_TAB_STOP )
{
-// sEntry += '\n';
-// sEntry += rToken.nTabStopPosition;
}
else
{
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index c5406ec..1d6f694 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -198,7 +198,6 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent,
aPrevSameBT.SetClickHdl(LINK(this,SwIndexMarkDlg, PrevSameHdl));
aNextBT.SetClickHdl(LINK(this,SwIndexMarkDlg, NextHdl));
aNextSameBT.SetClickHdl(LINK(this,SwIndexMarkDlg, NextSameHdl));
- //aTypeDCB.SetModifyHdl(LINK(this,SwIndexMarkDlg, ModifyHdl));
aTypeDCB.SetSelectHdl(LINK(this,SwIndexMarkDlg, ModifyHdl));
aKeyDCB.SetModifyHdl(LINK(this,SwIndexMarkDlg, KeyDCBModifyHdl));
aKey2DCB.SetModifyHdl(LINK(this,SwIndexMarkDlg, KeyDCBModifyHdl));
@@ -1710,7 +1709,6 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent,
long nHeightDiff = - aFLSz.Height();
aFLSz.Height() = aTL1.Y();
nHeightDiff += aFLSz.Height();
-// aEntriesFL.SetSizePixel(aFLSz);
Size aDlgSize(GetSizePixel());
aDlgSize.Height() += nHeightDiff;
SetSizePixel(aDlgSize);
diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx
index 4d45c19..251b4f1 100644
--- a/sw/source/ui/index/toxmgr.cxx
+++ b/sw/source/ui/index/toxmgr.cxx
@@ -400,7 +400,6 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
pSh->DelRight();
pNewTOX = (SwTOXBase*)pCurTOX;
}
-// pTOX->SetOptions(rDesc.GetIndexOptions());
pNewTOX->SetFromObjectNames(rDesc.IsCreateFromObjectNames());
pNewTOX->SetOLEOptions(rDesc.GetOLEOptions());
}
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 775651c..47634d2 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -189,11 +189,6 @@ SwHHCWrapper::~SwHHCWrapper()
}
}
-
-/*
- if( bInfoBox )
- InfoBox(&pView->GetEditWin(), String(SW_RES(STR_SPELL_OK)) ).Execute();
-*/
}
@@ -502,9 +497,7 @@ void SwHHCWrapper::ReplaceUnit(
pRuby->SetPosition( bRubyBelow );
pRuby->SetAdjustment( RubyAdjust_CENTER );
- //!! the following seem not to be needed
- //pRuby->SetCharFmtName( const String& rNm );
- //pRuby->SetCharFmtId( USHORT nNew );
+
#ifdef DEBUG
SwPaM *pPaM = rWrtShell.GetCrsr();
(void)pPaM;
@@ -543,8 +536,6 @@ void SwHHCWrapper::ReplaceUnit(
SfxItemSet aSet( rWrtShell.GetAttrPool(), aRanges );
if (pNewUnitLanguage)
{
- //OSL_ENSURE(!IsSimilarChinese( *pNewUnitLanguage, nOldLang ),
- // "similar language should not be changed!");
aSet.Put( SvxLanguageItem( *pNewUnitLanguage, RES_CHRATR_CJK_LANGUAGE ) );
}
@@ -695,7 +686,6 @@ sal_Bool SwHHCWrapper::ConvNext_impl( )
return sal_False;
}
- //ResMgr* pMgr = DIALOG_MGR();
sal_Bool bGoOn = sal_False;
if ( bIsOtherCntnt )
@@ -717,29 +707,9 @@ sal_Bool SwHHCWrapper::ConvNext_impl( )
}
else
{
- // Ein BODY_Bereich erledigt, Frage nach dem anderen BODY_Bereich
-/*
- //pWin->LeaveWait();
-
- sal_uInt16 nResId = RID_SVXQB_CONTINUE;
- QueryBox aBox( pWin, ResId( nResId, pMgr ) );
- if ( aBox.Execute() != RET_YES )
- {
- // Verzicht auf den anderen Bereich, ggf. Frage nach Sonderbereich
- //pWin->EnterWait();
- bStartDone = bEndDone = sal_True;
- return SpellNext();
- }
- else
- {
-*/
bStartChk = !bStartDone;
ConvStart_impl( pConvArgs, bStartChk ? SVX_SPELL_BODY_START : SVX_SPELL_BODY_END );
bGoOn = sal_True;
-/*
- }
- pWin->EnterWait();
-*/
}
return bGoOn;
}
@@ -749,8 +719,6 @@ sal_Bool SwHHCWrapper::FindConvText_impl()
{
//! modified version of SvxSpellWrapper::FindSpellError
- //ShowLanguageErrors();
-
sal_Bool bFound = sal_False;
pWin->EnterWait();
@@ -790,20 +758,17 @@ void SwHHCWrapper::ConvStart_impl( SwConversionArgs /* [out] */ *pConversionArgs
void SwHHCWrapper::ConvEnd_impl( SwConversionArgs *pConversionArgs )
{
pView->SpellEnd( pConversionArgs );
- //ShowLanguageErrors();
}
sal_Bool SwHHCWrapper::ConvContinue_impl( SwConversionArgs *pConversionArgs )
{
sal_Bool bProgress = !bIsDrawObj && !bIsSelection;
-// bLastRet = aConvText.getLength() == 0;
pConversionArgs->aConvText = OUString();
pConversionArgs->nConvTextLang = LANGUAGE_NONE;
uno::Any aRet = bProgress ?
pView->GetWrtShell().SpellContinue( &nPageCount, &nPageStart, pConversionArgs ) :
pView->GetWrtShell().SpellContinue( &nPageCount, NULL, pConversionArgs );
- //aRet >>= aConvText;
return pConversionArgs->aConvText.getLength() != 0;
}
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 72f6e91..816e003 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -334,9 +334,8 @@ static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl )
Image aRes;
OUString aTmp;
osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp );
-// ::rtl::OString aPath = OString( aTmp.getStr(), aTmp.getLength(), osl_getThreadTextEncoding() );
#if defined(WNT)
-// aTmp = lcl_Win_GetShortPathName( aTmp );
+
#endif
Graphic aGraphic;
const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) );
@@ -400,7 +399,6 @@ SwSpellPopup::SwSpellPopup(
{
OSL_ENSURE(xSpellAlt.is(), "no spelling alternatives available");
-// CreateAutoMnemonics();
SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
nCheckedLanguage = LANGUAGE_NONE;
@@ -474,7 +472,6 @@ SwSpellPopup::SwSpellPopup(
}
pMenu = GetPopupMenu(MN_ADD_TO_DIC);
-// pMenu->CreateAutoMnemonics();
pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS); //! necessary to retrieve the correct dictionary name in 'Execute' below
bEnable = FALSE; // enable MN_ADD_TO_DIC?
uno::Reference< linguistic2::XDictionaryList > xDicList( SvxGetDictionaryList() );
@@ -562,11 +559,7 @@ SwSpellPopup::SwSpellPopup(
pMenu = GetPopupMenu(MN_SET_LANGUAGE_PARAGRAPH);
fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_PARAGRAPH_START, aSeq, pWrtSh, aLangTable_Paragraph );
EnableItem( MN_SET_LANGUAGE_PARAGRAPH, true );
-/*
- pMenu = GetPopupMenu(MN_SET_LANGUAGE_ALL_TEXT);
- fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_ALL_TEXT_START, aSeq, pWrtSh, aLangTable_Document );
- EnableItem( MN_SET_LANGUAGE_ALL_TEXT, true );
-*/
+
uno::Reference< frame::XFrame > xFrame = pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface();
Image rImg = ::GetImage( xFrame,
OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SpellingAndGrammarDialog")), sal_False );
@@ -601,7 +594,6 @@ aInfo16( SW_RES(IMG_INFO_16) )
InsertItem( MN_SHORT_COMMENT, aMessageText, MIB_NOSELECT, nPos++ );
SetItemImage( MN_SHORT_COMMENT, aInfo16 );
-// CreateAutoMnemonics();
SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
InsertSeparator( nPos++ );
@@ -645,7 +637,6 @@ aInfo16( SW_RES(IMG_INFO_16) )
nGuessLangPara = LANGUAGE_NONE;
if (xLG.is())
{
-// nGuessLangWord = lcl_CheckLanguage( xSpellAlt->getWord(), ::GetSpellChecker(), xLG, sal_False );
nGuessLangPara = lcl_CheckLanguage( rParaText, ::GetSpellChecker(), xLG, sal_True );
}
if (nGuessLangWord != LANGUAGE_NONE || nGuessLangPara != LANGUAGE_NONE)
@@ -694,11 +685,7 @@ aInfo16( SW_RES(IMG_INFO_16) )
pMenu = GetPopupMenu(MN_SET_LANGUAGE_PARAGRAPH);
fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_PARAGRAPH_START, aSeq, pWrtSh, aLangTable_Paragraph );
EnableItem( MN_SET_LANGUAGE_PARAGRAPH, true );
-/*
- pMenu = GetPopupMenu(MN_SET_LANGUAGE_ALL_TEXT);
- fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_ALL_TEXT_START, aSeq, pWrtSh, aLangTable_Document );
- EnableItem( MN_SET_LANGUAGE_ALL_TEXT, true );
-*/
+
uno::Reference< frame::XFrame > xFrame = pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface();
Image rImg = ::GetImage( xFrame,
OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SpellingAndGrammarDialog")), sal_False );
@@ -714,7 +701,6 @@ aInfo16( SW_RES(IMG_INFO_16) )
---------------------------------------------------------------------------*/
sal_uInt16 SwSpellPopup::Execute( const Rectangle& rWordPos, Window* pWin )
{
-// SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
sal_uInt16 nRet = PopupMenu::Execute(pWin, pWin->LogicToPixel(rWordPos));
Execute( nRet );
return nRet;
@@ -820,7 +806,6 @@ void SwSpellPopup::Execute( USHORT nId )
else if (MN_DICTIONARIES_START <= nId && nId <= MN_DICTIONARIES_END)
{
OUString aWord( xSpellAlt->getWord() );
-// OSL_ENSURE( nDicIdx < aDics.getLength(), "dictionary index out of range" );
PopupMenu *pMenu = GetPopupMenu(MN_ADD_TO_DIC);
String aDicName ( pMenu->GetItemText(nId) );
diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx
index 95d8863..2061982 100644
--- a/sw/source/ui/lingu/sdrhhcwrap.cxx
+++ b/sw/source/ui/lingu/sdrhhcwrap.cxx
@@ -110,9 +110,6 @@ SdrHHCWrapper::~SdrHHCWrapper()
pSdrView->SdrEndTextEdit( sal_True );
SetUpdateMode(sal_False);
pOutlView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) );
-// SetPaperSize( Size(1, 1) );
-// SetText(NULL);
-// pTextObj = NULL;
}
RemoveView( pOutlView );
delete pOutlView;
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index e865a41..2851f67 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -96,7 +96,6 @@ IMPL_LINK( SwInsertBookmarkDlg, DeleteHdl, Button *, EMPTYARG )
aBookmarkBox.SetText(aEmptyStr);
aDeleteBtn.Enable(FALSE); // keine weiteren Eintraege vorhanden
- // aBookmarkBox.SetText(aEmptyStr);
aOkBtn.Enable(); // Im OK Handler wird geloescht
return 0;
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 6daad2e..e7f566e 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -189,7 +189,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
aPageTemplLbl.Enable(FALSE);
aPageTemplBox.Enable(FALSE);
}
- else // if ( rInf.ePos == FTNPOS_CHAPTER )
+ else
{
aPosChapterBox.Check();
aNumCountBox.RemoveEntry(aNumPage);
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 7498785..1782286 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -134,7 +134,6 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
pData->sGroupName = sGroup;
pData->sGroupTitle = sTitle;
String sTemp(sTitle);
- //sGroup.GetToken(0, GLOS_DELIM)
sTemp += '\t';
pData->sPath = aPathLB.GetEntry((USHORT)sGroup.GetToken(1, GLOS_DELIM).ToInt32());
sTemp += pData->sPath;
@@ -265,7 +264,6 @@ IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG )
IMPL_LINK( SwGlossaryGroupDlg, NewHdl, Button*, EMPTYARG )
{
String sGroup(aNameED.GetText());
-// sGroup.ToLower();
sGroup += GLOS_DELIM;
sGroup += String::CreateFromInt32(aPathLB.GetSelectEntryPos());
OSL_ENSURE(!pGlosHdl->FindGroupName(sGroup), "group already available!");
@@ -273,7 +271,6 @@ IMPL_LINK( SwGlossaryGroupDlg, NewHdl, Button*, EMPTYARG )
pInsertedArr = new SvStrings;
pInsertedArr->Insert(new String(sGroup), pInsertedArr->Count());
String sTemp(aNameED.GetText());
-// sTemp.ToLower();
sTemp += '\t';
sTemp += aPathLB.GetSelectEntry();
SvLBoxEntry* pEntry = aGroupTLB.InsertEntry(sTemp);
@@ -399,7 +396,6 @@ IMPL_LINK( SwGlossaryGroupDlg, RenameHdl, Button *, EMPTYARG )
delete (GlosBibUserData*)pEntry->GetUserData();
aGroupTLB.GetModel()->Remove(pEntry);
String sTemp(aNameED.GetText());
-// sTemp.ToLower();
sTemp += '\t';
sTemp += aPathLB.GetSelectEntry();
pEntry = aGroupTLB.InsertEntry(sTemp);
@@ -417,7 +413,6 @@ IMPL_LINK( SwGlossaryGroupDlg, RenameHdl, Button *, EMPTYARG )
IMPL_LINK( SwGlossaryGroupDlg, ModifyHdl, Edit*, EMPTYARG )
{
String sEntry(aNameED.GetText());
-// sEntry.ToLower();
BOOL bEnableNew = TRUE;
BOOL bEnableDel = FALSE;
ULONG nCaseReadonly =
@@ -462,11 +457,6 @@ IMPL_LINK( SwGlossaryGroupDlg, ModifyHdl, Edit*, EMPTYARG )
{
GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData();
bEnableDel = IsDeleteAllowed(pUserData->sGroupName);
-
-// String sGroup = aGroupTLB.GetEntryText(pEntry, 0);
-// sGroup += GLOS_DELIM;
-// sGroup += String::CreateFromInt32(aPathLB.GetEntryPos(aGroupTLB.GetEntryText(pEntry, 1)));
-// bEnableDel = IsDeleteAllowed(sGroup);
}
aDelPB.Enable(bEnableDel);
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index 48263ca..53f2e19 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -262,7 +262,6 @@ sal_Bool SwGlossaries::RenameGroupDoc(
String sNewFilePath(*(*m_pPathArr)[nNewPath]);
String sNewFileName = lcl_CheckFileName(
sNewFilePath, rNewGroup.GetToken(0, GLOS_DELIM));
- //String aTmp( rNewGroup.GetToken(0, GLOS_DELIM));
const sal_uInt16 nFileNameLen = sNewFileName.Len();
sNewFileName += SwGlossaries::GetExtension();
String sTempNewFilePath(sNewFilePath);
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 4d870cd..5a5338b 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -93,27 +93,7 @@ void __EXPORT SwInsFootNoteDlg::Apply()
}
else
{
-/*
- rSh.StartUndo( UNDO_UI_INSERT_FOOTNOTE );
- rSh.InsertFootnote( aStr, aEndNoteBtn.IsChecked(), !bExtCharAvailable );
- if ( bExtCharAvailable )
- {
- rSh.Left( CRSR_SKIP_CHARS, TRUE, 1, FALSE );
- SfxItemSet aSet( rSh.GetAttrPool(), RES_CHRATR_FONT, RES_CHRATR_FONT );
- rSh.GetAttr( aSet );
- SvxFontItem &rFont = (SvxFontItem &) aSet.Get( RES_CHRATR_FONT );
- SvxFontItem aFont( rFont.GetFamily(), aFontName,
- rFont.GetStyleName(), rFont.GetPitch(),
- eCharSet );
- aSet.Put( aFont );
- rSh.SetAttr( aSet, SETATTR_DONTEXPAND );
- // zur Bearbeitung des Fussnotentextes
- rSh.ResetSelect(0, FALSE);
- rSh.GotoFtnTxt();
- }
- rSh.EndUndo( UNDO_UI_INSERT_FOOTNOTE );
-*/
}
bFootnote = aFtnBtn.IsChecked();
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 26188ed..fb70a2f 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -145,22 +145,9 @@ void __EXPORT SwLineNumberingPage::Reset( const SfxItemSet& )
}
// Format
-// SwFldMgr aMgr( pSh );
USHORT nSelFmt = rInf.GetNumType().GetNumberingType();
-// USHORT nCnt = aMgr.GetFormatCount( TYP_SEQFLD, FALSE );
-
-// for( USHORT i = 0; i < nCnt; i++)
-// {
-// aFormatLB.InsertEntry(aMgr.GetFormatStr( TYP_SEQFLD, i));
-// USHORT nFmtId = aMgr.GetFormatId( TYP_SEQFLD, i );
-// aFormatLB.SetEntryData( i, (void*)nFmtId );
-// if( nFmtId == nSelFmt )
-// aFormatLB.SelectEntryPos( i );
-// }
- aFormatLB.SelectNumberingType(nSelFmt);
-// if ( !aFormatLB.GetSelectEntryCount() )
-// aFormatLB.SelectEntryPos(aFormatLB.GetEntryCount() - 1);
+ aFormatLB.SelectNumberingType(nSelFmt);
// Position
aPosLB.SelectEntryPos((USHORT)rInf.GetPos());
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index f93b95b..ded9fbf 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -1079,7 +1079,6 @@ void SwSvxNumBulletTabDialog::PageCreated(USHORT nPageId, SfxTabPage& rPage)
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< USHORT >(eMetric)) );
rPage.PageCreated(aSet);
-// ((SvxNumPositionTabPage&)rPage).SetWrtShell(&rWrtSh);
}
break;
}
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index ed6ad49..bd9f5cb 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -222,8 +222,6 @@ SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent,
SwTxtFmtColl &rTxtColl = rWrtSh.GetTxtFmtColl(i);
if(!rTxtColl.IsDefault())
{
- //BYTE nOutLevel = rTxtColl.GetOutlineLevel(); //<-#outline level, removed out by zhaojianwei
- //if(nOutLevel != NO_NUMBERING)
//->added by zhaojianwei
if(rTxtColl.IsAssignedToListLevelOfOutlineStyle())
{
@@ -369,28 +367,10 @@ short SwOutlineTabDialog::Ok()
SwTxtFmtColl &rTxtColl = rWrtSh.GetTxtFmtColl(i);
if( !rTxtColl.IsDefault() )
{
- //rTxtColl.SetOutlineLevel( (BYTE)GetLevel(rTxtColl.GetName()));//#outline level,removed by zhaojianwei
const SfxPoolItem & rItem =
rTxtColl.GetFmtAttr(RES_PARATR_NUMRULE, FALSE);
- //if ((BYTE)GetLevel(rTxtColl.GetName()) == NO_NUMBERING) //#outline level,removed by zhaojianwei
- //{
- // if (static_cast<const SwNumRuleItem &>(rItem).GetValue() ==
- // pOutlineRule->GetName())
- // {
- // rTxtColl.ResetFmtAttr(RES_PARATR_NUMRULE);
- // }
- //}
- //else
- //{
- // if (static_cast<const SwNumRuleItem &>(rItem).GetValue() !=
- // pOutlineRule->GetName())
- // {
- // SwNumRuleItem aItem(pOutlineRule->GetName());
- // rTxtColl.SetFmtAttr(aItem);
- // }
- //}
if ((BYTE)GetLevel(rTxtColl.GetName()) == MAXLEVEL) //add by zhaojianwei
{
if(rTxtColl.IsAssignedToListLevelOfOutlineStyle())
@@ -425,25 +405,6 @@ short SwOutlineTabDialog::Ok()
SwTxtFmtColl* pColl = rWrtSh.FindTxtFmtCollByName( sHeadline );
if( !pColl )
{
- //if( !aCollNames[i].Len() ) //#outline level,removed by zhaojianwei
- //{
- // SwTxtFmtColl* pTxtColl = rWrtSh.GetTxtCollFromPool(
- // static_cast< USHORT >(RES_POOLCOLL_HEADLINE1 + i) );
- // pTxtColl->SetOutlineLevel( NO_NUMBERING );
- // pTxtColl->ResetFmtAttr(RES_PARATR_NUMRULE);
- //}
- //else if(aCollNames[i] != sHeadline)
- //{
- // SwTxtFmtColl* pTxtColl = rWrtSh.GetParaStyle(
- // aCollNames[i], SwWrtShell::GETSTYLE_CREATESOME);
- // if(pTxtColl)
- // {
- // pTxtColl->SetOutlineLevel( static_cast< BYTE >(i) );
-
- // SwNumRuleItem aItem(pOutlineRule->GetName());
- // pTxtColl->SetFmtAttr(aItem);
- // }
- //}
if(aCollNames[i] != sHeadline)//->added by zhaojianwei
{
SwTxtFmtColl* pTxtColl = rWrtSh.GetTxtCollFromPool(
@@ -723,7 +684,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelectGetFocus, ListBox *, EMPTYARG )
IMPL_LINK( SwOutlineSettingsTabPage, NumberSelect, SwNumberingTypeListBox *, pBox )
{
USHORT nMask = 1;
- sal_Int16 nNumberType = pBox->GetSelectedNumberingType();//(sal_Int16)(ULONG)pBox->GetEntryData(pBox->GetSelectEntryPos());
+ sal_Int16 nNumberType = pBox->GetSelectedNumberingType();
for(USHORT i = 0; i < MAXLEVEL; i++)
{
if(nActLevel & nMask)
@@ -776,7 +737,6 @@ IMPL_LINK( SwOutlineSettingsTabPage, StartModified, NumericField *, pFld )
IMPL_LINK( SwOutlineSettingsTabPage, CharFmtHdl, ListBox *, EMPTYARG )
{
-// bAutomaticCharStyles = FALSE;
String sEntry = aCharFmtLB.GetSelectEntry();
USHORT nMask = 1;
BOOL bFormatNone = sEntry == ViewShell::GetShellRes()->aStrNone;
@@ -832,8 +792,6 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
pNumRule = ((SwOutlineTabDialog*)GetTabDialog())->GetNumRule();
pCollNames = ((SwOutlineTabDialog*)GetTabDialog())->GetCollNames();
- //pNumRule = new SwNumRule( *rSh.GetOutlineNumRule() );
-
aPreviewWIN.SetNumRule(pNumRule);
aPreviewWIN.SetOutlineNames(pCollNames);
// Startwert setzen - nActLevel muss hier 1 sein
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 3dcffbe..0169751 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -322,10 +322,6 @@ void SwRedlineAcceptDlg::InitAuthors()
if( bOnlyFormatedRedlines && nsRedlineType_t::REDLINE_FORMAT != rRedln.GetType() )
bOnlyFormatedRedlines = FALSE;
-//JP 27.9.2001: make no sense if we handle readonly sections
-// if( !bHasReadonlySel && rRedln.HasReadonlySel() )
-// bHasReadonlySel = TRUE;
-
String *pAuthor = new String(rRedln.GetAuthorString());
if (!aStrings.Insert(pAuthor))
delete pAuthor;
@@ -427,12 +423,6 @@ void SwRedlineAcceptDlg::Activate()
if (!pView) // Kann passieren, wenn man auf eine andere App umschaltet, wenn
return; // vorher eine Listbox im Dialog den Focus hatte (eigentlich THs Bug)
-/* if (HasRedlineAutoFmt())
- {
- Init();
- return;
- }*/
-
// Hat sich was geaendert?
SwWrtShell* pSh = pView->GetWrtShellPtr();
USHORT nCount = pSh->GetRedlineCount();
@@ -984,7 +974,6 @@ IMPL_LINK( SwRedlineAcceptDlg, GotoHdl, void*, EMPTYARG )
BOOL bIsNotFormated = FALSE;
BOOL bSel = FALSE;
-// BOOL bReadonlySel = FALSE;
//#98883# don't select redlines while the dialog is not focussed
//#107938# But not only ask pTable if it has the focus. To move
@@ -1025,10 +1014,6 @@ IMPL_LINK( SwRedlineAcceptDlg, GotoHdl, void*, EMPTYARG )
const SwRedline& rRedln = pSh->GetRedline( nPos );
bIsNotFormated |= nsRedlineType_t::REDLINE_FORMAT != rRedln.GetType();
-//JP 27.9.2001: make no sense if we handle readonly sections
-// if( !bReadonlySel && rRedln.HasReadonlySel() )
-// bReadonlySel = TRUE;
-
if (pSh->GotoRedline(nPos, TRUE))
{
pSh->SetInSelect();
More information about the Libreoffice-commits
mailing list