diff options
| author | Júlio Hoffimann <julio.hoffimann@gmail.com> | 2011-04-22 08:03:02 -0300 |
|---|---|---|
| committer | Katarina Machalkova <kmachalkova@suse.cz> | 2011-04-22 16:04:20 +0200 |
| commit | ac6c250d9e3e585260102dba791ffdef6d8ee0a5 (patch) | |
| tree | f4a1db2db2bc0b9e744c0aaeb024ac8c524cd9b6 /sw/source/ui | |
| parent | 63d8c400a545181a4d8afc6c875d3673510b510f (diff) | |
left arrow comments removed // <--
Diffstat (limited to 'sw/source/ui')
39 files changed, 0 insertions, 133 deletions
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index 5b961077f664..ab97fb176c20 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -345,7 +345,6 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) // at the document instance, the document is modified. Thus, reset this // status here. Note: In method <SubInitNew()> this is also done. pDoc->ResetModified(); - // <-- return bRet; } diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index f052df95809e..190cd4bb4eeb 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -868,7 +868,6 @@ sal_uInt16 SwDocShell::ApplyStyles(const String &rName, sal_uInt16 nFamily, // clear also list attributes at affected text nodes, if paragraph // style has the list style attribute set. pSh->SetTxtFmtColl( pStyle->GetCollection(), true ); - // <-- break; } case SFX_STYLE_FAMILY_FRAME: @@ -1007,7 +1006,6 @@ sal_uInt16 SwDocShell::UpdateStyle(const String &rName, sal_uInt16 nFamily, SwWr // #i105535# // no update of anchor attribute aSet.ClearItem( RES_ANCHOR ); - // <-- pFrm->SetFmtAttr( aSet ); diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index e2e9de525a05..b0f0734e289a 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -1286,7 +1286,6 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, // copy of the page style ::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo()); rDoc.CopyPageDesc(*pDesc, *pNewDsc); // #i7983# - // <-- pFmt = &pNewDsc->GetMaster(); } @@ -2169,7 +2168,6 @@ void SwDocStyleSheetPool::Replace( SfxStyleSheetBase& rSource, { // #i73790# - method renamed pTargetFmt->ResetAllFmtAttr(); - // <-- } if( USHRT_MAX != nPgDscPos ) diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index 22a4d4d8682a..4b08ab53bcb2 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -560,7 +560,6 @@ void SwSidebarWin::SetPosAndSize() { mpAnchor->SetAnchorState(AS_END); } - // <-- } else { @@ -569,11 +568,9 @@ void SwSidebarWin::SetPosAndSize() { mpAnchor->SetAnchorState(AS_ALL); } - // <-- SwSidebarWin* pWin = GetTopReplyNote(); // #i111964# if ( pWin && pWin->Anchor() ) - // <-- { pWin->Anchor()->SetAnchorState(AS_END); } @@ -1129,7 +1126,6 @@ void SwSidebarWin::SetViewState(ViewState bViewState) SwSidebarWin* pWin = GetTopReplyNote(); // #i111964# if ( pWin && pWin->Anchor() ) - // <-- { pWin->Anchor()->SetAnchorState(AS_END); } @@ -1163,7 +1159,6 @@ void SwSidebarWin::SetViewState(ViewState bViewState) // #i111964# if ( pTopWinSelf && ( pTopWinSelf != pTopWinActive ) && pTopWinSelf->Anchor() ) - // <-- { if ( pTopWinSelf != mrMgr.GetActiveSidebarWin() ) { diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index af4bb1329ed0..afad6894d20f 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -79,7 +79,6 @@ // #i104300# #include <IDocumentMarkAccess.hxx> #include <ndtxt.hxx> -// <-- /*-------------------------------------------------------------------- Description: KeyEvents diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 2e44c396a673..58361e34c2a8 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -51,7 +51,6 @@ #include <SwNodeNum.hxx> #include <IDocumentMarkAccess.hxx> #include <ndtxt.hxx> -// <-- // sw/inc/expfld.hxx SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* ) @@ -63,7 +62,6 @@ SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* ) // #i83479# #define REFFLDFLAG_HEADING 0x7100 #define REFFLDFLAG_NUMITEM 0x7200 -// <-- sal_uInt16 nFldDlgFmtSel = 0; @@ -79,7 +77,6 @@ SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) : aSelectionLB (this, SW_RES(LB_REFSELECTION)), // #i83479# aSelectionToolTipLB( this, SW_RES(LB_REFSELECTION_TOOLTIP) ), - // <-- aFormatFT (this, SW_RES(FT_REFFORMAT)), aFormatLB (this, SW_RES(LB_REFFORMAT)), aNameFT (this, SW_RES(FT_REFNAME)), @@ -97,7 +94,6 @@ SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) : maNumItems(), mpSavedSelectedTxtNode( 0 ), mnSavedSelectedPos( 0 ) - // <-- { FreeResource(); @@ -115,7 +111,6 @@ SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) : aSelectionToolTipLB.SetStyle( aSelectionToolTipLB.GetStyle() | WB_HSCROLL ); aSelectionToolTipLB.SetSpaceBetweenEntries(1); aSelectionToolTipLB.SetHighlightRange(); - // <-- } SwFldRefPage::~SwFldRefPage() @@ -168,7 +163,6 @@ sal_uInt16 SwFldRefPage::GetSavedSelectedPos() const return mnSavedSelectedPos; } -// <-- void SwFldRefPage::Reset(const SfxItemSet& ) { @@ -177,7 +171,6 @@ void SwFldRefPage::Reset(const SfxItemSet& ) SavePos(&aTypeLB); // #i83479# SaveSelectedTxtNode(); - // <-- } SetSelectionSel(LISTBOX_ENTRY_NOTFOUND); SetTypeSel(LISTBOX_ENTRY_NOTFOUND); @@ -210,7 +203,6 @@ void SwFldRefPage::Reset(const SfxItemSet& ) aTypeLB.SetEntryData(nPos, (void*)REFFLDFLAG_HEADING); nPos = aTypeLB.InsertEntry(sNumItemTxt); aTypeLB.SetEntryData(nPos, (void*)REFFLDFLAG_NUMITEM); - // <-- // fill up with the sequence types SwWrtShell *pSh = GetWrtShell(); @@ -326,7 +318,6 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) sName = sBookmarkTxt; nFlag = REFFLDFLAG_BOOKMARK; } - // <-- } break; @@ -463,7 +454,6 @@ IMPL_LINK( SwFldRefPage, SubTypeHdl, ListBox *, EMPTYARG ) } } break; - // <-- default: if (!IsFldEdit() || aSelectionLB.GetSelectEntryCount()) @@ -496,7 +486,6 @@ void SwFldRefPage::UpdateSubType() sOldSel = aSelectionLB.GetEntry(nSelectionSel); } } - // <-- if (IsFldEdit() && !sOldSel.Len()) sOldSel = String::CreateFromInt32( pRefFld->GetSeqNo() + 1 ); @@ -506,7 +495,6 @@ void SwFldRefPage::UpdateSubType() aSelectionToolTipLB.SetUpdateMode(sal_False); aSelectionToolTipLB.Clear(); bool bShowSelectionToolTipLB( false ); - // <-- if( REFFLDFLAG & nTypeId ) { @@ -613,7 +601,6 @@ void SwFldRefPage::UpdateSubType() } } } - // <-- else { aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_SORT); @@ -693,7 +680,6 @@ void SwFldRefPage::UpdateSubType() if (IsFldEdit() && !aSelectionLB.GetSelectEntryCount()) // in case the reference was already deleted... aNameED.SetText(sOldSel); } - // <-- } sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId) @@ -717,7 +703,6 @@ sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId) case REFFLDFLAG_NUMITEM: bAddCrossRefFormats = true; // intentional no break here - // <-- case TYP_GETREFFLD: case REFFLDFLAG_BOOKMARK: @@ -762,7 +747,6 @@ sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId) aFormatLB.SetEntryData( nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId( nTypeId, nFormat ))); nSize += 3; } - // <-- // select a certain entry if (nSize) @@ -943,7 +927,6 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& ) } } } - // <-- else // SeqenceFields { // get fields for Seq-FeldType: diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index f929db37891e..9268e0a96561 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -41,7 +41,6 @@ #include <IDocumentListItems.hxx> #include <FldRefTreeListBox.hxx> class SwTxtNode; -// <-- class SwFldRefPage : public SwFldPage { @@ -51,7 +50,6 @@ class SwFldRefPage : public SwFldPage ListBox aSelectionLB; // #i83479# SwFldRefTreeListBox aSelectionToolTipLB; - // <-- FixedText aFormatFT; ListBox aFormatLB; FixedText aNameFT; @@ -73,7 +71,6 @@ class SwFldRefPage : public SwFldPage const SwTxtNode* mpSavedSelectedTxtNode; // fallback, if previously selected text node doesn't exist anymore sal_uInt16 mnSavedSelectedPos; - // <-- DECL_LINK( TypeHdl, ListBox* pLB = 0 ); DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); @@ -86,7 +83,6 @@ class SwFldRefPage : public SwFldPage void SaveSelectedTxtNode(); const SwTxtNode* GetSavedSelectedTxtNode() const; sal_uInt16 GetSavedSelectedPos() const; - // <-- protected: virtual sal_uInt16 GetGroup(); diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx index 194a47f806a6..26b6db52096b 100644 --- a/sw/source/ui/frmdlg/frmmgr.cxx +++ b/sw/source/ui/frmdlg/frmmgr.cxx @@ -292,7 +292,6 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal, // --> OD 2009-09-01 #mongolianlayout# if ( bIsInVertical || bIsInVerticalL2R ) - // <-- { Point aPos(aBoundRect.Pos()); long nTmp = aPos.X(); @@ -491,7 +490,6 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal, } // --> OD 2009-09-01 #mongolianlayout# if ( bIsInVertical || bIsInVerticalL2R ) - // <-- { //restore width/height exchange long nTmp = rVal.nWidth; diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 30dfac09d297..74b709d9c3df 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -500,7 +500,6 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString eStringId = SwFPos::FROMLEFT; return eStringId; } - // <-- if ( bVertical ) { //exchange horizontal strings with vertical strings and vice versa @@ -538,7 +537,6 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString {SwFPos::REL_FRM_TOP, SwFPos::REL_FRM_LEFT }, {SwFPos::REL_FRM_BOTTOM, SwFPos::REL_FRM_RIGHT } }; - // <-- sal_uInt16 nIndex; for(nIndex = 0; nIndex < sizeof(aHoriIds) / sizeof(StringIdPair_Impl); ++nIndex) { @@ -568,7 +566,6 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString break; } } - // <-- } } return eStringId; @@ -675,7 +672,6 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) : bNoModifyHdl(sal_True), // --> OD 2009-08-31 #mongolianlayout# - no used // bVerticalChanged(sal_False), - // <-- bIsVerticalFrame(sal_False), bIsVerticalL2R(sal_False), bIsInRightToLeft(sal_False), @@ -828,7 +824,6 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) // --> OD 2009-08-31 #mongolianlayout# // if ( !bVerticalChanged && pSh->IsFrmVertical(sal_True, bIsInRightToLeft) ) if ( pSh->IsFrmVertical( sal_True, bIsInRightToLeft, bIsVerticalL2R ) ) - // <-- { String sHLabel = aHorizontalFT.GetText(); aHorizontalFT.SetText(aVerticalFT.GetText()); @@ -1323,7 +1318,6 @@ sal_uInt16 SwFrmPage::FillPosLB(const FrmMap* _pMap, bIsVerticalFrame, bIsVerticalL2R, bIsInRightToLeft); - // <-- String sEntry(aFramePosString.GetString(eStrId)); if (_rLB.GetEntryPos(sEntry) == LISTBOX_ENTRY_NOTFOUND) { @@ -1390,7 +1384,6 @@ sal_uLong SwFrmPage::FillRelLB( const FrmMap* _pMap, bIsVerticalFrame, bIsVerticalL2R, bIsInRightToLeft); - // <-- String sEntry = aFramePosString.GetString(sStrId1); sal_uInt16 nPos = _rLB.InsertEntry(sEntry); _rLB.SetEntryData(nPos, &aAsCharRelationMap[nRelPos]); @@ -1456,7 +1449,6 @@ sal_uLong SwFrmPage::FillRelLB( const FrmMap* _pMap, bIsVerticalFrame, bIsVerticalL2R, bIsInRightToLeft); - // <-- String sEntry = aFramePosString.GetString(eStrId1); sal_uInt16 nPos = _rLB.InsertEntry(sEntry); _rLB.SetEntryData(nPos, &aRelationMap[nRelPos]); diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc index 9a2e69aa48b5..5de05376a882 100644 --- a/sw/source/ui/inc/app.hrc +++ b/sw/source/ui/inc/app.hrc @@ -120,7 +120,6 @@ #define STR_DONT_ASK_AGAIN (RC_APP_BEGIN + 103) // --> OD 2008-04-14 #outlinelevel# #define STR_OUTLINE_NUMBERING (RC_APP_BEGIN + 104) -// <-- //#outline level,zhaojianwei #define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105) #define STR_FDLG_STYLE (RC_APP_BEGIN + 106) diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index af53b8082349..547d67883508 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -292,7 +292,6 @@ public: // #i42921# - add parameter <bVerticalMode> sal_Bool RulerMarginDrag( const MouseEvent& rMEvt, const bool bVerticalMode ); - // <-- /** #i42732# display status of font size/name depending on either the input language or the selection position depending on what has changed lately diff --git a/sw/source/ui/inc/frmmgr.hxx b/sw/source/ui/inc/frmmgr.hxx index 91b1ae6240b5..6a462480d4b7 100644 --- a/sw/source/ui/inc/frmmgr.hxx +++ b/sw/source/ui/inc/frmmgr.hxx @@ -68,7 +68,6 @@ class SW_DLLPUBLIC SwFlyFrmAttrMgr sal_Bool bIsInVertical; // --> OD 2009-09-01 #mongolianlayout# sal_Bool bIsInVerticalL2R; - // <-- // internal calculation for borders SW_DLLPRIVATE SwTwips CalcTopSpace(); diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index c4c331030ca5..57221dba9699 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -110,7 +110,6 @@ class SwFrmPage: public SfxTabPage sal_Bool bIsVerticalFrame; //current frame is in vertical environment - strings are exchanged // --> OD 2009-08-31 #mongolianlayou# sal_Bool bIsVerticalL2R; - // <-- sal_Bool bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged sal_Bool bHtmlMode; sal_uInt16 nHtmlMode; diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx index 91769ea55559..a173de881c1d 100644 --- a/sw/source/ui/inc/numpara.hxx +++ b/sw/source/ui/inc/numpara.hxx @@ -63,7 +63,6 @@ class SwParagraphNumTabPage : public SfxTabPage // --> OD 2008-04-14 #outlinelevel# const String msOutlineNumbering; - // <-- sal_Bool bModified : 1; sal_Bool bCurNumrule : 1; diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index e4419409f91f..ca006c2bc940 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -98,7 +98,6 @@ class SwEditRegionDlg : public SfxModalDialog // #114856# edit in readonly sections FixedLine aPropertiesFL; TriStateBox aEditInReadonlyCB; - // <-- OKButton aOK; CancelButton aCancel; @@ -135,7 +134,6 @@ class SwEditRegionDlg : public SfxModalDialog DECL_LINK( ChangeHideHdl, TriStateBox * ); // #114856# edit in readonly sections DECL_LINK( ChangeEditInReadonlyHdl, TriStateBox * ); - // <-- DECL_LINK( ChangeDismissHdl, CheckBox * ); DECL_LINK( UseFileHdl, CheckBox* ); DECL_LINK( FileSearchHdl, PushButton* ); @@ -186,7 +184,6 @@ class SwInsertSectionTabPage : public SfxTabPage // #114856# edit in readonly sections FixedLine aPropertiesFL; CheckBox aEditInReadonlyCB; - // <-- String m_sFileName; String m_sFilterName; @@ -201,7 +198,6 @@ class SwInsertSectionTabPage : public SfxTabPage DECL_LINK( ChangeHideHdl, CheckBox * ); // #114856# edit in readonly sections DECL_LINK( ChangeEditInReadonlyHdl, CheckBox * ); - // <-- DECL_LINK( ChangeProtectHdl, CheckBox * ); DECL_LINK( ChangePasswdHdl, Button * ); DECL_LINK( NameEditHdl, Edit * ); diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index ff4f61eaa413..a6f8fa62a3af 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -190,7 +190,6 @@ public: // #i32329# Enhanced selection void SelSentence (const Point * = 0, sal_Bool bProp=sal_False ); void SelPara (const Point * = 0, sal_Bool bProp=sal_False ); - // <-- long SelAll(); // basecursortravelling @@ -233,7 +232,6 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); // #i20126# Enhanced table selection sal_Bool SelectTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false ); - // <-- sal_Bool SelectTableRow(); sal_Bool SelectTableCol(); sal_Bool SelectTableCell(); @@ -557,7 +555,6 @@ private: // #i92468# SW_DLLPRIVATE sal_Bool _NxtWrdForDelete(); SW_DLLPRIVATE sal_Bool _PrvWrdForDelete(); - // <-- SW_DLLPRIVATE sal_Bool _FwdSentence(); SW_DLLPRIVATE sal_Bool _BwdSentence(); sal_Bool _FwdPara(); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 5ae40724d85b..50940347fe5c 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1773,7 +1773,6 @@ public: break; } } -//<--- sal_uInt16 GetChapterInfo() const{ return aFormToken.nChapterFormat;} void SetOutlineLevel( sal_uInt16 nSet ) { aFormToken.nOutlineLevel = nSet;}//i53420 @@ -2599,7 +2598,6 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken) aChapterEntryLB.SelectEntryPos(2); break; } -//<--- //i53420 aEntryOutlineLevelNF.SetValue(pToken->nOutlineLevel); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index d6e64146c5de..c0c0f601a990 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -193,7 +193,6 @@ SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent, { // --> OD 2008-04-14 #outlinelevel# SetText( SW_RES( STR_OUTLINE_NUMBERING ) ); - // <-- PushButton* pUserButton = GetUserButton(); pUserButton->SetText(SW_RES(ST_FORM)); pUserButton->SetHelpId(HID_OUTLINE_FORM); @@ -361,7 +360,6 @@ short SwOutlineTabDialog::Ok() // encapsulate changes into a action to avoid effects on the current cursor // position during the changes. rWrtSh.StartAction(); - // <-- const SwNumRule * pOutlineRule = rWrtSh.GetOutlineNumRule(); @@ -1046,7 +1044,6 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ ) aNumVector[nLevel] = nPreNum; // #128041# String aText(pActNum->MakeNumString( aNumVector )); - // <-- pVDev->DrawText( Point(nNumberXPos, nYStart), aText ); nBulletWidth = (sal_uInt16)pVDev->GetTextWidth(aText); nPreNum++; @@ -1152,7 +1149,6 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ ) aNumVector[nLevel] = nPreNum; // #128041# String aText(pActNum->MakeNumString( aNumVector )); - // <-- pVDev->DrawText( Point(nXStart, nYStart), aText ); nTextOffset = (sal_uInt16)pVDev->GetTextWidth(aText); nTextOffset = nTextOffset + nXStep; diff --git a/sw/source/ui/misc/outline.src b/sw/source/ui/misc/outline.src index 85ea42df4861..f84fd6738462 100644 --- a/sw/source/ui/misc/outline.src +++ b/sw/source/ui/misc/outline.src @@ -106,7 +106,6 @@ TabDialog DLG_TAB_OUTLINE // --> OD 2008-04-14 #outlinelevel# // dialog title is now given by resource STR_OUTLINE_NUMBERING // Text [ en-US ] = "Outline Numbering" ; - // <-- Moveable = TRUE ; TabControl 1 { diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 277348bcda65..47a676deb1fa 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -1461,9 +1461,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) rSet.Put(aBool); } } - // <-- } - // <-- } break; case SID_IMAP_EXEC: @@ -1525,7 +1523,6 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) rSh.GetGraphic(sal_False); // start the loading // #i75481# bDisable = sal_True; - // <-- } else if( bHas && bOk ) bDisable = !lcl_UpdateContourDlg( rSh, nSel ); @@ -1537,9 +1534,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) bDisable = GRAPHIC_NONE == rSh.GetGraphicType(); else bDisable = GRAPHIC_NONE == rSh.GetIMapGraphic().GetType(); - // <-- } - // <-- if( bDisable ) rSet.DisableItem( nWhich ); @@ -1857,7 +1852,6 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot ) { nSurround = nOldSurround; } - // <-- break; case FN_FRAME_WRAP_CONTOUR: aWrap.SetContour(!aWrap.IsContour()); diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index 135e17aafee1..5b5756e265c0 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -648,7 +648,6 @@ IMPL_LINK( SwDrawBaseShell, CheckGroupShapeNameHdl, AbstractSvxNameDialog*, pNam break; } } - // <-- } return nRet; } diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index c640c5c6caa8..0deab441cb60 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -904,7 +904,6 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet) case SID_CLIPBOARD_FORMAT_ITEMS: rSet.DisableItem( SID_CLIPBOARD_FORMAT_ITEMS ); break; - // <-- } nWhich = aIter.NextWhich(); } diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 63168e2c8f20..9763e08bdc56 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -52,7 +52,6 @@ // #i73249# #include <svx/svdview.hxx> #include <vcl/msgbox.hxx> -// <-- #include <doc.hxx> #include <fmturl.hxx> @@ -88,7 +87,6 @@ #include "misc.hrc" // #i73249# #include <svx/dialogs.hrc> -// <-- #include <sfx2/filedlghelper.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> @@ -773,7 +771,6 @@ void SwFrameShell::Execute(SfxRequest &rReq) } } break; - // <-- default: OSL_ENSURE( !this, "wrong dispatcher" ); return; @@ -1028,7 +1025,6 @@ void SwFrameShell::GetState(SfxItemSet& rSet) } break; - // <-- default: /* do nothing */; break; diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index 5e1642fcc67b..ac04985e0491 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -219,7 +219,6 @@ void SwGrfShell::Execute(SfxRequest &rReq) aSet.Put( SvxBrushItem( *pGrfObj, GPOS_LT, SID_ATTR_GRAF_GRAPHIC ) ); } - // <-- } aSet.Put( SfxBoolItem( FN_PARAM_GRF_CONNECT, sGrfNm.Len() > 0 ) ); @@ -506,7 +505,6 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq ) GetShell().ReRead( aEmptyStr, aEmptyStr, &aFilterObj.GetGraphic() ); } - // <-- } break; @@ -679,7 +677,6 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet) bDisable = eGraphicType != GRAPHIC_BITMAP; } } - // <-- } break; diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index 3276ac48e021..ae432afef3ce 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -143,7 +143,6 @@ void lcl_OutlineUpDownWithSubPoints( SwWrtShell& rSh, bool bMove, bool bUp ) rSh.Pop( sal_False ); } } -// <-- void SwListShell::Execute(SfxRequest &rReq) { diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 23059702e7e7..bfc441a22d5e 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -892,7 +892,6 @@ void SwTableShell::Execute(SfxRequest &rReq) ItemSetToTableParam( aSet, rSh ); rSh.EndUndo( nUndoId ); } - // <-- bCallDone = sal_True; break; diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 1940bcbb3895..65cf089cdffb 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -1166,7 +1166,6 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) rSh.SetMark(); rSh.SetAttr( aRestoreSet ); rSh.ClearMark(); - // <-- rSh.UpdateAttr(); aFont = aNewFontItem; diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 026169e2b459..37b7775c31db 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -987,7 +987,6 @@ void SwTextShell::Execute(SfxRequest &rReq) { rWrtSh.StartUndo( UNDO_INSATTR ); } - // <-- if( pSet->Count() ) { rWrtSh.StartAction(); @@ -1018,7 +1017,6 @@ void SwTextShell::Execute(SfxRequest &rReq) // in order to indicate that the restart value of the list // style has to be used on restart. sal_uInt16 nNumStart = USHRT_MAX; - // <-- if( SFX_ITEM_SET == pSet->GetItemState(FN_NUMBER_NEWSTART_AT) ) { nNumStart = ((SfxUInt16Item&)pSet->Get(FN_NUMBER_NEWSTART_AT)).GetValue(); @@ -1037,7 +1035,6 @@ void SwTextShell::Execute(SfxRequest &rReq) { rWrtSh.EndUndo( UNDO_INSATTR ); } - // <-- } delete pDlg; @@ -1054,7 +1051,6 @@ void SwTextShell::Execute(SfxRequest &rReq) { pRule = rWrtSh.SearchNumRule( false, false, false, -1, sContinuedListId ); } - // <-- if ( pRule ) { rWrtSh.SetCurNumRule( *pRule, false, sContinuedListId ); @@ -1657,7 +1653,6 @@ void SwTextShell::GetState( SfxItemSet &rSet ) { pRule = rSh.SearchNumRule( false, false, false, -1, aDummy ); } - // <-- if ( !pRule ) rSet.DisableItem(nWhich); } diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index ad0c0b06462f..09ea84b3c6e9 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -139,7 +139,6 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) SwNumRule aRule( GetShell().GetUniqueNumRuleName(), // #i89178# numfunc::GetDefaultPositionAndSpaceMode() ); - // <-- SvxNumRule aSvxRule = aRule.MakeSvxNumRule(); const bool bRightToLeft = GetShell().IsInRightToLeftText( 0 ); @@ -160,7 +159,6 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) { aFmt.SetNumAdjust( SVX_ADJUST_RIGHT ); } - // <-- aSvxRule.SetLevel( n, aFmt, sal_False ); } aSvxRule.SetFeatureFlag(NUM_ENABLE_EMBEDDED_BMP, sal_False); @@ -193,7 +191,6 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) : GetShell().GetUniqueNumRuleName(), // #i89178# numfunc::GetDefaultPositionAndSpaceMode() ); - // <-- aSetRule.SetSvxRule( *pSetRule, GetShell().GetDoc()); aSetRule.SetAutoRule( sal_True ); // No start of new list, if an existing list style is edited. @@ -212,7 +209,6 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) SwNumRule aSetRule( GetShell().GetUniqueNumRuleName(), // #i89178# numfunc::GetDefaultPositionAndSpaceMode() ); - // <-- aSetRule.SetSvxRule(*pSetRule, GetShell().GetDoc()); aSetRule.SetAutoRule( sal_True ); // start new list diff --git a/sw/source/ui/uiview/view.src b/sw/source/ui/uiview/view.src index 11543c0ac8f3..2f65a91d9115 100644 --- a/sw/source/ui/uiview/view.src +++ b/sw/source/ui/uiview/view.src @@ -142,7 +142,6 @@ String STR_NUM_OUTLINE { Text [ en-US ] = "Outline "; };//<-end,zhaojianwei -// <-- String STR_ERROR_NOLANG { Text [ en-US ] = "No language is selected in the proofed section." ; diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index a99fa09c968d..0909b3c5224f 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -603,7 +603,6 @@ void SwView::ExecTabWin( SfxRequest& rReq ) rSh.GetCurAttr( aSet ); const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>(aSet.Get(RES_LR_SPACE)); - // <-- SwPosition aPos(*pNumRuleNodeFromDoc); // #i90078# @@ -611,7 +610,6 @@ void SwView::ExecTabWin( SfxRequest& rReq ) // #i42921# invalidate state of indent in order to get a ruler update. aParaMargin.SetWhich( nSlot ); GetViewFrame()->GetBindings().SetState( aParaMargin ); - // <-- } else if( pColl && pColl->IsAutoUpdateFmt() ) { @@ -1086,7 +1084,6 @@ void SwView::StateTabWin(SfxItemSet& rSet) // #i42922# Mouse move of numbering label // has to consider the left indent of the paragraph pNumRuleNodeFromDoc->GetLeftMarginWithNum( sal_True ) ); - // <-- short nFLOffset; pNumRuleNodeFromDoc->GetFirstLineOfsWithNum( nFLOffset ); diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index d375e42fdd5d..bbdf72d051bb 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -118,7 +118,6 @@ enum SwDocumentSettingsPropertyHandles HANDLE_TABS_RELATIVE_TO_INDENT, // #i89181# HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, - // <-- HANDLE_MODIFYPASSWORDINFO, HANDLE_MATH_BASELINE_ALIGNMENT, HANDLE_INVERT_BORDER_SPACING, @@ -671,7 +670,6 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf mpDoc->set(IDocumentSettingAccess::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, bTmp); } break; - // <-- case HANDLE_MODIFYPASSWORDINFO: { uno::Sequence< beans::PropertyValue > aInfo; @@ -1026,7 +1024,6 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; - // <-- case HANDLE_MODIFYPASSWORDINFO: { rValue <<= mpDocSh->GetModifyPasswordInfo(); diff --git a/sw/source/ui/uno/unodefaults.cxx b/sw/source/ui/uno/unodefaults.cxx index 3dae837be8c4..3061183215ad 100644 --- a/sw/source/ui/uno/unodefaults.cxx +++ b/sw/source/ui/uno/unodefaults.cxx @@ -56,7 +56,6 @@ SfxItemPool* SwSvxUnoDrawPool::getModelPool( sal_Bool /*bReadOnly*/ ) throw() //return &pModel->GetItemPool(); // #i52858# - method name changed m_pDoc->GetOrCreateDrawModel(); - // <-- return &(m_pDoc->GetAttrPool()); } return 0; diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index ad764ca3cc28..034bbb791e1c 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -115,7 +115,6 @@ // #i12836# enhanced pdf export #include <EnhancedPDFExportHelper.hxx> -// <-- #include <numrule.hxx> #include <editeng/langitem.hxx> @@ -1491,7 +1490,6 @@ void SwXTextDocument::InitNewDoc() // dispose XDrawPage here. We are the owner and know that it is no longer in a valid condition. uno::Reference<lang::XComponent> xComp( *pxXDrawPage, uno::UNO_QUERY ); xComp->dispose(); - // <-- pDrawPage->InvalidateSwDoc(); delete pxXDrawPage; pxXDrawPage = 0; @@ -1698,7 +1696,6 @@ Reference< XInterface > SwXTextDocument::createInstance(const OUString& rServic } //hier den Draw - Service suchen Reference< XInterface > xTmp = SvxFmMSFactory::createInstance(aTmpServiceName); - // <-- if(bShape) { nIndex = COM_SUN_STAR__DRAWING_LENGTH; @@ -1936,7 +1933,6 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, // we don't need to make an SdrModel and can do nothing // #i52858# - method name changed pDrawDoc = dynamic_cast< SwDrawDocument * > (pDocShell->GetDoc()->GetOrCreateDrawModel() ); - // <-- pDrawDoc->SetAutoControlFocus ( bAuto ); } } @@ -1958,7 +1954,6 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, // nothing // #i52858# - method name changed pDrawDoc = dynamic_cast< SwDrawDocument * > (pDocShell->GetDoc()->GetOrCreateDrawModel() ); - // <-- pDrawDoc->SetOpenInDesignMode ( bMode ); } } @@ -1973,7 +1968,6 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, pDoc->SetInReading( bBool ); } break; - // <-- case WID_DOC_BUILDID: aValue >>= maBuildId; break; @@ -1985,7 +1979,6 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, pDocShell->GetDoc()->SetApplyWorkaroundForB6375613( bApplyWorkaroundForB6375613 ); } break; - // <-- default: { @@ -2148,7 +2141,6 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) aAny <<= pDocShell->GetDoc()->ApplyWorkaroundForB6375613(); } break; - // <-- default: { @@ -2579,7 +2571,6 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( // #122919# Force field update before PDF export pViewShell->ViewShell::UpdateFlds(sal_True); - // <-- if( bStateChanged ) pRenderDocShell->EnableSetModified( sal_True ); @@ -2703,7 +2694,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( const sal_uInt16 nPage = bPrintProspect ? nRenderer + 1 : m_pRenderData->GetPagesToPrint()[ nRenderer ]; - // <-- // get paper tray to use ... sal_Int32 nPrinterPaperTray = -1; @@ -2942,7 +2932,6 @@ void SAL_CALL SwXTextDocument::render( { SwEnhancedPDFExportHelper aHelper( *pWrtShell, *pOut, aPageRange, bIsSkipEmptyPages, sal_False ); } - // <-- SwPrintData const& rSwPrtOptions = *m_pRenderData->GetSwPrtOptions(); @@ -2961,7 +2950,6 @@ void SAL_CALL SwXTextDocument::render( { SwEnhancedPDFExportHelper aHelper( *pWrtShell, *pOut, aPageRange, bIsSkipEmptyPages, sal_True ); } - // <-- pVwSh->SetPDFExportOption( sal_False ); @@ -3804,7 +3792,6 @@ Reference<XInterface> SwXDocumentPropertyHelper::GetDrawTable(short nWhich) xMarkerTable = SvxUnoMarkerTable_createInstance( m_pDoc->GetOrCreateDrawModel() ); xRet = xMarkerTable; break; - // <-- case SW_CREATE_DRAW_DEFAULTS: if(!xDrawDefaults.is()) xDrawDefaults = (cppu::OWeakObject*)new SwSvxUnoDrawPool(m_pDoc); diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index 095cc6704ce8..d7fde30f511f 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -155,7 +155,6 @@ ShellResource::ShellResource() aGetRefFld_Down( SW_RES( STR_GETREFFLD_DOWN ) ), // #i81002# aGetRefFld_RefItemNotFound( SW_RES( STR_GETREFFLD_REFITEMNOTFOUND ) ), - // <-- aStrAllPageHeadFoot( SW_RES( STR_ALLPAGE_HEADFOOT ) ), aStrNone( SW_RES( STR_TEMPLATE_NONE )), aFixedStr( SW_RES( STR_FIELD_FIXED )), diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx index 9b8525393b79..977948074f24 100644 --- a/sw/source/ui/wrtsh/delete.cxx +++ b/sw/source/ui/wrtsh/delete.cxx @@ -37,7 +37,6 @@ // #134369# #include <view.hxx> #include <drawbase.hxx> -// <-- inline void SwWrtShell::OpenMark() { @@ -208,7 +207,6 @@ long SwWrtShell::DelLeft() const SwStartNode * pSNdOld = pWasInTblNd ? GetSwCrsr()->GetNode()->FindTableBoxStartNode() : 0; - // <-- /* If the cursor is at the beginning of a paragraph, try to step backwards. On failure we are done. */ @@ -229,7 +227,6 @@ long SwWrtShell::DelLeft() // changed the table cell, compare DelRight(). if ( pSNdOld != pSNdNew ) return 0; - // <-- OpenMark(); SwCrsrShell::Right(1,CRSR_SKIP_CHARS); @@ -335,7 +332,6 @@ long SwWrtShell::DelRight() // the cursor will be in its initial state, because there // may be a numbering in front of the next paragraph. SwCrsrShell::Push(); - // <-- if ( SwCrsrShell::Right(1, CRSR_SKIP_CHARS) ) { @@ -388,7 +384,6 @@ long SwWrtShell::DelRight() // #134369# OSL_ENSURE( !IsFrmSelected(), "<SwWrtShell::DelRight(..)> - <SwWrtShell::UnSelectFrm()> should unmark all objects" ); - // <-- // #134369# // leave draw mode, if necessary. { @@ -402,12 +397,10 @@ long SwWrtShell::DelRight() GetView().LeaveDrawCreate(); } } - // <-- } // #134369# // <IsFrmSelected()> can't be true - see above. - // <-- { nSelection = GetSelectionType(); if ( nsSelectionType::SEL_FRM & nSelection || diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx index a541830c5853..d0c10642c358 100644 --- a/sw/source/ui/wrtsh/select.cxx +++ b/sw/source/ui/wrtsh/select.cxx @@ -894,7 +894,6 @@ sal_Bool SwWrtShell::SelectTableRowCol( const Point& rPt, const Point* pEnd, boo } return sal_False; } -// <-- /*------------------------------------------------------------------------ Beschreibung: Selektion einer Tabellenzeile / Spalte diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index 3b41c5c8bb19..80910d453d96 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -563,7 +563,6 @@ sal_Bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyF // --> #i972# if ( bStarMath && pDoc->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) ) AlignFormulaToBaseline( xRef.GetObject() ); - // <-- if (pFlyFrmFmt) *pFlyFrmFmt = pFmt; @@ -730,7 +729,6 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj, GetDoc()->GetDocShell()->EnableSetModified( sal_True ); } } - // <-- } // TODO/LATER: this is only a workaround, @@ -872,7 +870,6 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj, : GetAnyCurRect( RECT_FLY_PRT_EMBEDDED, 0, xObj.GetObject() )); aArea += rPoint - aRect.Pos(); // adjust area by diff of printing area position in order to keep baseline alignment correct. } - // <-- aArea.Width ( _aVisArea.Width() ); aArea.Height( _aVisArea.Height() ); RequestObjectResize( aArea, xObj.GetObject() ); @@ -1160,7 +1157,6 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) // turning on outline numbering at current cursor position bContinueFoundNumRule = true; } - // <-- } else { @@ -1265,7 +1261,6 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) const SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode( numfunc::GetDefaultPositionAndSpaceMode() ); SwNumRule aNumRule( GetUniqueNumRuleName(), ePosAndSpaceMode ); - // <-- // Zeichenvorlage an die Numerierung haengen SwCharFmt* pChrFmt; SwDocShell* pDocSh = GetView().GetDocShell(); @@ -1274,7 +1269,6 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) const Font* pFnt = numfunc::IsDefBulletFontUserDefined() ? &numfunc::GetDefBulletFont() : 0; - // <-- if (bNum) { @@ -1327,7 +1321,6 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) aFmt.SetAbsLSpace(nWidthOfTabs + nLvl * 720); } } - // <-- // #i38904# Default alignment for // numbering/bullet should be rtl in rtl paragraph: @@ -1335,7 +1328,6 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) { aFmt.SetNumAdjust( SVX_ADJUST_RIGHT ); } - // <-- aNumRule.Set( nLvl, aFmt ); } @@ -1346,7 +1338,6 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) { const SwTwips nTxtNodeIndent = pTxtNode->GetAdditionalIndentForStartingNewList(); - // <-- if ( ( nTxtNodeIndent + nWidthOfTabs ) != 0 ) { // #i111172# @@ -1362,11 +1353,9 @@ void SwWrtShell::NumOrBulletOn(sal_Bool bNum) nIndentChange -= aFmt.GetIndentAt() + aFmt.GetFirstLineIndent(); } } - // <-- aNumRule.ChangeIndent( nIndentChange ); } } - // <-- // reset indent attribute on applying list style // start new list SetCurNumRule( aNumRule, true, String(), true ); @@ -1414,7 +1403,6 @@ void SwWrtShell::NumOrBulletOff() // #126346# - Cursor can not be anymore in front of // a label, because numbering/bullet is switched off. SetInFrontOfLabel( sal_False ); - // <-- } } // <- #i29560# @@ -1512,7 +1500,6 @@ SelectionType SwWrtShell::GetSelectionType() const nCnt |= nsSelectionType::SEL_NUM; } } - // <-- return nCnt; } diff --git a/sw/source/ui/wrtsh/wrtsh4.cxx b/sw/source/ui/wrtsh/wrtsh4.cxx index f0269bff4f10..dd87b4b2d6ba 100644 --- a/sw/source/ui/wrtsh/wrtsh4.cxx +++ b/sw/source/ui/wrtsh/wrtsh4.cxx @@ -199,7 +199,6 @@ sal_Bool SwWrtShell::_PrvWrdForDelete() Combine(); return sal_True; } -// <-- sal_Bool SwWrtShell::_FwdSentence() @@ -266,7 +265,6 @@ sal_Bool SwWrtShell::_BwdPara() { SttPara(); } - // <-- ClearMark(); Combine(); |