From ab465b90f6c6da5595393a0ba73f33a1e71a2b65 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Wed, 20 May 2015 13:05:49 +0200 Subject: bin/rename-sw-abbreviations.sh renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9 --- sw/source/uibase/wrtsh/delete.cxx | 26 ++--- sw/source/uibase/wrtsh/move.cxx | 16 +-- sw/source/uibase/wrtsh/select.cxx | 52 ++++----- sw/source/uibase/wrtsh/wrtsh1.cxx | 214 +++++++++++++++++++------------------- sw/source/uibase/wrtsh/wrtsh2.cxx | 118 ++++++++++----------- sw/source/uibase/wrtsh/wrtsh3.cxx | 4 +- 6 files changed, 215 insertions(+), 215 deletions(-) (limited to 'sw/source/uibase/wrtsh') diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx index 68f2eaba05a4..c25a372b1efb 100644 --- a/sw/source/uibase/wrtsh/delete.cxx +++ b/sw/source/uibase/wrtsh/delete.cxx @@ -53,16 +53,16 @@ bool SwWrtShell::TryRemoveIndent() GetCurAttr(aAttrSet); SvxLRSpaceItem aItem = static_cast(aAttrSet.Get(RES_LR_SPACE)); - short aOldFirstLineOfst = aItem.GetTxtFirstLineOfst(); + short aOldFirstLineOfst = aItem.GetTextFirstLineOfst(); if (aOldFirstLineOfst > 0) { - aItem.SetTxtFirstLineOfst(0); + aItem.SetTextFirstLineOfst(0); bResult = true; } else if (aOldFirstLineOfst < 0) { - aItem.SetTxtFirstLineOfst(0); + aItem.SetTextFirstLineOfst(0); aItem.SetLeft(aItem.GetLeft() + aOldFirstLineOfst); bResult = true; @@ -177,13 +177,13 @@ long SwWrtShell::DelLeft() // JP 29.06.95: never erase a table standing in front of it. bool bSwap = false; - const SwTableNode * pWasInTblNd = SwCrsrShell::IsCrsrInTbl(); + const SwTableNode * pWasInTableNd = SwCrsrShell::IsCrsrInTable(); if( SwCrsrShell::IsSttPara()) { // #i4032# Don't actually call a 'delete' if we // changed the table cell, compare DelRight(). - const SwStartNode * pSNdOld = pWasInTblNd ? + const SwStartNode * pSNdOld = pWasInTableNd ? GetSwCrsr()->GetNode().FindTableBoxStartNode() : 0; @@ -194,11 +194,11 @@ long SwWrtShell::DelLeft() // If the cursor entered or left a table (or both) we are done. No step // back. - const SwTableNode* pIsInTblNd = SwCrsrShell::IsCrsrInTbl(); - if( pIsInTblNd != pWasInTblNd ) + const SwTableNode* pIsInTableNd = SwCrsrShell::IsCrsrInTable(); + if( pIsInTableNd != pWasInTableNd ) return 0; - const SwStartNode* pSNdNew = pIsInTblNd ? + const SwStartNode* pSNdNew = pIsInTableNd ? GetSwCrsr()->GetNode().FindTableBoxStartNode() : 0; @@ -235,7 +235,7 @@ long SwWrtShell::DelRight() if(nSelection & nsSelectionType::SEL_TXT) nSelection = nsSelectionType::SEL_TXT; - const SwTableNode * pWasInTblNd = NULL; + const SwTableNode * pWasInTableNd = NULL; switch( nSelection & ~(nsSelectionType::SEL_BEZ) ) { @@ -271,7 +271,7 @@ long SwWrtShell::DelRight() EnterStdMode(); } - pWasInTblNd = IsCrsrInTbl(); + pWasInTableNd = IsCrsrInTable(); if( nsSelectionType::SEL_TXT & nSelection && SwCrsrShell::IsSttPara() && SwCrsrShell::IsEndPara() ) @@ -282,8 +282,8 @@ long SwWrtShell::DelRight() bool bDelFull = false; if ( SwCrsrShell::Right(1,CRSR_SKIP_CHARS) ) { - const SwTableNode * pCurrTblNd = IsCrsrInTbl(); - bDelFull = pCurrTblNd && pCurrTblNd != pWasInTblNd; + const SwTableNode * pCurrTableNd = IsCrsrInTable(); + bDelFull = pCurrTableNd && pCurrTableNd != pWasInTableNd; } // restore cursor @@ -313,7 +313,7 @@ long SwWrtShell::DelRight() if ( SwCrsrShell::Right(1, CRSR_SKIP_CHARS) ) { - if (IsCrsrInTbl() || (pWasInTblNd != IsCrsrInTbl())) + if (IsCrsrInTable() || (pWasInTableNd != IsCrsrInTable())) { /** #108049# Save the startnode of the current cell. May be different to pSNdOld as we have diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx index a407b33d8325..23a1a28e5b84 100644 --- a/sw/source/uibase/wrtsh/move.cxx +++ b/sw/source/uibase/wrtsh/move.cxx @@ -194,7 +194,7 @@ bool SwWrtShell::RightMargin( bool bSelect, bool bBasicCall ) bool SwWrtShell::GoStart( bool bKeepArea, bool *pMoveTable, bool bSelect, bool bDontMoveRegion ) { - if ( IsCrsrInTbl() ) + if ( IsCrsrInTable() ) { const bool bBoxSelection = HasBoxSelection(); if( !m_bBlockMode ) @@ -262,7 +262,7 @@ bool SwWrtShell::GoEnd(bool bKeepArea, bool *pMoveTable) if ( pMoveTable && *pMoveTable ) return MoveTable( fnTableCurr, fnTableEnd ); - if ( IsCrsrInTbl() ) + if ( IsCrsrInTable() ) { if ( MoveSection( fnSectionCurr, fnSectionEnd ) || MoveTable( fnTableCurr, fnTableEnd ) ) @@ -408,7 +408,7 @@ bool SwWrtShell::PushCrsr(SwTwips lOffset, bool bSelect) aPt.Y() = aTmpArea.Top() + aTmpArea.Height() / 2; aPt.Y() += lOffset; - m_aDest = GetCntntPos(aPt,lOffset > 0); + m_aDest = GetContentPos(aPt,lOffset > 0); m_aDest.X() = aPt.X(); m_bDestOnStack = true; } @@ -596,7 +596,7 @@ bool SwWrtShell::GotoFly( const OUString& rName, FlyCntType eType, bool bSelFram return bRet; } -bool SwWrtShell::GotoINetAttr( const SwTxtINetFmt& rAttr ) +bool SwWrtShell::GotoINetAttr( const SwTextINetFormat& rAttr ) { SwPosition aPos = *GetCrsr()->GetPoint(); bool bRet = SwCrsrShell::GotoINetAttr(rAttr); @@ -657,9 +657,9 @@ bool SwWrtShell::GotoTable( const OUString& rName ) return bRet; } -bool SwWrtShell::GotoFld( const SwFmtFld& rFld ) { +bool SwWrtShell::GotoFormatField( const SwFormatField& rField ) { SwPosition aPos = *GetCrsr()->GetPoint(); - bool bRet = SwCrsrShell::GotoFld(rFld); + bool bRet = SwCrsrShell::GotoFormatField(rField); if (bRet) m_aNavigationMgr.addEntry(aPos); return bRet; @@ -673,13 +673,13 @@ const SwRangeRedline* SwWrtShell::GotoRedline( sal_uInt16 nArrPos, bool bSelect return pRedline; } -bool SwWrtShell::SelectTxtAttr( sal_uInt16 nWhich, const SwTxtAttr* pAttr ) +bool SwWrtShell::SelectTextAttr( sal_uInt16 nWhich, const SwTextAttr* pAttr ) { bool bRet; { SwMvContext aMvContext(this); SttSelect(); - bRet = SwCrsrShell::SelectTxtAttr( nWhich, false, pAttr ); + bRet = SwCrsrShell::SelectTextAttr( nWhich, false, pAttr ); } EndSelect(); return bRet; diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index afe4d925c8c2..f075de555502 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -135,7 +135,7 @@ long SwWrtShell::SelAll() // Query these early, before we move the cursor. bool bHasWholeTabSelection = HasWholeTabSelection(); - bool bIsCursorInTable = IsCrsrInTbl(); + bool bIsCursorInTable = IsCrsrInTable(); if (!bHasWholeTabSelection) { @@ -173,9 +173,9 @@ long SwWrtShell::SelAll() if (bNeedsExtendedSelectAll) { - // Disable table cursor to make sure getShellCrsr() returns m_pCurCrsr, not m_pTblCrsr. + // Disable table cursor to make sure getShellCrsr() returns m_pCurCrsr, not m_pTableCrsr. if (IsTableMode()) - TblCrsrToCursor(); + TableCrsrToCursor(); // Do the extended select all on m_pCurCrsr. ExtendedSelectAll(/*bFootnotes =*/ false); } @@ -236,13 +236,13 @@ sal_uLong SwWrtShell::SearchTempl( const OUString &rTempl, // no enhancement of existing selections if(!(eFlags & FND_IN_SEL)) ClearMark(); - SwTxtFmtColl *pColl = GetParaStyle(rTempl, SwWrtShell::GETSTYLE_CREATESOME); - SwTxtFmtColl *pReplaceColl = 0; + SwTextFormatColl *pColl = GetParaStyle(rTempl, SwWrtShell::GETSTYLE_CREATESOME); + SwTextFormatColl *pReplaceColl = 0; if( pReplTempl ) pReplaceColl = GetParaStyle(*pReplTempl, SwWrtShell::GETSTYLE_CREATESOME ); bool bCancel = false; - sal_uLong nRet = Find(pColl? *pColl: GetDfltTxtFmtColl(), + sal_uLong nRet = Find(pColl? *pColl: GetDfltTextFormatColl(), eStt,eEnd, bCancel, eFlags, pReplaceColl); if(bCancel) { @@ -578,7 +578,7 @@ void SwWrtShell::LeaveExtMode() long SwWrtShell::SttLeaveSelect(const Point *, bool ) { - if(SwCrsrShell::HasSelection() && !IsSelTblCells() && m_bClearMark) { + if(SwCrsrShell::HasSelection() && !IsSelTableCells() && m_bClearMark) { return 0; } ClearMark(); @@ -705,15 +705,15 @@ void SwWrtShell::LeaveSelFrmMode() // Description: execute framebound macro -IMPL_LINK( SwWrtShell, ExecFlyMac, void *, pFlyFmt ) +IMPL_LINK( SwWrtShell, ExecFlyMac, void *, pFlyFormat ) { - const SwFrmFmt *pFmt = pFlyFmt ? static_cast(pFlyFmt) : GetFlyFrmFmt(); - OSL_ENSURE(pFmt, "no frame format"); - const SvxMacroItem &rFmtMac = pFmt->GetMacro(); + const SwFrameFormat *pFormat = pFlyFormat ? static_cast(pFlyFormat) : GetFlyFrameFormat(); + OSL_ENSURE(pFormat, "no frame format"); + const SvxMacroItem &rFormatMac = pFormat->GetMacro(); - if(rFmtMac.HasMacro(SW_EVENT_OBJECT_SELECT)) + if(rFormatMac.HasMacro(SW_EVENT_OBJECT_SELECT)) { - const SvxMacro &rMac = rFmtMac.GetMacro(SW_EVENT_OBJECT_SELECT); + const SvxMacro &rMac = rFormatMac.GetMacro(SW_EVENT_OBJECT_SELECT); if( IsFrmSelected() ) m_bLayoutMode = true; CallChgLnk(); @@ -783,8 +783,8 @@ long SwWrtShell::BeginDrag(const Point * /*pPt*/, bool ) long SwWrtShell::DefaultDrag(const Point *, bool ) { - if( IsSelTblCells() ) - m_aSelTblLink.Call(this); + if( IsSelTableCells() ) + m_aSelTableLink.Call(this); return 1; } @@ -795,8 +795,8 @@ long SwWrtShell::DefaultEndDrag(const Point * /*pPt*/, bool ) if( IsExtSel() ) LeaveExtSel(); - if( IsSelTblCells() ) - m_aSelTblLink.Call(this); + if( IsSelTableCells() ) + m_aSelTableLink.Call(this); EndSelect(); return 1; } @@ -806,7 +806,7 @@ bool SwWrtShell::SelectTableRowCol( const Point& rPt, const Point* pEnd, bool bR { SwMvContext aMvContext(this); SttSelect(); - if(SelTblRowCol( rPt, pEnd, bRowDrag )) + if(SelTableRowCol( rPt, pEnd, bRowDrag )) { m_fnSetCrsr = &SwWrtShell::SetCrsrKillSel; m_fnKillSel = &SwWrtShell::ResetSelect; @@ -819,7 +819,7 @@ bool SwWrtShell::SelectTableRowCol( const Point& rPt, const Point* pEnd, bool bR bool SwWrtShell::SelectTableRow() { - if ( SelTblRow() ) + if ( SelTableRow() ) { m_fnSetCrsr = &SwWrtShell::SetCrsrKillSel; m_fnKillSel = &SwWrtShell::ResetSelect; @@ -830,7 +830,7 @@ bool SwWrtShell::SelectTableRow() bool SwWrtShell::SelectTableCol() { - if ( SelTblCol() ) + if ( SelTableCol() ) { m_fnSetCrsr = &SwWrtShell::SetCrsrKillSel; m_fnKillSel = &SwWrtShell::ResetSelect; @@ -841,7 +841,7 @@ bool SwWrtShell::SelectTableCol() bool SwWrtShell::SelectTableCell() { - if ( SelTblBox() ) + if ( SelTableBox() ) { m_fnSetCrsr = &SwWrtShell::SetCrsrKillSel; m_fnKillSel = &SwWrtShell::ResetSelect; @@ -863,7 +863,7 @@ int SwWrtShell::IntelligentCut(int nSelection, bool bCut) if( IsAddMode() || !(nSelection & nsSelectionType::SEL_TXT) ) return NO_WORD; - OUString sTxt; + OUString sText; CharClass& rCC = GetAppCharClass(); // If the first character is no word character, @@ -871,8 +871,8 @@ int SwWrtShell::IntelligentCut(int nSelection, bool bCut) sal_Unicode cPrev = GetChar(false); sal_Unicode cNext = GetChar(true, -1); if( !cPrev || !cNext || - !rCC.isLetterNumeric( ( sTxt = OUString(cPrev) ), 0 ) || - !rCC.isLetterNumeric( ( sTxt = OUString(cNext) ), 0 ) ) + !rCC.isLetterNumeric( ( sText = OUString(cPrev) ), 0 ) || + !rCC.isLetterNumeric( ( sText = OUString(cNext) ), 0 ) ) return NO_WORD; cPrev = GetChar(false, -1); @@ -883,8 +883,8 @@ int SwWrtShell::IntelligentCut(int nSelection, bool bCut) if(!cWord && cPrev && cNext && CH_TXTATR_BREAKWORD != cPrev && CH_TXTATR_INWORD != cPrev && CH_TXTATR_BREAKWORD != cNext && CH_TXTATR_INWORD != cNext && - !rCC.isLetterNumeric( ( sTxt = OUString(cPrev) ), 0 ) && - !rCC.isLetterNumeric( ( sTxt = OUString(cNext) ), 0 ) ) + !rCC.isLetterNumeric( ( sText = OUString(cPrev) ), 0 ) && + !rCC.isLetterNumeric( ( sText = OUString(cNext) ), 0 ) ) cWord = WORD_NO_SPACE; if(cWord == WORD_NO_SPACE && ' ' == cPrev ) diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 669b23632179..08422c796ab2 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -438,7 +438,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName // Insert object into the Core. // From ClipBoard or Insert -bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrmFmt **pFlyFrmFmt ) +bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrameFormat **pFlyFrameFormat ) { ResetCursorStack(); StartAllAction(); @@ -512,14 +512,14 @@ bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrmFm aSz.Width() = aBound.Width(); } aFrmMgr.SetSize( aSz ); - SwFlyFrmFmt *pFmt = SwFEShell::InsertObject( xRef, &aFrmMgr.GetAttrSet() ); + SwFlyFrameFormat *pFormat = SwFEShell::InsertObject( xRef, &aFrmMgr.GetAttrSet() ); // --> #i972# if ( bStarMath && mpDoc->getIDocumentSettingAccess().get( DocumentSettingId::MATH_BASELINE_ALIGNMENT ) ) AlignFormulaToBaseline( xRef.GetObject() ); - if (pFlyFrmFmt) - *pFlyFrmFmt = pFmt; + if (pFlyFrameFormat) + *pFlyFrameFormat = pFormat; if ( SotExchange::IsChart( aCLSID ) ) { @@ -615,7 +615,7 @@ void SwWrtShell::MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj, const SwRect *pFlyPrtRect, const SwRect *pFlyFrmRect, - const bool bNoTxtFrmPrtAreaChanged ) + const bool bNoTextFrmPrtAreaChanged ) { // Setting the scale of the client. This arises from the difference // between the VisArea of the object and the ObjArea. @@ -713,7 +713,7 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj, //|| SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & xObj->GetMiscStatus() // --> OD #i117189# - refine condition for non-resizable objects // non-resizable objects need to be set the size back by this method - || ( bNoTxtFrmPrtAreaChanged && nMisc & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) + || ( bNoTextFrmPrtAreaChanged && nMisc & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) { pCli = new SwOleClient( &GetView(), &GetView().GetEditWin(), xObj ); } @@ -800,11 +800,11 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj, if ( bUseObjectSize ) { // --> this moves non-resizable object so that when adding borders the baseline remains the same - const SwFlyFrmFmt *pFlyFrmFmt = dynamic_cast< const SwFlyFrmFmt * >( GetFlyFrmFmt() ); - OSL_ENSURE( pFlyFrmFmt, "Could not find fly frame." ); - if ( pFlyFrmFmt ) + const SwFlyFrameFormat *pFlyFrameFormat = dynamic_cast< const SwFlyFrameFormat * >( GetFlyFrameFormat() ); + OSL_ENSURE( pFlyFrameFormat, "Could not find fly frame." ); + if ( pFlyFrameFormat ) { - const Point &rPoint = pFlyFrmFmt->GetLastFlyFrmPrtRectPos(); + const Point &rPoint = pFlyFrameFormat->GetLastFlyFrmPrtRectPos(); SwRect aRect( pFlyPrtRect ? *pFlyPrtRect : 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. @@ -841,7 +841,7 @@ void SwWrtShell::InsertPageBreak(const OUString *pPageDesc, const ::boost::optio SwActContext aActContext(this); StartUndo(UNDO_UI_INSERT_PAGE_BREAK); - if ( !IsCrsrInTbl() ) + if ( !IsCrsrInTable() ) { if(HasSelection()) DelRight(); @@ -854,12 +854,12 @@ void SwWrtShell::InsertPageBreak(const OUString *pPageDesc, const ::boost::optio ? FindPageDescByName( *pPageDesc, true ) : 0; if( pDesc ) { - SwFmtPageDesc aDesc( pDesc ); + SwFormatPageDesc aDesc( pDesc ); aDesc.SetNumOffset( oPgNum ); SetAttrItem( aDesc ); } else - SetAttrItem( SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK) ); + SetAttrItem( SvxFormatBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK) ); EndUndo(UNDO_UI_INSERT_PAGE_BREAK); } } @@ -895,13 +895,13 @@ void SwWrtShell::InsertColumnBreak() { StartUndo(UNDO_UI_INSERT_COLUMN_BREAK); - if ( !IsCrsrInTbl() ) + if ( !IsCrsrInTable() ) { if(HasSelection()) DelRight(); SwFEShell::SplitNode( false, false ); } - SetAttrItem(SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK)); + SetAttrItem(SvxFormatBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK)); EndUndo(UNDO_UI_INSERT_COLUMN_BREAK); } @@ -923,7 +923,7 @@ void SwWrtShell::InsertFootnote(const OUString &rStr, bool bEndNote, bool bEdit ClearMark(); } SwPosition aPos = *GetCrsr()->GetPoint(); - SwFmtFtn aFootNote( bEndNote ); + SwFormatFootnote aFootNote( bEndNote ); if(!rStr.isEmpty()) aFootNote.SetNumStr( rStr ); @@ -933,7 +933,7 @@ void SwWrtShell::InsertFootnote(const OUString &rStr, bool bEndNote, bool bEdit { // For editing the footnote text. Left(CRSR_SKIP_CHARS, false, 1, false ); - GotoFtnTxt(); + GotoFootnoteText(); } m_aNavigationMgr.addEntry(aPos); } @@ -943,7 +943,7 @@ void SwWrtShell::InsertFootnote(const OUString &rStr, bool bEndNote, bool bEdit // - of deleting selected content; // - of reset of the Cursorstack if necessary. -void SwWrtShell::SplitNode( bool bAutoFmt, bool bCheckTableStart ) +void SwWrtShell::SplitNode( bool bAutoFormat, bool bCheckTableStart ) { ResetCursorStack(); if( CanInsert() ) @@ -958,7 +958,7 @@ void SwWrtShell::SplitNode( bool bAutoFmt, bool bCheckTableStart ) DelRight(); } - SwFEShell::SplitNode( bAutoFmt, bCheckTableStart ); + SwFEShell::SplitNode( bAutoFormat, bCheckTableStart ); if( bHasSel ) EndUndo( UNDO_INSERT ); } @@ -970,7 +970,7 @@ void SwWrtShell::SplitNode( bool bAutoFmt, bool bCheckTableStart ) // into a number and less than nMaxRules. // To test the CharFormats at the numbering -// external void SetNumChrFmt( SwWrtShell*, SwNumRules& ); +// external void SetNumChrFormat( SwWrtShell*, SwNumRules& ); // -> #i40041# // Preconditions (as far as OD has figured out): @@ -994,7 +994,7 @@ void SwWrtShell::NumOrBulletOn(bool bNum) bool bContinueFoundNumRule( false ); bool bActivateOutlineRule( false ); int nActivateOutlineLvl( MAXLEVEL ); // only relevant, if == true - SwTxtFmtColl * pColl = GetCurTxtFmtColl(); + SwTextFormatColl * pColl = GetCurTextFormatColl(); if ( pColl ) { // retrieve numbering rule at paragraph @@ -1028,9 +1028,9 @@ void SwWrtShell::NumOrBulletOn(bool bNum) // check, if text node at current cursor positioned is counted. // If not, let it been counted. Then it has to be checked, // of the outline numbering has to be activated or continued. - SwTxtNode* pTxtNode = - GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode(); - if ( pTxtNode && !pTxtNode->IsCountedInList() ) + SwTextNode* pTextNode = + GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode(); + if ( pTextNode && !pTextNode->IsCountedInList() ) { // check, if numbering of the outline level of the paragraph // style is active. If not, activate this outline level. @@ -1135,14 +1135,14 @@ void SwWrtShell::NumOrBulletOn(bool bNum) // do not change found numbering/bullet rule, if it should only be continued. if ( !bContinueFoundNumRule ) { - SwTxtNode * pTxtNode = GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode(); + SwTextNode * pTextNode = GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode(); - if (pTxtNode) + if (pTextNode) { // use above retrieve outline level, if outline numbering has to be activated. int nLevel = bActivateOutlineRule ? nActivateOutlineLvl - : pTxtNode->GetActualListLevel(); + : pTextNode->GetActualListLevel(); if (nLevel < 0) nLevel = 0; @@ -1150,25 +1150,25 @@ void SwWrtShell::NumOrBulletOn(bool bNum) if (nLevel >= MAXLEVEL) nLevel = MAXLEVEL - 1; - SwNumFmt aFmt(aNumRule.Get(static_cast(nLevel))); + SwNumFormat aFormat(aNumRule.Get(static_cast(nLevel))); if (bNum) - aFmt.SetNumberingType(SVX_NUM_ARABIC); + aFormat.SetNumberingType(SVX_NUM_ARABIC); else { // #i63395# Only apply user defined default bullet font if ( numfunc::IsDefBulletFontUserDefined() ) { const vcl::Font* pFnt = &numfunc::GetDefBulletFont(); - aFmt.SetBulletFont( pFnt ); + aFormat.SetBulletFont( pFnt ); } - aFmt.SetBulletChar( numfunc::GetBulletChar(static_cast(nLevel))); - aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); + aFormat.SetBulletChar( numfunc::GetBulletChar(static_cast(nLevel))); + aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL); // #i93908# clear suffix for bullet lists - aFmt.SetPrefix(OUString()); - aFmt.SetSuffix(OUString()); + aFormat.SetPrefix(OUString()); + aFormat.SetSuffix(OUString()); } - aNumRule.Set(static_cast(nLevel), aFmt); + aNumRule.Set(static_cast(nLevel), aFormat); } } @@ -1182,7 +1182,7 @@ void SwWrtShell::NumOrBulletOn(bool bNum) numfunc::GetDefaultPositionAndSpaceMode() ); SwNumRule aNumRule( GetUniqueNumRuleName(), ePosAndSpaceMode ); // Append the character template at the numbering. - SwCharFmt* pChrFmt; + SwCharFormat* pChrFormat; SwDocShell* pDocSh = GetView().GetDocShell(); // #i63395# // Only apply user defined default bullet font @@ -1192,16 +1192,16 @@ void SwWrtShell::NumOrBulletOn(bool bNum) if (bNum) { - pChrFmt = GetCharFmtFromPool( RES_POOLCHR_NUM_LEVEL ); + pChrFormat = GetCharFormatFromPool( RES_POOLCHR_NUM_LEVEL ); } else { - pChrFmt = GetCharFmtFromPool( RES_POOLCHR_BUL_LEVEL ); + pChrFormat = GetCharFormatFromPool( RES_POOLCHR_BUL_LEVEL ); } - const SwTxtNode* pTxtNode = GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode(); - const SwTwips nWidthOfTabs = pTxtNode - ? pTxtNode->GetWidthOfLeadingTabs() + const SwTextNode* pTextNode = GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode(); + const SwTwips nWidthOfTabs = pTextNode + ? pTextNode->GetWidthOfLeadingTabs() : 0; GetDoc()->getIDocumentContentOperations().RemoveLeadingWhiteSpace( *GetCrsr()->GetPoint() ); @@ -1209,8 +1209,8 @@ void SwWrtShell::NumOrBulletOn(bool bNum) const bool bRightToLeft = IsInRightToLeftText(); for( sal_uInt8 nLvl = 0; nLvl < MAXLEVEL; ++nLvl ) { - SwNumFmt aFmt( aNumRule.Get( nLvl ) ); - aFmt.SetCharFmt( pChrFmt ); + SwNumFormat aFormat( aNumRule.Get( nLvl ) ); + aFormat.SetCharFormat( pChrFormat ); if (! bNum) { @@ -1218,13 +1218,13 @@ void SwWrtShell::NumOrBulletOn(bool bNum) // Only apply user defined default bullet font if ( pFnt ) { - aFmt.SetBulletFont( pFnt ); + aFormat.SetBulletFont( pFnt ); } - aFmt.SetBulletChar( numfunc::GetBulletChar(nLvl) ); - aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); + aFormat.SetBulletChar( numfunc::GetBulletChar(nLvl) ); + aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL); // #i93908# clear suffix for bullet lists - aFmt.SetPrefix(OUString()); - aFmt.SetSuffix(OUString()); + aFormat.SetPrefix(OUString()); + aFormat.SetSuffix(OUString()); } // #i95907# @@ -1233,11 +1233,11 @@ void SwWrtShell::NumOrBulletOn(bool bNum) if(bHtml && nLvl) { // 1/2" for HTML - aFmt.SetAbsLSpace(nLvl * 720); + aFormat.SetAbsLSpace(nLvl * 720); } else if ( nWidthOfTabs > 0 ) { - aFmt.SetAbsLSpace(nWidthOfTabs + nLvl * 720); + aFormat.SetAbsLSpace(nWidthOfTabs + nLvl * 720); } } @@ -1245,28 +1245,28 @@ void SwWrtShell::NumOrBulletOn(bool bNum) // numbering/bullet should be rtl in rtl paragraph: if ( bRightToLeft ) { - aFmt.SetNumAdjust( SVX_ADJUST_RIGHT ); + aFormat.SetNumAdjust( SVX_ADJUST_RIGHT ); } - aNumRule.Set( nLvl, aFmt ); + aNumRule.Set( nLvl, aFormat ); } // #i95907# - if ( pTxtNode && + if ( pTextNode && ePosAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT ) { - const SwTwips nTxtNodeIndent = pTxtNode->GetAdditionalIndentForStartingNewList(); - if ( ( nTxtNodeIndent + nWidthOfTabs ) != 0 ) + const SwTwips nTextNodeIndent = pTextNode->GetAdditionalIndentForStartingNewList(); + if ( ( nTextNodeIndent + nWidthOfTabs ) != 0 ) { // #i111172#/fdo#85666 // If text node is already inside a list, assure that the indents // are the same. Thus, adjust the indent change value by subtracting // indents of to be applied list style. - SwTwips nIndentChange = nTxtNodeIndent + nWidthOfTabs; - if ( pTxtNode->GetNumRule() ) + SwTwips nIndentChange = nTextNodeIndent + nWidthOfTabs; + if ( pTextNode->GetNumRule() ) { - int nLevel = pTxtNode->GetActualListLevel(); + int nLevel = pTextNode->GetActualListLevel(); if (nLevel < 0) nLevel = 0; @@ -1274,10 +1274,10 @@ void SwWrtShell::NumOrBulletOn(bool bNum) if (nLevel >= MAXLEVEL) nLevel = MAXLEVEL - 1; - const SwNumFmt aFmt( aNumRule.Get( nLevel ) ); - if ( aFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT ) + const SwNumFormat aFormat( aNumRule.Get( nLevel ) ); + if ( aFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT ) { - nIndentChange -= aFmt.GetIndentAt() + aFmt.GetFirstLineIndent(); + nIndentChange -= aFormat.GetIndentAt() + aFormat.GetFirstLineIndent(); } } aNumRule.ChangeIndent( nIndentChange ); @@ -1307,12 +1307,12 @@ void SwWrtShell::NumOrBulletOff() { SwNumRule aNumRule(*pCurNumRule); - SwTxtNode * pTxtNode = - GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode(); + SwTextNode * pTextNode = + GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode(); - if (pTxtNode) + if (pTextNode) { - int nLevel = pTxtNode->GetActualListLevel(); + int nLevel = pTextNode->GetActualListLevel(); if (nLevel < 0) nLevel = 0; @@ -1320,10 +1320,10 @@ void SwWrtShell::NumOrBulletOff() if (nLevel >= MAXLEVEL) nLevel = MAXLEVEL - 1; - SwNumFmt aFmt(aNumRule.Get(static_cast(nLevel))); + SwNumFormat aFormat(aNumRule.Get(static_cast(nLevel))); - aFmt.SetNumberingType(SVX_NUM_NUMBER_NONE); - aNumRule.Set(nLevel, aFmt); + aFormat.SetNumberingType(SVX_NUM_NUMBER_NONE); + aNumRule.Set(nLevel, aFormat); // no start or continuation of a list - the outline style is only changed. SetCurNumRule( aNumRule, false ); @@ -1408,7 +1408,7 @@ SelectionType SwWrtShell::GetSelectionType() const return nsSelectionType::SEL_FRM; } - if ( IsCrsrInTbl() ) + if ( IsCrsrInTable() ) nCnt |= nsSelectionType::SEL_TBL; if ( IsTableMode() ) @@ -1418,12 +1418,12 @@ SelectionType SwWrtShell::GetSelectionType() const const SwNumRule* pNumRule = GetNumRuleAtCurrCrsrPos(); if ( pNumRule ) { - const SwTxtNode* pTxtNd = - GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode(); + const SwTextNode* pTextNd = + GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode(); - if ( pTxtNd && pTxtNd->IsInList() ) + if ( pTextNd && pTextNd->IsInList() ) { - int nLevel = pTxtNd->GetActualListLevel(); + int nLevel = pTextNd->GetActualListLevel(); if (nLevel < 0) nLevel = 0; @@ -1431,8 +1431,8 @@ SelectionType SwWrtShell::GetSelectionType() const if (nLevel >= MAXLEVEL) nLevel = MAXLEVEL - 1; - const SwNumFmt& rFmt = pNumRule->Get(nLevel); - if ( SVX_NUM_NUMBER_NONE != rFmt.GetNumberingType() ) + const SwNumFormat& rFormat = pNumRule->Get(nLevel); + if ( SVX_NUM_NUMBER_NONE != rFormat.GetNumberingType() ) nCnt |= nsSelectionType::SEL_NUM; } } @@ -1445,14 +1445,14 @@ SelectionType SwWrtShell::GetSelectionType() const // text collection with this name exists, or // this is a default template. -SwTxtFmtColl *SwWrtShell::GetParaStyle(const OUString &rCollName, GetStyle eCreate ) +SwTextFormatColl *SwWrtShell::GetParaStyle(const OUString &rCollName, GetStyle eCreate ) { - SwTxtFmtColl* pColl = FindTxtFmtCollByName( rCollName ); + SwTextFormatColl* pColl = FindTextFormatCollByName( rCollName ); if( !pColl && GETSTYLE_NOCREATE != eCreate ) { sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( rCollName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL ); if( USHRT_MAX != nId || GETSTYLE_CREATEANY == eCreate ) - pColl = GetTxtCollFromPool( nId ); + pColl = GetTextCollFromPool( nId ); } return pColl; } @@ -1462,31 +1462,31 @@ SwTxtFmtColl *SwWrtShell::GetParaStyle(const OUString &rCollName, GetStyle eCrea // character template with this name exists, or // this is a default template or template is automatic. -SwCharFmt *SwWrtShell::GetCharStyle(const OUString &rFmtName, GetStyle eCreate ) +SwCharFormat *SwWrtShell::GetCharStyle(const OUString &rFormatName, GetStyle eCreate ) { - SwCharFmt* pFmt = FindCharFmtByName( rFmtName ); - if( !pFmt && GETSTYLE_NOCREATE != eCreate ) + SwCharFormat* pFormat = FindCharFormatByName( rFormatName ); + if( !pFormat && GETSTYLE_NOCREATE != eCreate ) { - sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( rFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ); + sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( rFormatName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ); if( USHRT_MAX != nId || GETSTYLE_CREATEANY == eCreate ) - pFmt = static_cast(GetFmtFromPool( nId )); + pFormat = static_cast(GetFormatFromPool( nId )); } - return pFmt; + return pFormat; } -// Find the table format with the name rFmtname +// Find the table format with the name rFormatname // Returns: Pointer at the collection or 0, if no // frame format with this name exists or // this is a default format or the format is automatic. -SwFrmFmt *SwWrtShell::GetTblStyle(const OUString &rFmtName) +SwFrameFormat *SwWrtShell::GetTableStyle(const OUString &rFormatName) { - for( size_t i = GetTblFrmFmtCount(); i; ) + for( size_t i = GetTableFrameFormatCount(); i; ) { - SwFrmFmt *pFmt = &GetTblFrmFmt( --i ); - if( !pFmt->IsDefault() && - pFmt->GetName() == rFmtName && IsUsed( *pFmt ) ) - return pFmt; + SwFrameFormat *pFormat = &GetTableFrameFormat( --i ); + if( !pFormat->IsDefault() && + pFormat->GetName() == rFormatName && IsUsed( *pFormat ) ) + return pFormat; } return 0; } @@ -1519,18 +1519,18 @@ OUString SwWrtShell::GetCurPageStyle( const bool bCalcFrm ) const void SwWrtShell::QuickUpdateStyle() { - SwTxtFmtColl *pColl = GetCurTxtFmtColl(); + SwTextFormatColl *pColl = GetCurTextFormatColl(); // Default cannot be changed if(pColl && !pColl->IsDefault()) { FillByEx(pColl); // Also apply the template to remove hard attribute assignment. - SetTxtFmtColl(pColl); + SetTextFormatColl(pColl); } } -void SwWrtShell::AutoUpdatePara(SwTxtFmtColl* pColl, const SfxItemSet& rStyleSet, SwPaM* pPaM ) +void SwWrtShell::AutoUpdatePara(SwTextFormatColl* pColl, const SfxItemSet& rStyleSet, SwPaM* pPaM ) { SwPaM* pCrsr = pPaM ? pPaM : GetCrsr( ); SfxItemSet aCoreSet( GetAttrPool(), @@ -1568,16 +1568,16 @@ void SwWrtShell::AutoUpdatePara(SwTxtFmtColl* pColl, const SfxItemSet& rStyleSet ResetAttr( std::set(), pCrsr ); SetAttrSet(aCoreSet, SetAttrMode::DEFAULT, pCrsr); } - mpDoc->ChgFmt(*pColl, rStyleSet ); + mpDoc->ChgFormat(*pColl, rStyleSet ); EndAction(); } -void SwWrtShell::AutoUpdateFrame( SwFrmFmt* pFmt, const SfxItemSet& rStyleSet ) +void SwWrtShell::AutoUpdateFrame( SwFrameFormat* pFormat, const SfxItemSet& rStyleSet ) { StartAction(); ResetFlyFrmAttr( 0, &rStyleSet ); - pFmt->SetFmtAttr( rStyleSet ); + pFormat->SetFormatAttr( rStyleSet ); EndAction(); } @@ -1709,10 +1709,10 @@ OUString SwWrtShell::GetSelDescr() const break; case nsSelectionType::SEL_FRM: { - const SwFrmFmt * pFrmFmt = GetCurFrmFmt(); + const SwFrameFormat * pFrameFormat = GetCurFrameFormat(); - if (pFrmFmt) - aResult = pFrmFmt->GetDescription(); + if (pFrameFormat) + aResult = pFrameFormat->GetDescription(); } break; case nsSelectionType::SEL_DRW: @@ -1782,18 +1782,18 @@ void SwWrtShell::ChangeHeaderOrFooter( if( bExecute ) { bChgd = true; - SwFrmFmt &rMaster = aDesc.GetMaster(); + SwFrameFormat &rMaster = aDesc.GetMaster(); if(bHeader) - rMaster.SetFmtAttr( SwFmtHeader( bOn )); + rMaster.SetFormatAttr( SwFormatHeader( bOn )); else - rMaster.SetFmtAttr( SwFmtFooter( bOn )); + rMaster.SetFormatAttr( SwFormatFooter( bOn )); if( bOn ) { SvxULSpaceItem aUL(bHeader ? 0 : MM50, bHeader ? MM50 : 0, RES_UL_SPACE ); - SwFrmFmt* pFmt = bHeader ? - const_cast(rMaster.GetHeader().GetHeaderFmt()) : - const_cast(rMaster.GetFooter().GetFooterFmt()); - pFmt->SetFmtAttr( aUL ); + SwFrameFormat* pFormat = bHeader ? + const_cast(rMaster.GetHeader().GetHeaderFormat()) : + const_cast(rMaster.GetFooter().GetFooterFormat()); + pFormat->SetFormatAttr( aUL ); } } if( bChgd ) diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index b9cf0f6957f9..685fa8f04bbb 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -68,7 +68,7 @@ #include -void SwWrtShell::Insert(SwField &rFld) +void SwWrtShell::Insert(SwField &rField) { ResetCursorStack(); if(!CanInsert()) @@ -76,7 +76,7 @@ void SwWrtShell::Insert(SwField &rFld) StartAllAction(); SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, rFld.GetDescription()); + aRewriter.AddRule(UndoArg1, rField.GetDescription()); StartUndo(UNDO_INSERT, &aRewriter); @@ -84,15 +84,15 @@ void SwWrtShell::Insert(SwField &rFld) boost::scoped_ptr pAnnotationTextRange; if ( HasSelection() ) { - if ( rFld.GetTyp()->Which() == RES_POSTITFLD ) + if ( rField.GetTyp()->Which() == RES_POSTITFLD ) { // for annotation fields: // - keep the current selection in order to create a corresponding annotation mark // - collapse cursor to its end if ( IsTableMode() ) { - GetTblCrs()->Normalize( false ); - const SwPosition rStartPos( *(GetTblCrs()->GetMark()->nNode.GetNode().GetCntntNode()), 0 ); + GetTableCrs()->Normalize( false ); + const SwPosition rStartPos( *(GetTableCrs()->GetMark()->nNode.GetNode().GetContentNode()), 0 ); KillPams(); if ( !IsEndOfPara() ) { @@ -115,7 +115,7 @@ void SwWrtShell::Insert(SwField &rFld) } } - SwEditShell::Insert2(rFld, bDeleted); + SwEditShell::Insert2(rField, bDeleted); if ( pAnnotationTextRange ) { @@ -133,7 +133,7 @@ void SwWrtShell::Insert(SwField &rFld) // Start the field update -void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst ) +void SwWrtShell::UpdateInputFields( SwInputFieldList* pLst ) { // Go through the list of fields and updating SwInputFieldList* pTmp = pLst; @@ -152,14 +152,14 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst ) pTmp->GotoFieldPos( i ); SwField* pField = pTmp->GetField( i ); if(pField->GetTyp()->Which() == RES_DROPDOWN) - bCancel = StartDropDownFldDlg( pField, true, &aDlgPos ); + bCancel = StartDropDownFieldDlg( pField, true, &aDlgPos ); else - bCancel = StartInputFldDlg( pField, true, 0, &aDlgPos); + bCancel = StartInputFieldDlg( pField, true, 0, &aDlgPos); if (!bCancel) { // Otherwise update error at multi-selection: - pTmp->GetField( i )->GetTyp()->UpdateFlds(); + pTmp->GetField( i )->GetTyp()->UpdateFields(); } } pTmp->PopCrsr(); @@ -171,39 +171,39 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst ) // Listener class: will close InputField dialog if input field(s) // is(are) deleted (for instance, by an extension) after the dialog shows up. -// Otherwise, the for loop in SwWrtShell::UpdateInputFlds will crash when doing: -// 'pTmp->GetField( i )->GetTyp()->UpdateFlds();' +// Otherwise, the for loop in SwWrtShell::UpdateInputFields will crash when doing: +// 'pTmp->GetField( i )->GetTyp()->UpdateFields();' // on a deleted field. class FieldDeletionModify : public SwModify { public: - FieldDeletionModify(AbstractFldInputDlg* pInputFieldDlg, SwField* pFld) + FieldDeletionModify(AbstractFieldInputDlg* pInputFieldDlg, SwField* pField) : mpInputFieldDlg(pInputFieldDlg) - , mpFmtFld(NULL) + , mpFormatField(NULL) { - SwInputField *const pInputField(dynamic_cast(pFld)); - SwSetExpField *const pSetExpFld(dynamic_cast(pFld)); + SwInputField *const pInputField(dynamic_cast(pField)); + SwSetExpField *const pSetExpField(dynamic_cast(pField)); - if (pInputField && pInputField->GetFmtFld()) + if (pInputField && pInputField->GetFormatField()) { - mpFmtFld = pInputField->GetFmtFld(); + mpFormatField = pInputField->GetFormatField(); } - else if (pSetExpFld && pSetExpFld->GetFmtFld()) + else if (pSetExpField && pSetExpField->GetFormatField()) { - mpFmtFld = pSetExpFld->GetFmtFld(); + mpFormatField = pSetExpField->GetFormatField(); } // Register for possible field deletion while dialog is open - if (mpFmtFld) - mpFmtFld->Add(this); + if (mpFormatField) + mpFormatField->Add(this); } virtual ~FieldDeletionModify() { - if (mpFmtFld) + if (mpFormatField) { // Dialog closed, remove modification listener - mpFmtFld->Remove(this); + mpFormatField->Remove(this); } } @@ -216,25 +216,25 @@ class FieldDeletionModify : public SwModify { case RES_REMOVE_UNO_OBJECT: case RES_OBJECTDYING: - mpFmtFld = NULL; + mpFormatField = NULL; mpInputFieldDlg->EndDialog(RET_CANCEL); break; } } } private: - AbstractFldInputDlg* mpInputFieldDlg; - SwFmtFld* mpFmtFld; + AbstractFieldInputDlg* mpInputFieldDlg; + SwFormatField* mpFormatField; }; // Start input dialog for a specific field -bool SwWrtShell::StartInputFldDlg( SwField* pFld, bool bNextButton, +bool SwWrtShell::StartInputFieldDlg( SwField* pField, bool bNextButton, vcl::Window* pParentWin, OString* pWindowState ) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialog creation failed!"); - boost::scoped_ptr pDlg(pFact->CreateFldInputDlg(pParentWin, *this, pFld, bNextButton)); + boost::scoped_ptr pDlg(pFact->CreateFieldInputDlg(pParentWin, *this, pField, bNextButton)); OSL_ENSURE(pDlg, "Dialog creation failed!"); if(pWindowState && !pWindowState->isEmpty()) pDlg->SetWindowState(*pWindowState); @@ -242,7 +242,7 @@ bool SwWrtShell::StartInputFldDlg( SwField* pFld, bool bNextButton, bool bRet; { - FieldDeletionModify aModify(pDlg.get(), pFld); + FieldDeletionModify aModify(pDlg.get(), pField); bRet = RET_CANCEL == pDlg->Execute(); } @@ -254,12 +254,12 @@ bool SwWrtShell::StartInputFldDlg( SwField* pFld, bool bNextButton, return bRet; } -bool SwWrtShell::StartDropDownFldDlg(SwField* pFld, bool bNextButton, OString* pWindowState) +bool SwWrtShell::StartDropDownFieldDlg(SwField* pField, bool bNextButton, OString* pWindowState) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - boost::scoped_ptr pDlg(pFact->CreateDropDownFieldDialog(NULL, *this, pFld, bNextButton)); + boost::scoped_ptr pDlg(pFact->CreateDropDownFieldDialog(NULL, *this, pField, bNextButton)); OSL_ENSURE(pDlg, "Dialog creation failed!"); if(pWindowState && !pWindowState->isEmpty()) pDlg->SetWindowState(*pWindowState); @@ -315,10 +315,10 @@ bool SwWrtShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet) // handler for click on the field given as parameter. // the cursor is positioned on the field. -void SwWrtShell::ClickToField( const SwField& rFld ) +void SwWrtShell::ClickToField( const SwField& rField ) { // cross reference field must not be selected because it moves the cursor - if (RES_GETREFFLD != rFld.GetTyp()->Which()) + if (RES_GETREFFLD != rField.GetTyp()->Which()) { StartAllAction(); Right( CRSR_SKIP_CHARS, true, 1, false ); // Select the field. @@ -327,12 +327,12 @@ void SwWrtShell::ClickToField( const SwField& rFld ) } m_bIsInClickToEdit = true; - switch( rFld.GetTyp()->Which() ) + switch( rField.GetTyp()->Which() ) { case RES_JUMPEDITFLD: { sal_uInt16 nSlotId = 0; - switch( rFld.GetFormat() ) + switch( rField.GetFormat() ) { case JE_FMT_TABLE: nSlotId = FN_INSERT_TABLE; @@ -361,17 +361,17 @@ void SwWrtShell::ClickToField( const SwField& rFld ) case RES_MACROFLD: { - const SwMacroField *pFld = static_cast(&rFld); - const OUString sText( rFld.GetPar2() ); + const SwMacroField *pField = static_cast(&rField); + const OUString sText( rField.GetPar2() ); OUString sRet( sText ); - ExecMacro( pFld->GetSvxMacro(), &sRet ); + ExecMacro( pField->GetSvxMacro(), &sRet ); // return value changed? if( sRet != sText ) { StartAllAction(); - const_cast(rFld).SetPar2( sRet ); - rFld.GetTyp()->UpdateFlds(); + const_cast(rField).SetPar2( sRet ); + rField.GetTyp()->UpdateFields(); EndAllAction(); } } @@ -379,37 +379,37 @@ void SwWrtShell::ClickToField( const SwField& rFld ) case RES_GETREFFLD: StartAllAction(); - SwCrsrShell::GotoRefMark( static_cast(rFld).GetSetRefName(), - static_cast(rFld).GetSubType(), - static_cast(rFld).GetSeqNo() ); + SwCrsrShell::GotoRefMark( static_cast(rField).GetSetRefName(), + static_cast(rField).GetSubType(), + static_cast(rField).GetSeqNo() ); EndAllAction(); break; case RES_INPUTFLD: { - const SwInputField* pInputField = dynamic_cast(&rFld); + const SwInputField* pInputField = dynamic_cast(&rField); if ( pInputField == NULL ) { - StartInputFldDlg( const_cast(&rFld), false ); + StartInputFieldDlg( const_cast(&rField), false ); } } break; case RES_SETEXPFLD: - if( static_cast(rFld).GetInputFlag() ) - StartInputFldDlg( const_cast(&rFld), false ); + if( static_cast(rField).GetInputFlag() ) + StartInputFieldDlg( const_cast(&rField), false ); break; case RES_DROPDOWN : - StartDropDownFldDlg( const_cast(&rFld), false ); + StartDropDownFieldDlg( const_cast(&rField), false ); break; default: - SAL_WARN_IF(rFld.IsClickable(), "sw", "unhandled clickable field!"); + SAL_WARN_IF(rField.IsClickable(), "sw", "unhandled clickable field!"); } m_bIsInClickToEdit = false; } -void SwWrtShell::ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter ) +void SwWrtShell::ClickToINetAttr( const SwFormatINetFormat& rItem, sal_uInt16 nFilter ) { if( rItem.GetValue().isEmpty() ) return ; @@ -427,11 +427,11 @@ void SwWrtShell::ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter // So that the implementation of templates is displayed immediately ::LoadURL( *this, rItem.GetValue(), nFilter, rItem.GetTargetFrame() ); - const SwTxtINetFmt* pTxtAttr = rItem.GetTxtINetFmt(); - if( pTxtAttr ) + const SwTextINetFormat* pTextAttr = rItem.GetTextINetFormat(); + if( pTextAttr ) { - const_cast(pTxtAttr)->SetVisited( true ); - const_cast(pTxtAttr)->SetVisitedValid( true ); + const_cast(pTextAttr)->SetVisited( true ); + const_cast(pTextAttr)->SetVisitedValid( true ); } m_bIsInClickToEdit = false; @@ -442,7 +442,7 @@ bool SwWrtShell::ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter ) bool bRet = false; OUString sURL; OUString sTargetFrameName; - const SwFrmFmt* pFnd = IsURLGrfAtPos( rDocPt, &sURL, &sTargetFrameName ); + const SwFrameFormat* pFnd = IsURLGrfAtPos( rDocPt, &sURL, &sTargetFrameName ); if( pFnd && !sURL.isEmpty() ) { bRet = true; @@ -548,8 +548,8 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk, } } } - SwFmtINetFmt aFmt( sURL, OUString() ); - InsertURL( aFmt, rBkmk.GetDescription() ); + SwFormatINetFormat aFormat( sURL, OUString() ); + InsertURL( aFormat, rBkmk.GetDescription() ); } else { @@ -580,7 +580,7 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk, DoUndo(false); } } - UpdateSection( GetSectionFmtPos( *pIns->GetFmt() ), aSection ); + UpdateSection( GetSectionFormatPos( *pIns->GetFormat() ), aSection ); DoUndo( bDoesUndo ); } } diff --git a/sw/source/uibase/wrtsh/wrtsh3.cxx b/sw/source/uibase/wrtsh/wrtsh3.cxx index 0f97fbce9e52..a3ef19ea5a5f 100644 --- a/sw/source/uibase/wrtsh/wrtsh3.cxx +++ b/sw/source/uibase/wrtsh/wrtsh3.cxx @@ -67,11 +67,11 @@ bool SwWrtShell::MoveBookMark( BookMarkMove eFuncId, const ::sw::mark::IMark* co return bRet; } -bool SwWrtShell::GotoField( const SwFmtFld& rFld ) +bool SwWrtShell::GotoField( const SwFormatField& rField ) { (this->*m_fnKillSel)( 0, false ); - bool bRet = SwCrsrShell::GotoFld( rFld ); + bool bRet = SwCrsrShell::GotoFormatField( rField ); if( bRet && IsSelFrmMode() ) { UnSelectFrm(); -- cgit