diff options
Diffstat (limited to 'sw/source/ui/index')
| -rw-r--r-- | sw/source/ui/index/cntex.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/index/cnttab.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/index/swuiidxmrk.cxx | 22 |
3 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 16ae310b60ae..68ce58fd0c36 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -172,7 +172,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( throw uno::RuntimeException(); uno::Reference< text::XTextRange > xAnchor = pxIndexSectionsArr[nTOXIndex]->xContainerSection->getAnchor(); xAnchor = xAnchor->getStart(); - uno::Reference< text::XTextCursor > xCrsr = xAnchor->getText()->createTextCursorByRange(xAnchor); + uno::Reference< text::XTextCursor > xCursor = xAnchor->getText()->createTextCursorByRange(xAnchor); uno::Reference< lang::XMultiServiceFactory > xFact(xModel, uno::UNO_QUERY); @@ -180,8 +180,8 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( nTOXIndex <= TOX_AUTHORITIES ? nTOXIndex : TOX_USER] )); pxIndexSectionsArr[nTOXIndex]->xDocumentIndex.set(xFact->createInstance(sIndexTypeName), uno::UNO_QUERY); uno::Reference< text::XTextContent > xContent(pxIndexSectionsArr[nTOXIndex]->xDocumentIndex, uno::UNO_QUERY); - uno::Reference< text::XTextRange > xRg(xCrsr, uno::UNO_QUERY); - xCrsr->getText()->insertTextContent(xRg, xContent, sal_False); + uno::Reference< text::XTextRange > xRg(xCursor, uno::UNO_QUERY); + xCursor->getText()->insertTextContent(xRg, xContent, sal_False); } for(sal_uInt16 i = 0 ; i <= TOX_AUTHORITIES; i++) { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index b0b938ef575c..3823b67dc3fd 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -364,7 +364,7 @@ void SwMultiTOXTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } else if(nId == m_nColumnId) { - const SwFormatFrmSize& rSize = static_cast<const SwFormatFrmSize&>(GetInputSetImpl()->Get(RES_FRM_SIZE)); + const SwFormatFrameSize& rSize = static_cast<const SwFormatFrameSize&>(GetInputSetImpl()->Get(RES_FRM_SIZE)); static_cast<SwColumnPage&>(rPage).SetPageWidth(rSize.GetWidth()); } diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 9acc2be6a841..e11ae70fdf1b 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -214,7 +214,7 @@ void SwIndexMarkPane::InitControls() // only if there are more than one // if equal it lands at the same entry - pSh->SttCrsrMove(); + pSh->SttCursorMove(); const SwTOXMark* pMoveMark; bool bShow = false; @@ -247,7 +247,7 @@ void SwIndexMarkPane::InitControls() m_pNextSameBT->Show(); m_pPrevSameBT->Show(); } - pSh->EndCrsrMove(); + pSh->EndCursorMove(); m_pTypeFT->Show(); @@ -258,7 +258,7 @@ void SwIndexMarkPane::InitControls() } else { // display current selection (first element) ???? - if (pSh->GetCrsrCnt() < 2) + if (pSh->GetCursorCnt() < 2) { bSelected = !pSh->HasSelection(); aOrgStr = pSh->GetView().GetSelectionTextParam(true, false); @@ -266,12 +266,12 @@ void SwIndexMarkPane::InitControls() //to include all equal entries may only be allowed in the body and even there //only when a simple selection exists - const FrmTypeFlags nFrmType = pSh->GetFrmType(nullptr,true); + const FrameTypeFlags nFrameType = pSh->GetFrameType(nullptr,true); m_pApplyToAllCB->Show(); m_pSearchCaseSensitiveCB->Show(); m_pSearchCaseWordOnlyCB->Show(); m_pApplyToAllCB->Enable(!aOrgStr.isEmpty() && - !(nFrmType & ( FrmTypeFlags::HEADER | FrmTypeFlags::FOOTER | FrmTypeFlags::FLY_ANY ))); + !(nFrameType & ( FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER | FrameTypeFlags::FLY_ANY ))); SearchTypeHdl(m_pApplyToAllCB); } @@ -346,7 +346,7 @@ void SwIndexMarkPane::Activate() // display current selection (first element) ???? if(bNewMark) { - if (pSh->GetCrsrCnt() < 2) + if (pSh->GetCursorCnt() < 2) { bSelected = !pSh->HasSelection(); aOrgStr = pSh->GetView().GetSelectionTextParam(true, false); @@ -354,12 +354,12 @@ void SwIndexMarkPane::Activate() //to include all equal entries may only be allowed in the body and even there //only when a simple selection exists - const FrmTypeFlags nFrmType = pSh->GetFrmType(nullptr,true); + const FrameTypeFlags nFrameType = pSh->GetFrameType(nullptr,true); m_pApplyToAllCB->Show(); m_pSearchCaseSensitiveCB->Show(); m_pSearchCaseWordOnlyCB->Show(); m_pApplyToAllCB->Enable(!aOrgStr.isEmpty() && - !(nFrmType & ( FrmTypeFlags::HEADER | FrmTypeFlags::FOOTER | FrmTypeFlags::FLY_ANY ))); + !(nFrameType & ( FrameTypeFlags::HEADER | FrameTypeFlags::FOOTER | FrameTypeFlags::FLY_ANY ))); SearchTypeHdl(m_pApplyToAllCB); } ModifyHdl(m_pTypeDCB); @@ -700,7 +700,7 @@ void SwIndexMarkPane::ModifyHdl(Control* pBox) m_pPhoneticED0->Enable(bHasText&&bIsPhoneticReadingEnabled); } m_pOKBT->Enable(!pSh->HasReadonlySel() && - (!m_pEntryED->GetText().isEmpty() || pSh->GetCrsrCnt(false))); + (!m_pEntryED->GetText().isEmpty() || pSh->GetCursorCnt(false))); } IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, NextHdl, Button*, void) @@ -808,7 +808,7 @@ void SwIndexMarkPane::UpdateDialog() m_pTypeDCB->SelectEntry(pMark->GetTOXType()->GetTypeName()); // set Next - Prev - Buttons - pSh->SttCrsrMove(); + pSh->SttCursorMove(); if( m_pPrevBT->IsVisible() ) { const SwTOXMark* pMoveMark = &pSh->GotoTOXMark( *pMark, TOX_PRV ); @@ -845,7 +845,7 @@ void SwIndexMarkPane::UpdateDialog() // we need the point at the start of the attribute pSh->SwapPam(); - pSh->EndCrsrMove(); + pSh->EndCursorMove(); } // Remind whether the edit boxes for Phonetic reading are changed manually |