summaryrefslogtreecommitdiff
path: root/sw/source/core/unocore/unotbl.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/unocore/unotbl.cxx')
-rw-r--r--sw/source/core/unocore/unotbl.cxx430
1 files changed, 215 insertions, 215 deletions
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index ac526d230538..6f93d125fd97 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -207,7 +207,7 @@ static void lcl_SetSpecialProperty(SwFrameFormat* pFormat,
case FN_TABLE_WIDTH:
case FN_TABLE_RELATIVE_WIDTH:
{
- SwFormatFrmSize aSz( pFormat->GetFrmSize() );
+ SwFormatFrameSize aSz( pFormat->GetFrameSize() );
if(FN_TABLE_WIDTH == pEntry->nWID)
{
sal_Int32 nWidth = 0;
@@ -276,7 +276,7 @@ static uno::Any lcl_GetSpecialProperty(SwFrameFormat* pFormat, const SfxItemProp
case FN_TABLE_RELATIVE_WIDTH:
{
uno::Any aRet;
- const SwFormatFrmSize& rSz = pFormat->GetFrmSize();
+ const SwFormatFrameSize& rSz = pFormat->GetFrameSize();
if(FN_TABLE_WIDTH == pEntry->nWID)
rSz.QueryValue(aRet, MID_FRMSIZE_WIDTH|CONVERT_TWIPS);
else if(FN_TABLE_RELATIVE_WIDTH == pEntry->nWID)
@@ -573,32 +573,32 @@ static void lcl_InspectLines(SwTableLines& rLines, std::vector<OUString>& rAllNa
static bool lcl_FormatTable(SwFrameFormat* pTableFormat)
{
bool bHasFrames = false;
- SwIterator<SwFrm,SwFormat> aIter( *pTableFormat );
- for(SwFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next())
+ SwIterator<SwFrame,SwFormat> aIter( *pTableFormat );
+ for(SwFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next())
{
- vcl::RenderContext* pRenderContext = pFrm->getRootFrm()->GetCurrShell()->GetOut();
- // mba: no TYPEINFO for SwTabFrm
- if(!pFrm->IsTabFrm())
+ vcl::RenderContext* pRenderContext = pFrame->getRootFrame()->GetCurrShell()->GetOut();
+ // mba: no TYPEINFO for SwTabFrame
+ if(!pFrame->IsTabFrame())
continue;
- SwTabFrm* pTabFrm = static_cast<SwTabFrm*>(pFrm);
- if(pTabFrm->IsValid())
- pTabFrm->InvalidatePos();
- pTabFrm->SetONECalcLowers();
- pTabFrm->Calc(pRenderContext);
+ SwTabFrame* pTabFrame = static_cast<SwTabFrame*>(pFrame);
+ if(pTabFrame->IsValid())
+ pTabFrame->InvalidatePos();
+ pTabFrame->SetONECalcLowers();
+ pTabFrame->Calc(pRenderContext);
bHasFrames = true;
}
return bHasFrames;
}
-static void lcl_CrsrSelect(SwPaM& rCrsr, bool bExpand)
+static void lcl_CursorSelect(SwPaM& rCursor, bool bExpand)
{
if(bExpand)
{
- if(!rCrsr.HasMark())
- rCrsr.SetMark();
+ if(!rCursor.HasMark())
+ rCursor.SetMark();
}
- else if(rCrsr.HasMark())
- rCrsr.DeleteMark();
+ else if(rCursor.HasMark())
+ rCursor.DeleteMark();
}
static void lcl_GetTableSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pBox, bool bRow)
@@ -945,8 +945,8 @@ uno::Reference<text::XTextCursor> SwXCell::createTextCursor() throw( uno::Runtim
SwPosition aPos(*pSttNd);
SwXTextCursor* const pXCursor =
new SwXTextCursor(*GetDoc(), this, CURSOR_TBLTEXT, aPos);
- auto& rUnoCrsr(pXCursor->GetCursor());
- rUnoCrsr.Move(fnMoveForward, fnGoNode);
+ auto& rUnoCursor(pXCursor->GetCursor());
+ rUnoCursor.Move(fnMoveForward, fnGoNode);
return static_cast<text::XWordCursor*>(pXCursor);
}
@@ -1089,7 +1089,7 @@ uno::Reference<container::XEnumeration> SwXCell::createEnumeration() throw( uno:
return uno::Reference<container::XEnumeration>();
const SwStartNode* pSttNd = pBox->GetSttNd();
SwPosition aPos(*pSttNd);
- auto pUnoCursor(GetDoc()->CreateUnoCrsr(aPos));
+ auto pUnoCursor(GetDoc()->CreateUnoCursor(aPos));
pUnoCursor->Move(fnMoveForward, fnGoNode);
// remember table and start node for later travelling
// (used in export of tables in tables)
@@ -1304,21 +1304,21 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno:
case FN_UNO_ROW_HEIGHT:
case FN_UNO_ROW_AUTO_HEIGHT:
{
- SwFormatFrmSize aFrmSize(pLn->GetFrameFormat()->GetFrmSize());
+ SwFormatFrameSize aFrameSize(pLn->GetFrameFormat()->GetFrameSize());
if(FN_UNO_ROW_AUTO_HEIGHT== pEntry->nWID)
{
bool bSet = *static_cast<sal_Bool const *>(aValue.getValue());
- aFrmSize.SetHeightSizeType(bSet ? ATT_VAR_SIZE : ATT_FIX_SIZE);
+ aFrameSize.SetHeightSizeType(bSet ? ATT_VAR_SIZE : ATT_FIX_SIZE);
}
else
{
sal_Int32 nHeight = 0;
aValue >>= nHeight;
- Size aSz(aFrmSize.GetSize());
+ Size aSz(aFrameSize.GetSize());
aSz.Height() = convertMm100ToTwip(nHeight);
- aFrmSize.SetSize(aSz);
+ aFrameSize.SetSize(aSz);
}
- pDoc->SetAttr(aFrmSize, *pLn->ClaimFrameFormat());
+ pDoc->SetAttr(aFrameSize, *pLn->ClaimFrameFormat());
}
break;
@@ -1361,7 +1361,7 @@ uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) throw(
case FN_UNO_ROW_HEIGHT:
case FN_UNO_ROW_AUTO_HEIGHT:
{
- const SwFormatFrmSize& rSize = pLn->GetFrameFormat()->GetFrmSize();
+ const SwFormatFrameSize& rSize = pLn->GetFrameFormat()->GetFrameSize();
if(FN_UNO_ROW_AUTO_HEIGHT== pEntry->nWID)
{
aRet <<= ATT_VAR_SIZE == rSize.GetHeightSizeType();
@@ -1431,12 +1431,12 @@ sal_Bool SwXTextTableCursor::supportsService(const OUString& rServiceName) throw
{ return cppu::supportsService(this, rServiceName); }
IMPLEMENT_FORWARD_XINTERFACE2(SwXTextTableCursor,SwXTextTableCursor_Base,OTextCursorHelper)
-const SwPaM* SwXTextTableCursor::GetPaM() const { return &GetCrsr(); }
-SwPaM* SwXTextTableCursor::GetPaM() { return &GetCrsr(); }
+const SwPaM* SwXTextTableCursor::GetPaM() const { return &GetCursor(); }
+SwPaM* SwXTextTableCursor::GetPaM() { return &GetCursor(); }
const SwDoc* SwXTextTableCursor::GetDoc() const { return GetFrameFormat()->GetDoc(); }
SwDoc* SwXTextTableCursor::GetDoc() { return GetFrameFormat()->GetDoc(); }
-const SwUnoCrsr& SwXTextTableCursor::GetCrsr() const { return *m_pUnoCrsr; }
-SwUnoCrsr& SwXTextTableCursor::GetCrsr() { return *m_pUnoCrsr; }
+const SwUnoCursor& SwXTextTableCursor::GetCursor() const { return *m_pUnoCursor; }
+SwUnoCursor& SwXTextTableCursor::GetCursor() { return *m_pUnoCursor; }
uno::Sequence<OUString> SwXTextTableCursor::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
{ return {"com.sun.star.text.TextTableCursor"}; }
@@ -1448,50 +1448,50 @@ SwXTextTableCursor::SwXTextTableCursor(SwFrameFormat* pFormat, SwTableBox* pBox)
SwDoc* pDoc = pFormat->GetDoc();
const SwStartNode* pSttNd = pBox->GetSttNd();
SwPosition aPos(*pSttNd);
- m_pUnoCrsr = pDoc->CreateUnoCrsr(aPos, true);
- m_pUnoCrsr->Move( fnMoveForward, fnGoNode );
- SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*m_pUnoCrsr);
- rTableCrsr.MakeBoxSels();
+ m_pUnoCursor = pDoc->CreateUnoCursor(aPos, true);
+ m_pUnoCursor->Move( fnMoveForward, fnGoNode );
+ SwUnoTableCursor& rTableCursor = dynamic_cast<SwUnoTableCursor&>(*m_pUnoCursor);
+ rTableCursor.MakeBoxSels();
}
SwXTextTableCursor::SwXTextTableCursor(SwFrameFormat& rTableFormat, const SwTableCursor* pTableSelection) :
SwClient(&rTableFormat),
m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_TABLE_CURSOR))
{
- m_pUnoCrsr = pTableSelection->GetDoc()->CreateUnoCrsr(*pTableSelection->GetPoint(), true);
+ m_pUnoCursor = pTableSelection->GetDoc()->CreateUnoCursor(*pTableSelection->GetPoint(), true);
if(pTableSelection->HasMark())
{
- m_pUnoCrsr->SetMark();
- *m_pUnoCrsr->GetMark() = *pTableSelection->GetMark();
+ m_pUnoCursor->SetMark();
+ *m_pUnoCursor->GetMark() = *pTableSelection->GetMark();
}
const SwSelBoxes& rBoxes = pTableSelection->GetSelectedBoxes();
- SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*m_pUnoCrsr);
+ SwUnoTableCursor& rTableCursor = dynamic_cast<SwUnoTableCursor&>(*m_pUnoCursor);
for(auto pBox : rBoxes)
- rTableCrsr.InsertBox(*pBox);
- rTableCrsr.MakeBoxSels();
+ rTableCursor.InsertBox(*pBox);
+ rTableCursor.MakeBoxSels();
}
OUString SwXTextTableCursor::getRangeName()
throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- SwUnoCrsr& rUnoCrsr = GetCrsr();
- SwUnoTableCrsr* pTableCrsr = dynamic_cast<SwUnoTableCrsr*>(&rUnoCrsr);
+ SwUnoCursor& rUnoCursor = GetCursor();
+ SwUnoTableCursor* pTableCursor = dynamic_cast<SwUnoTableCursor*>(&rUnoCursor);
//!! see also SwChartDataSequence::getSourceRangeRepresentation
- if(!pTableCrsr)
+ if(!pTableCursor)
return OUString();
- pTableCrsr->MakeBoxSels();
- const SwStartNode* pNode = pTableCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
+ pTableCursor->MakeBoxSels();
+ const SwStartNode* pNode = pTableCursor->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
const SwTable* pTable = SwTable::FindTable(GetFrameFormat());
const SwTableBox* pEndBox = pTable->GetTableBox(pNode->GetIndex());
- if(pTableCrsr->HasMark())
+ if(pTableCursor->HasMark())
{
- pNode = pTableCrsr->GetMark()->nNode.GetNode().FindTableBoxStartNode();
+ pNode = pTableCursor->GetMark()->nNode.GetNode().FindTableBoxStartNode();
const SwTableBox* pStartBox = pTable->GetTableBox(pNode->GetIndex());
if(pEndBox != pStartBox)
{
// need to switch start and end?
- if(*pTableCrsr->GetPoint() < *pTableCrsr->GetMark())
+ if(*pTableCursor->GetPoint() < *pTableCursor->GetMark())
std::swap(pStartBox, pEndBox);
return pStartBox->GetName() + ":" + pEndBox->GetName();
}
@@ -1503,90 +1503,90 @@ sal_Bool SwXTextTableCursor::gotoCellByName(const OUString& sCellName, sal_Bool
throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- SwUnoCrsr& rUnoCrsr = GetCrsr();
- auto& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(rUnoCrsr);
- lcl_CrsrSelect(rTableCrsr, bExpand);
- return rTableCrsr.GotoTableBox(sCellName);
+ SwUnoCursor& rUnoCursor = GetCursor();
+ auto& rTableCursor = dynamic_cast<SwUnoTableCursor&>(rUnoCursor);
+ lcl_CursorSelect(rTableCursor, bExpand);
+ return rTableCursor.GotoTableBox(sCellName);
}
sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- SwUnoCrsr& rUnoCrsr = GetCrsr();
- SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(rUnoCrsr);
- lcl_CrsrSelect(rTableCrsr, bExpand);
- return rTableCrsr.Left(Count, CRSR_SKIP_CHARS, false, false);
+ SwUnoCursor& rUnoCursor = GetCursor();
+ SwUnoTableCursor& rTableCursor = dynamic_cast<SwUnoTableCursor&>(rUnoCursor);
+ lcl_CursorSelect(rTableCursor, bExpand);
+ return rTableCursor.Left(Count, CRSR_SKIP_CHARS, false, false);
}
sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- SwUnoCrsr& rUnoCrsr = GetCrsr();
- SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(rUnoCrsr);
- lcl_CrsrSelect(rTableCrsr, bExpand);
- return rTableCrsr.Right(Count, CRSR_SKIP_CHARS, false, false);
+ SwUnoCursor& rUnoCursor = GetCursor();
+ SwUnoTableCursor& rTableCursor = dynamic_cast<SwUnoTableCursor&>(rUnoCursor);
+ lcl_CursorSelect(rTableCursor, bExpand);
+ return rTableCursor.Right(Count, CRSR_SKIP_CHARS, false, false);
}
sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- SwUnoCrsr& rUnoCrsr = GetCrsr();
- SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(rUnoCrsr);
- lcl_CrsrSelect(rTableCrsr, bExpand);
- return rTableCrsr.UpDown(true, Count, nullptr, 0);
+ SwUnoCursor& rUnoCursor = GetCursor();
+ SwUnoTableCursor& rTableCursor = dynamic_cast<SwUnoTableCursor&>(rUnoCursor);
+ lcl_CursorSelect(rTableCursor, bExpand);
+ return rTableCursor.UpDown(true, Count, nullptr, 0);
}
sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- SwUnoCrsr& rUnoCrsr = GetCrsr();
- SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(rUnoCrsr);
- lcl_CrsrSelect(rTableCrsr, bExpand);
- return rTableCrsr.UpDown(false, Count, nullptr, 0);
+ SwUnoCursor& rUnoCursor = GetCursor();
+ SwUnoTableCursor& rTableCursor = dynamic_cast<SwUnoTableCursor&>(rUnoCursor);
+ lcl_CursorSelect(rTableCursor, bExpand);
+ return rTableCursor.UpDown(false, Count, nullptr, 0);
}
void SwXTextTableCursor::gotoStart(sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- SwUnoCrsr& rUnoCrsr = GetCrsr();
- SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(rUnoCrsr);
- lcl_CrsrSelect(rTableCrsr, bExpand);
- rTableCrsr.MoveTable(fnTableCurr, fnTableStart);
+ SwUnoCursor& rUnoCursor = GetCursor();
+ SwUnoTableCursor& rTableCursor = dynamic_cast<SwUnoTableCursor&>(rUnoCursor);
+ lcl_CursorSelect(rTableCursor, bExpand);
+ rTableCursor.MoveTable(fnTableCurr, fnTableStart);
}
void SwXTextTableCursor::gotoEnd(sal_Bool bExpand) throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- SwUnoCrsr& rUnoCrsr = GetCrsr();
- SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(rUnoCrsr);
- lcl_CrsrSelect(rTableCrsr, bExpand);
- rTableCrsr.MoveTable(fnTableCurr, fnTableEnd);
+ SwUnoCursor& rUnoCursor = GetCursor();
+ SwUnoTableCursor& rTableCursor = dynamic_cast<SwUnoTableCursor&>(rUnoCursor);
+ lcl_CursorSelect(rTableCursor, bExpand);
+ rTableCursor.MoveTable(fnTableCurr, fnTableEnd);
}
sal_Bool SwXTextTableCursor::mergeRange()
throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- SwUnoCrsr& rUnoCrsr = GetCrsr();
+ SwUnoCursor& rUnoCursor = GetCursor();
- SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(rUnoCrsr);
+ SwUnoTableCursor& rTableCursor = dynamic_cast<SwUnoTableCursor&>(rUnoCursor);
{
// HACK: remove pending actions for selecting old style tables
- UnoActionRemoveContext aRemoveContext(rTableCrsr);
+ UnoActionRemoveContext aRemoveContext(rTableCursor);
}
- rTableCrsr.MakeBoxSels();
+ rTableCursor.MakeBoxSels();
bool bResult;
{
- UnoActionContext aContext(rUnoCrsr.GetDoc());
- bResult = TBLMERGE_OK == rTableCrsr.GetDoc()->MergeTable(rTableCrsr);
+ UnoActionContext aContext(rUnoCursor.GetDoc());
+ bResult = TBLMERGE_OK == rTableCursor.GetDoc()->MergeTable(rTableCursor);
}
if(bResult)
{
- size_t nCount = rTableCrsr.GetSelectedBoxesCount();
+ size_t nCount = rTableCursor.GetSelectedBoxesCount();
while (nCount--)
- rTableCrsr.DeleteBox(nCount);
+ rTableCursor.DeleteBox(nCount);
}
- rTableCrsr.MakeBoxSels();
+ rTableCursor.MakeBoxSels();
return bResult;
}
@@ -1596,19 +1596,19 @@ sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool Horizontal)
SolarMutexGuard aGuard;
if (Count <= 0)
throw uno::RuntimeException("Illegal first argument: needs to be > 0", static_cast<cppu::OWeakObject*>(this));
- SwUnoCrsr& rUnoCrsr = GetCrsr();
- SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(rUnoCrsr);
+ SwUnoCursor& rUnoCursor = GetCursor();
+ SwUnoTableCursor& rTableCursor = dynamic_cast<SwUnoTableCursor&>(rUnoCursor);
{
// HACK: remove pending actions for selecting old style tables
- UnoActionRemoveContext aRemoveContext(rTableCrsr);
+ UnoActionRemoveContext aRemoveContext(rTableCursor);
}
- rTableCrsr.MakeBoxSels();
+ rTableCursor.MakeBoxSels();
bool bResult;
{
- UnoActionContext aContext(rUnoCrsr.GetDoc());
- bResult = rTableCrsr.GetDoc()->SplitTable(rTableCrsr.GetSelectedBoxes(), !Horizontal, Count);
+ UnoActionContext aContext(rUnoCursor.GetDoc());
+ bResult = rTableCursor.GetDoc()->SplitTable(rTableCursor.GetSelectedBoxes(), !Horizontal, Count);
}
- rTableCrsr.MakeBoxSels();
+ rTableCursor.MakeBoxSels();
return bResult;
}
@@ -1627,28 +1627,28 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, const u
std::exception)
{
SolarMutexGuard aGuard;
- SwUnoCrsr& rUnoCrsr = GetCrsr();
+ SwUnoCursor& rUnoCursor = GetCursor();
auto pEntry(m_pPropSet->getPropertyMap().getByName(rPropertyName));
if(!pEntry)
throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast<cppu::OWeakObject*>(this));
if(pEntry->nFlags & beans::PropertyAttribute::READONLY)
throw beans::PropertyVetoException("Property is read-only: " + rPropertyName, static_cast<cppu::OWeakObject*>(this));
{
- auto pSttNode = rUnoCrsr.GetNode().StartOfSectionNode();
+ auto pSttNode = rUnoCursor.GetNode().StartOfSectionNode();
const SwTableNode* pTableNode = pSttNode->FindTableNode();
lcl_FormatTable(pTableNode->GetTable().GetFrameFormat());
}
- auto& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(rUnoCrsr);
- rTableCrsr.MakeBoxSels();
- SwDoc* pDoc = rUnoCrsr.GetDoc();
+ auto& rTableCursor = dynamic_cast<SwUnoTableCursor&>(rUnoCursor);
+ rTableCursor.MakeBoxSels();
+ SwDoc* pDoc = rUnoCursor.GetDoc();
switch(pEntry->nWID)
{
case FN_UNO_TABLE_CELL_BACKGROUND:
{
SvxBrushItem aBrush(RES_BACKGROUND);
- SwDoc::GetBoxAttr(rUnoCrsr, aBrush);
+ SwDoc::GetBoxAttr(rUnoCursor, aBrush);
aBrush.PutValue(aValue, pEntry->nMemberId);
- pDoc->SetBoxAttr(rUnoCrsr, aBrush);
+ pDoc->SetBoxAttr(rUnoCursor, aBrush);
}
break;
@@ -1656,24 +1656,24 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, const u
{
SfxUInt32Item aNumberFormat(RES_BOXATR_FORMAT);
aNumberFormat.PutValue(aValue, 0);
- pDoc->SetBoxAttr(rUnoCrsr, aNumberFormat);
+ pDoc->SetBoxAttr(rUnoCursor, aNumberFormat);
}
break;
case FN_UNO_PARA_STYLE:
- SwUnoCursorHelper::SetTextFormatColl(aValue, rUnoCrsr);
+ SwUnoCursorHelper::SetTextFormatColl(aValue, rUnoCursor);
break;
default:
{
SfxItemSet aItemSet(pDoc->GetAttrPool(), pEntry->nWID, pEntry->nWID);
- SwUnoCursorHelper::GetCrsrAttr(rTableCrsr.GetSelRing(),
+ SwUnoCursorHelper::GetCursorAttr(rTableCursor.GetSelRing(),
aItemSet);
if (!SwUnoCursorHelper::SetCursorPropertyValue(
- *pEntry, aValue, rTableCrsr.GetSelRing(), aItemSet))
+ *pEntry, aValue, rTableCursor.GetSelRing(), aItemSet))
{
m_pPropSet->setPropertyValue(*pEntry, aValue, aItemSet);
}
- SwUnoCursorHelper::SetCrsrAttr(rTableCrsr.GetSelRing(),
+ SwUnoCursorHelper::SetCursorAttr(rTableCursor.GetSelRing(),
aItemSet, SetAttrMode::DEFAULT, true);
}
}
@@ -1686,24 +1686,24 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
std::exception)
{
SolarMutexGuard aGuard;
- SwUnoCrsr& rUnoCrsr = GetCrsr();
+ SwUnoCursor& rUnoCursor = GetCursor();
{
- auto pSttNode = rUnoCrsr.GetNode().StartOfSectionNode();
+ auto pSttNode = rUnoCursor.GetNode().StartOfSectionNode();
const SwTableNode* pTableNode = pSttNode->FindTableNode();
lcl_FormatTable(pTableNode->GetTable().GetFrameFormat());
}
- SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(rUnoCrsr);
+ SwUnoTableCursor& rTableCursor = dynamic_cast<SwUnoTableCursor&>(rUnoCursor);
auto pEntry(m_pPropSet->getPropertyMap().getByName(rPropertyName));
if(!pEntry)
throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast<cppu::OWeakObject*>(this));
- rTableCrsr.MakeBoxSels();
+ rTableCursor.MakeBoxSels();
uno::Any aResult;
switch(pEntry->nWID)
{
case FN_UNO_TABLE_CELL_BACKGROUND:
{
SvxBrushItem aBrush(RES_BACKGROUND);
- if (SwDoc::GetBoxAttr(rUnoCrsr, aBrush))
+ if (SwDoc::GetBoxAttr(rUnoCursor, aBrush))
aBrush.QueryValue(aResult, pEntry->nMemberId);
}
break;
@@ -1713,18 +1713,18 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
break;
case FN_UNO_PARA_STYLE:
{
- auto pFormat(SwUnoCursorHelper::GetCurTextFormatColl(rUnoCrsr, false));
+ auto pFormat(SwUnoCursorHelper::GetCurTextFormatColl(rUnoCursor, false));
if(pFormat)
aResult = uno::makeAny(pFormat->GetName());
}
break;
default:
{
- SfxItemSet aSet(rTableCrsr.GetDoc()->GetAttrPool(),
+ SfxItemSet aSet(rTableCursor.GetDoc()->GetAttrPool(),
RES_CHRATR_BEGIN, RES_FRMATR_END-1,
RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
0L);
- SwUnoCursorHelper::GetCrsrAttr(rTableCrsr.GetSelRing(), aSet);
+ SwUnoCursorHelper::GetCursorAttr(rTableCursor.GetSelRing(), aSet);
m_pPropSet->getPropertyValue(*pEntry, aSet, aResult);
}
}
@@ -1883,7 +1883,7 @@ void SwTableProperties_Impl::ApplyTableAttr(const SwTable& rTable, SwDoc& rDoc)
GetProperty(FN_TABLE_WIDTH, 0xff, pWidth);
bool bPutSize = pWidth != nullptr;
- SwFormatFrmSize aSz(ATT_VAR_SIZE);
+ SwFormatFrameSize aSz(ATT_VAR_SIZE);
if(pWidth)
{
aSz.PutValue(*pWidth, MID_FRMSIZE_WIDTH);
@@ -2201,21 +2201,21 @@ uno::Reference<table::XCellRange> SwXTextTable::GetRangeByName(SwFrameFormat* p
const SwStartNode* pSttNd = pTLBox->GetSttNd();
SwPosition aPos(*pSttNd);
// set cursor to the upper-left cell of the range
- auto pUnoCrsr(pFormat->GetDoc()->CreateUnoCrsr(aPos, true));
- pUnoCrsr->Move(fnMoveForward, fnGoNode);
- pUnoCrsr->SetRemainInSection(false);
+ auto pUnoCursor(pFormat->GetDoc()->CreateUnoCursor(aPos, true));
+ pUnoCursor->Move(fnMoveForward, fnGoNode);
+ pUnoCursor->SetRemainInSection(false);
const SwTableBox* pBRBox(pTable->GetTableBox(rBRName));
if(!pBRBox)
return nullptr;
- pUnoCrsr->SetMark();
- pUnoCrsr->GetPoint()->nNode = *pBRBox->GetSttNd();
- pUnoCrsr->Move( fnMoveForward, fnGoNode );
- SwUnoTableCrsr* pCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr.get());
+ pUnoCursor->SetMark();
+ pUnoCursor->GetPoint()->nNode = *pBRBox->GetSttNd();
+ pUnoCursor->Move( fnMoveForward, fnGoNode );
+ SwUnoTableCursor* pCursor = dynamic_cast<SwUnoTableCursor*>(pUnoCursor.get());
// HACK: remove pending actions for selecting old style tables
- UnoActionRemoveContext aRemoveContext(*pCrsr);
- pCrsr->MakeBoxSels();
- // pUnoCrsr will be provided and will not be deleted
- return new SwXCellRange(pUnoCrsr, *pFormat, rDesc);
+ UnoActionRemoveContext aRemoveContext(*pCursor);
+ pCursor->MakeBoxSels();
+ // pUnoCursor will be provided and will not be deleted
+ return new SwXCellRange(pUnoCursor, *pFormat, rDesc);
}
uno::Reference<table::XCellRange> SwXTextTable::getCellRangeByPosition(sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom)
@@ -2578,18 +2578,18 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
const SwStartNode* pSttNd = pTLBox->GetSttNd();
SwPosition aPos(*pSttNd);
// set cursor to top left cell
- auto pUnoCrsr(pDoc->CreateUnoCrsr(aPos, true));
- pUnoCrsr->Move( fnMoveForward, fnGoNode );
- pUnoCrsr->SetRemainInSection( false );
+ auto pUnoCursor(pDoc->CreateUnoCursor(aPos, true));
+ pUnoCursor->Move( fnMoveForward, fnGoNode );
+ pUnoCursor->SetRemainInSection( false );
const SwTableBox* pBRBox = lcl_FindCornerTableBox(rLines, false);
- pUnoCrsr->SetMark();
- pUnoCrsr->GetPoint()->nNode = *pBRBox->GetSttNd();
- pUnoCrsr->Move( fnMoveForward, fnGoNode );
- SwUnoTableCrsr& rCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+ pUnoCursor->SetMark();
+ pUnoCursor->GetPoint()->nNode = *pBRBox->GetSttNd();
+ pUnoCursor->Move( fnMoveForward, fnGoNode );
+ SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor);
// HACK: remove pending actions for selecting old style tables
- UnoActionRemoveContext aRemoveContext(rCrsr);
- rCrsr.MakeBoxSels();
+ UnoActionRemoveContext aRemoveContext(rCursor);
+ rCursor.MakeBoxSels();
SfxItemSet aSet(pDoc->GetAttrPool(),
RES_BOX, RES_BOX,
@@ -2623,7 +2623,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
aSet.Put(aBox);
aSet.Put(aBoxInfo);
- pDoc->SetTabBorders(rCrsr, aSet);
+ pDoc->SetTabBorders(rCursor, aSet);
}
break;
@@ -2767,27 +2767,27 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
const SwStartNode* pSttNd = pTLBox->GetSttNd();
SwPosition aPos(*pSttNd);
// set cursor to top left cell
- auto pUnoCrsr(pDoc->CreateUnoCrsr(aPos, true));
- pUnoCrsr->Move( fnMoveForward, fnGoNode );
- pUnoCrsr->SetRemainInSection( false );
+ auto pUnoCursor(pDoc->CreateUnoCursor(aPos, true));
+ pUnoCursor->Move( fnMoveForward, fnGoNode );
+ pUnoCursor->SetRemainInSection( false );
const SwTableBox* pBRBox = lcl_FindCornerTableBox(rLines, false);
- pUnoCrsr->SetMark();
+ pUnoCursor->SetMark();
const SwStartNode* pLastNd = pBRBox->GetSttNd();
- pUnoCrsr->GetPoint()->nNode = *pLastNd;
+ pUnoCursor->GetPoint()->nNode = *pLastNd;
- pUnoCrsr->Move( fnMoveForward, fnGoNode );
- SwUnoTableCrsr& rCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+ pUnoCursor->Move( fnMoveForward, fnGoNode );
+ SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor);
// HACK: remove pending actions for selecting old style tables
- UnoActionRemoveContext aRemoveContext(rCrsr);
- rCrsr.MakeBoxSels();
+ UnoActionRemoveContext aRemoveContext(rCursor);
+ rCursor.MakeBoxSels();
SfxItemSet aSet(pDoc->GetAttrPool(),
RES_BOX, RES_BOX,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
0);
aSet.Put(SvxBoxInfoItem( SID_ATTR_BORDER_INNER ));
- SwDoc::GetTabBorders(rCrsr, aSet);
+ SwDoc::GetTabBorders(rCursor, aSet);
const SvxBoxInfoItem& rBoxInfoItem =
static_cast<const SvxBoxInfoItem&>(aSet.Get(SID_ATTR_BORDER_INNER));
const SvxBoxItem& rBox = static_cast<const SvxBoxItem&>(aSet.Get(RES_BOX));
@@ -3138,13 +3138,13 @@ uno::Sequence<OUString> SwXCellRange::getSupportedServiceNames() throw( uno::Run
"com.sun.star.style.ParagraphPropertiesComplex" };
}
-SwXCellRange::SwXCellRange(sw::UnoCursorPointer pCrsr, SwFrameFormat& rFrameFormat,
+SwXCellRange::SwXCellRange(sw::UnoCursorPointer pCursor, SwFrameFormat& rFrameFormat,
SwRangeDescriptor& rDesc)
: SwClient(&rFrameFormat)
, m_ChartListeners(m_Mutex)
, aRgDesc(rDesc)
, m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TABLE_RANGE))
- , m_pTableCrsr(pCrsr)
+ , m_pTableCursor(pCursor)
, m_bFirstRowAsLabel(false)
, m_bFirstColumnAsLabel(false)
{
@@ -3215,21 +3215,21 @@ uno::Reference< table::XCellRange > SwXCellRange::getCellRangeByPosition(
const SwStartNode* pSttNd = pTLBox->GetSttNd();
SwPosition aPos(*pSttNd);
// set cursor in the upper-left cell of the range
- auto pUnoCrsr(pFormat->GetDoc()->CreateUnoCrsr(aPos, true));
- pUnoCrsr->Move( fnMoveForward, fnGoNode );
- pUnoCrsr->SetRemainInSection( false );
+ auto pUnoCursor(pFormat->GetDoc()->CreateUnoCursor(aPos, true));
+ pUnoCursor->Move( fnMoveForward, fnGoNode );
+ pUnoCursor->SetRemainInSection( false );
const SwTableBox* pBRBox = pTable->GetTableBox( sBRName );
if(pBRBox)
{
- pUnoCrsr->SetMark();
- pUnoCrsr->GetPoint()->nNode = *pBRBox->GetSttNd();
- pUnoCrsr->Move( fnMoveForward, fnGoNode );
- SwUnoTableCrsr* pCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr.get());
+ pUnoCursor->SetMark();
+ pUnoCursor->GetPoint()->nNode = *pBRBox->GetSttNd();
+ pUnoCursor->Move( fnMoveForward, fnGoNode );
+ SwUnoTableCursor* pCursor = dynamic_cast<SwUnoTableCursor*>(pUnoCursor.get());
// HACK: remove pending actions for selecting old style tables
- UnoActionRemoveContext aRemoveContext(*pCrsr);
- pCrsr->MakeBoxSels();
- // pUnoCrsr will be provided and will not be deleted
- SwXCellRange* pCellRange = new SwXCellRange(pUnoCrsr, *pFormat, aNewDesc);
+ UnoActionRemoveContext aRemoveContext(*pCursor);
+ pCursor->MakeBoxSels();
+ // pUnoCursor will be provided and will not be deleted
+ SwXCellRange* pCellRange = new SwXCellRange(pUnoCursor, *pFormat, aNewDesc);
aRet = pCellRange;
}
}
@@ -3283,21 +3283,21 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
throw beans::PropertyVetoException("Property is read-only: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
- SwDoc* pDoc = m_pTableCrsr->GetDoc();
- SwUnoTableCrsr& rCrsr = dynamic_cast<SwUnoTableCrsr&>(*m_pTableCrsr);
+ SwDoc* pDoc = m_pTableCursor->GetDoc();
+ SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*m_pTableCursor);
{
// HACK: remove pending actions for selecting old style tables
- UnoActionRemoveContext aRemoveContext(rCrsr);
+ UnoActionRemoveContext aRemoveContext(rCursor);
}
- rCrsr.MakeBoxSels();
+ rCursor.MakeBoxSels();
switch(pEntry->nWID )
{
case FN_UNO_TABLE_CELL_BACKGROUND:
{
SvxBrushItem aBrush( RES_BACKGROUND );
- SwDoc::GetBoxAttr( *m_pTableCrsr, aBrush );
+ SwDoc::GetBoxAttr( *m_pTableCursor, aBrush );
((SfxPoolItem&)aBrush).PutValue(aValue, pEntry->nMemberId);
- pDoc->SetBoxAttr( *m_pTableCrsr, aBrush );
+ pDoc->SetBoxAttr( *m_pTableCursor, aBrush );
}
break;
@@ -3326,20 +3326,20 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An
aBoxInfo.SetValid(nValid);
aSet.Put(aBoxInfo);
- SwDoc::GetTabBorders(rCrsr, aSet);
+ SwDoc::GetTabBorders(rCursor, aSet);
aSet.Put(aBoxInfo);
SvxBoxItem aBoxItem(static_cast<const SvxBoxItem&>(aSet.Get(RES_BOX)));
((SfxPoolItem&)aBoxItem).PutValue(aValue, pEntry->nMemberId);
aSet.Put(aBoxItem);
- pDoc->SetTabBorders( *m_pTableCrsr, aSet );
+ pDoc->SetTabBorders( *m_pTableCursor, aSet );
}
break;
case RES_BOXATR_FORMAT:
{
SfxUInt32Item aNumberFormat(RES_BOXATR_FORMAT);
((SfxPoolItem&)aNumberFormat).PutValue(aValue, 0);
- pDoc->SetBoxAttr(rCrsr, aNumberFormat);
+ pDoc->SetBoxAttr(rCursor, aNumberFormat);
}
break;
case FN_UNO_RANGE_ROW_LABEL:
@@ -3365,15 +3365,15 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An
default:
{
SfxItemSet aItemSet( pDoc->GetAttrPool(), pEntry->nWID, pEntry->nWID );
- SwUnoCursorHelper::GetCrsrAttr(rCrsr.GetSelRing(),
+ SwUnoCursorHelper::GetCursorAttr(rCursor.GetSelRing(),
aItemSet);
if (!SwUnoCursorHelper::SetCursorPropertyValue(
- *pEntry, aValue, rCrsr.GetSelRing(), aItemSet))
+ *pEntry, aValue, rCursor.GetSelRing(), aItemSet))
{
m_pPropSet->setPropertyValue(*pEntry, aValue, aItemSet);
}
- SwUnoCursorHelper::SetCrsrAttr(rCrsr.GetSelRing(),
+ SwUnoCursorHelper::SetCursorAttr(rCursor.GetSelRing(),
aItemSet, SetAttrMode::DEFAULT, true);
}
}
@@ -3403,20 +3403,20 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName)
case FN_UNO_TABLE_CELL_BACKGROUND:
{
SvxBrushItem aBrush( RES_BACKGROUND );
- if(SwDoc::GetBoxAttr( *m_pTableCrsr, aBrush ))
+ if(SwDoc::GetBoxAttr( *m_pTableCursor, aBrush ))
aBrush.QueryValue(aRet, pEntry->nMemberId);
}
break;
case RES_BOX :
{
- SwDoc* pDoc = m_pTableCrsr->GetDoc();
+ SwDoc* pDoc = m_pTableCursor->GetDoc();
SfxItemSet aSet(pDoc->GetAttrPool(),
RES_BOX, RES_BOX,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
0);
aSet.Put(SvxBoxInfoItem( SID_ATTR_BORDER_INNER ));
- SwDoc::GetTabBorders(*m_pTableCrsr, aSet);
+ SwDoc::GetTabBorders(*m_pTableCursor, aSet);
const SvxBoxItem& rBoxItem = static_cast<const SvxBoxItem&>(aSet.Get(RES_BOX));
rBoxItem.QueryValue(aRet, pEntry->nMemberId);
}
@@ -3427,7 +3427,7 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName)
case FN_UNO_PARA_STYLE:
{
SwFormatColl *const pTmpFormat =
- SwUnoCursorHelper::GetCurTextFormatColl(*m_pTableCrsr, false);
+ SwUnoCursorHelper::GetCurTextFormatColl(*m_pTableCursor, false);
OUString sRet;
if(pFormat)
sRet = pTmpFormat->GetName();
@@ -3442,14 +3442,14 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName)
break;
default:
{
- SfxItemSet aSet(m_pTableCrsr->GetDoc()->GetAttrPool(),
+ SfxItemSet aSet(m_pTableCursor->GetDoc()->GetAttrPool(),
RES_CHRATR_BEGIN, RES_FRMATR_END -1,
RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER,
RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
0L);
// first look at the attributes of the cursor
- SwUnoTableCrsr* pCrsr = dynamic_cast<SwUnoTableCrsr*>(&(*m_pTableCrsr));
- SwUnoCursorHelper::GetCrsrAttr(pCrsr->GetSelRing(), aSet);
+ SwUnoTableCursor* pCursor = dynamic_cast<SwUnoTableCursor*>(&(*m_pTableCursor));
+ SwUnoCursorHelper::GetCursorAttr(pCursor->GetSelRing(), aSet);
m_pPropSet->getPropertyValue(*pEntry, aSet, aRet);
}
}
@@ -3700,10 +3700,10 @@ void SAL_CALL SwXCellRange::sort(const uno::Sequence< beans::PropertyValue >& rD
SwFrameFormat* pFormat(GetFrameFormat());
if(pFormat && SwUnoCursorHelper::ConvertSortProperties(rDescriptor, aSortOpt))
{
- SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*m_pTableCrsr);
- rTableCrsr.MakeBoxSels();
+ SwUnoTableCursor& rTableCursor = dynamic_cast<SwUnoTableCursor&>(*m_pTableCursor);
+ rTableCursor.MakeBoxSels();
UnoActionContext aContext(pFormat->GetDoc());
- pFormat->GetDoc()->SortTable(rTableCrsr.GetSelectedBoxes(), aSortOpt);
+ pFormat->GetDoc()->SortTable(rTableCursor.GetSelectedBoxes(), aSortOpt);
}
}
@@ -3713,18 +3713,18 @@ sal_uInt16 SwXCellRange::getColumnCount()
sal_uInt16 SwXCellRange::getRowCount()
{ return static_cast<sal_uInt16>(aRgDesc.nBottom - aRgDesc.nTop + 1); }
-const SwUnoCrsr* SwXCellRange::GetTableCrsr() const
+const SwUnoCursor* SwXCellRange::GetTableCursor() const
{
SwFrameFormat* pFormat = GetFrameFormat();
- return pFormat ? &(*m_pTableCrsr) : nullptr;
+ return pFormat ? &(*m_pTableCursor) : nullptr;
}
void SwXCellRange::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
{
ClientModify(this, pOld, pNew );
- if(!GetRegisteredIn() || !m_pTableCrsr)
+ if(!GetRegisteredIn() || !m_pTableCursor)
{
- m_pTableCrsr.reset(nullptr);
+ m_pTableCursor.reset(nullptr);
lang::EventObject const ev(static_cast< ::cppu::OWeakObject&>(*this));
m_ChartListeners.disposeAndClear(ev);
}
@@ -3827,15 +3827,15 @@ void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
SwPosition aPos(*pSttNd);
// set cursor to the upper-left cell of the range
UnoActionContext aAction(pFrameFormat->GetDoc());
- std::shared_ptr<SwUnoTableCrsr> const pUnoCrsr(
- std::dynamic_pointer_cast<SwUnoTableCrsr>(
- pFrameFormat->GetDoc()->CreateUnoCrsr(aPos, true)));
- pUnoCrsr->Move( fnMoveForward, fnGoNode );
+ std::shared_ptr<SwUnoTableCursor> const pUnoCursor(
+ std::dynamic_pointer_cast<SwUnoTableCursor>(
+ pFrameFormat->GetDoc()->CreateUnoCursor(aPos, true)));
+ pUnoCursor->Move( fnMoveForward, fnGoNode );
{
// remove actions - TODO: why?
- UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc());
+ UnoActionRemoveContext aRemoveContext(pUnoCursor->GetDoc());
}
- pFrameFormat->GetDoc()->InsertRow(*pUnoCrsr, (sal_uInt16)nCount, bAppend);
+ pFrameFormat->GetDoc()->InsertRow(*pUnoCursor, (sal_uInt16)nCount, bAppend);
}
void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
@@ -3855,26 +3855,26 @@ void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
const SwStartNode* pSttNd = pTLBox->GetSttNd();
SwPosition aPos(*pSttNd);
// set cursor to the upper-left cell of the range
- auto pUnoCrsr(pFrameFormat->GetDoc()->CreateUnoCrsr(aPos, true));
- pUnoCrsr->Move(fnMoveForward, fnGoNode);
- pUnoCrsr->SetRemainInSection( false );
+ auto pUnoCursor(pFrameFormat->GetDoc()->CreateUnoCursor(aPos, true));
+ pUnoCursor->Move(fnMoveForward, fnGoNode);
+ pUnoCursor->SetRemainInSection( false );
const OUString sBLName = sw_GetCellName(0, nIndex + nCount - 1);
const SwTableBox* pBLBox = pTable->GetTableBox( sBLName );
if(!pBLBox)
throw uno::RuntimeException("Illegal arguments", static_cast<cppu::OWeakObject*>(this));
- pUnoCrsr->SetMark();
- pUnoCrsr->GetPoint()->nNode = *pBLBox->GetSttNd();
- pUnoCrsr->Move(fnMoveForward, fnGoNode);
- SwUnoTableCrsr* pCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr.get());
+ pUnoCursor->SetMark();
+ pUnoCursor->GetPoint()->nNode = *pBLBox->GetSttNd();
+ pUnoCursor->Move(fnMoveForward, fnGoNode);
+ SwUnoTableCursor* pCursor = dynamic_cast<SwUnoTableCursor*>(pUnoCursor.get());
{
// HACK: remove pending actions for selecting old style tables
- UnoActionRemoveContext aRemoveContext(*pCrsr);
+ UnoActionRemoveContext aRemoveContext(*pCursor);
}
- pCrsr->MakeBoxSels();
+ pCursor->MakeBoxSels();
{ // these braces are important
UnoActionContext aAction(pFrameFormat->GetDoc());
- pFrameFormat->GetDoc()->DeleteRow(*pUnoCrsr);
- pUnoCrsr.reset();
+ pFrameFormat->GetDoc()->DeleteRow(*pUnoCursor);
+ pUnoCursor.reset();
}
{
// invalidate all actions - TODO: why?
@@ -3966,15 +3966,15 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount)
const SwStartNode* pSttNd = pTLBox->GetSttNd();
SwPosition aPos(*pSttNd);
UnoActionContext aAction(pFrameFormat->GetDoc());
- auto pUnoCrsr(pFrameFormat->GetDoc()->CreateUnoCrsr(aPos, true));
- pUnoCrsr->Move(fnMoveForward, fnGoNode);
+ auto pUnoCursor(pFrameFormat->GetDoc()->CreateUnoCursor(aPos, true));
+ pUnoCursor->Move(fnMoveForward, fnGoNode);
{
// remove actions - TODO: why?
- UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc());
+ UnoActionRemoveContext aRemoveContext(pUnoCursor->GetDoc());
}
- pFrameFormat->GetDoc()->InsertCol(*pUnoCrsr, (sal_uInt16)nCount, bAppend);
+ pFrameFormat->GetDoc()->InsertCol(*pUnoCursor, (sal_uInt16)nCount, bAppend);
}
///@see SwXTableRows::removeByIndex (TODO: seems to be copy and paste programming here)
@@ -3995,26 +3995,26 @@ void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
const SwStartNode* pSttNd = pTLBox->GetSttNd();
SwPosition aPos(*pSttNd);
// set cursor to the upper-left cell of the range
- auto pUnoCrsr(pFrameFormat->GetDoc()->CreateUnoCrsr(aPos, true));
- pUnoCrsr->Move(fnMoveForward, fnGoNode);
- pUnoCrsr->SetRemainInSection(false);
+ auto pUnoCursor(pFrameFormat->GetDoc()->CreateUnoCursor(aPos, true));
+ pUnoCursor->Move(fnMoveForward, fnGoNode);
+ pUnoCursor->SetRemainInSection(false);
const OUString sTRName = sw_GetCellName(nIndex + nCount - 1, 0);
const SwTableBox* pTRBox = pTable->GetTableBox(sTRName);
if(!pTRBox)
throw uno::RuntimeException("Cell not found", static_cast<cppu::OWeakObject*>(this));
- pUnoCrsr->SetMark();
- pUnoCrsr->GetPoint()->nNode = *pTRBox->GetSttNd();
- pUnoCrsr->Move(fnMoveForward, fnGoNode);
- SwUnoTableCrsr* pCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr.get());
+ pUnoCursor->SetMark();
+ pUnoCursor->GetPoint()->nNode = *pTRBox->GetSttNd();
+ pUnoCursor->Move(fnMoveForward, fnGoNode);
+ SwUnoTableCursor* pCursor = dynamic_cast<SwUnoTableCursor*>(pUnoCursor.get());
{
// HACK: remove pending actions for selecting old style tables
- UnoActionRemoveContext aRemoveContext(*pCrsr);
+ UnoActionRemoveContext aRemoveContext(*pCursor);
}
- pCrsr->MakeBoxSels();
+ pCursor->MakeBoxSels();
{ // these braces are important
UnoActionContext aAction(pFrameFormat->GetDoc());
- pFrameFormat->GetDoc()->DeleteCol(*pUnoCrsr);
- pUnoCrsr.reset();
+ pFrameFormat->GetDoc()->DeleteCol(*pUnoCursor);
+ pUnoCursor.reset();
}
{
// invalidate all actions - TODO: why?
generated by cgit (git 2.34.1) at 2024-04-30 22:14:42 +0000