summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/editdoc.cxx28
-rw-r--r--editeng/source/editeng/editeng.cxx2
-rw-r--r--editeng/source/editeng/editobj.cxx34
-rw-r--r--editeng/source/editeng/editundo.cxx2
-rw-r--r--editeng/source/editeng/editview.cxx2
-rw-r--r--editeng/source/editeng/impedit.cxx2
-rw-r--r--editeng/source/editeng/impedit3.cxx2
-rw-r--r--editeng/source/editeng/impedit4.cxx2
-rw-r--r--editeng/source/editeng/impedit5.cxx2
9 files changed, 38 insertions, 38 deletions
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index a9192ec63b43..45c2cb163e06 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -394,12 +394,12 @@ sal_Int32 TextPortionList::Count() const
const TextPortion& TextPortionList::operator[](sal_Int32 nPos) const
{
- return *maPortions[nPos].get();
+ return *maPortions[nPos];
}
TextPortion& TextPortionList::operator[](sal_Int32 nPos)
{
- return *maPortions[nPos].get();
+ return *maPortions[nPos];
}
void TextPortionList::Append(TextPortion* p)
@@ -451,7 +451,7 @@ sal_Int32 TextPortionList::FindPortion(
sal_Int32 n = maPortions.size();
for (sal_Int32 i = 0; i < n; ++i)
{
- const TextPortion& rPortion = *maPortions[i].get();
+ const TextPortion& rPortion = *maPortions[i];
nTmpPos = nTmpPos + rPortion.GetLen();
if ( nTmpPos >= nCharPos )
{
@@ -472,7 +472,7 @@ sal_Int32 TextPortionList::GetStartPos(sal_Int32 nPortion)
sal_Int32 nPos = 0;
for (sal_Int32 i = 0; i < nPortion; ++i)
{
- const TextPortion& rPortion = *maPortions[i].get();
+ const TextPortion& rPortion = *maPortions[i];
nPos = nPos + rPortion.GetLen();
}
return nPos;
@@ -1067,7 +1067,7 @@ sal_Int32 EditLineList::FindLine(sal_Int32 nChar, bool bInclEnd)
sal_Int32 n = maLines.size();
for (sal_Int32 i = 0; i < n; ++i)
{
- const EditLine& rLine = *maLines[i].get();
+ const EditLine& rLine = *maLines[i];
if ( (bInclEnd && (rLine.GetEnd() >= nChar)) ||
(rLine.GetEnd() > nChar) )
{
@@ -1086,12 +1086,12 @@ sal_Int32 EditLineList::Count() const
const EditLine& EditLineList::operator[](sal_Int32 nPos) const
{
- return *maLines[nPos].get();
+ return *maLines[nPos];
}
EditLine& EditLineList::operator[](sal_Int32 nPos)
{
- return *maLines[nPos].get();
+ return *maLines[nPos];
}
void EditLineList::Append(EditLine* p)
@@ -1282,7 +1282,7 @@ void ContentNode::ExpandAttribs( sal_Int32 nIndex, sal_Int32 nNew, SfxItemPool&
sal_uInt16 nW = pAttrib->GetItem()->Which();
for ( sal_Int32 nA = 0; nA < nAttr; nA++ )
{
- const EditCharAttrib& r = *aCharAttribList.GetAttribs()[nA].get();
+ const EditCharAttrib& r = *aCharAttribList.GetAttribs()[nA];
if ( ( r.GetStart() == 0 ) && ( r.GetItem()->Which() == nW ) )
{
bExpand = false;
@@ -1610,7 +1610,7 @@ sal_uLong ContentNode::GetExpandedLen() const
const CharAttribList::AttribsType& rAttrs = GetCharAttribs().GetAttribs();
for (sal_Int32 nAttr = rAttrs.size(); nAttr; )
{
- const EditCharAttrib& rAttr = *rAttrs[--nAttr].get();
+ const EditCharAttrib& rAttr = *rAttrs[--nAttr];
if (rAttr.Which() == EE_FEATURE_FIELD)
{
nLen += static_cast<const EditCharAttribField&>(rAttr).GetFieldValue().getLength();
@@ -1671,7 +1671,7 @@ void ContentNode::UnExpandPosition( sal_Int32 &rPos, bool bBiasStart )
const CharAttribList::AttribsType& rAttrs = GetCharAttribs().GetAttribs();
for (size_t nAttr = 0; nAttr < rAttrs.size(); ++nAttr )
{
- const EditCharAttrib& rAttr = *rAttrs[nAttr].get();
+ const EditCharAttrib& rAttr = *rAttrs[nAttr];
assert (!(nAttr < rAttrs.size() - 1) ||
rAttrs[nAttr]->GetStart() <= rAttrs[nAttr + 1]->GetStart());
@@ -1951,7 +1951,7 @@ void EditDoc::RemoveItemsFromPool(const ContentNode& rNode)
{
for (sal_Int32 nAttr = 0; nAttr < rNode.GetCharAttribs().Count(); ++nAttr)
{
- const EditCharAttrib& rAttr = *rNode.GetCharAttribs().GetAttribs()[nAttr].get();
+ const EditCharAttrib& rAttr = *rNode.GetCharAttribs().GetAttribs()[nAttr];
GetItemPool().Remove(*rAttr.GetItem());
}
}
@@ -2733,7 +2733,7 @@ void CharAttribList::InsertAttrib( EditCharAttrib* pAttrib )
bool bInsert(true);
for (sal_Int32 i = 0, n = aAttribs.size(); i < n; ++i)
{
- const EditCharAttrib& rCurAttrib = *aAttribs[i].get();
+ const EditCharAttrib& rCurAttrib = *aAttribs[i];
if (rCurAttrib.GetStart() > nStart)
{
aAttribs.insert(aAttribs.begin()+i, std::unique_ptr<EditCharAttrib>(pAttrib));
@@ -2765,10 +2765,10 @@ void CharAttribList::OptimizeRanges( SfxItemPool& rItemPool )
#endif
for (sal_Int32 i = 0; i < static_cast<sal_Int32>(aAttribs.size()); ++i)
{
- EditCharAttrib& rAttr = *aAttribs[i].get();
+ EditCharAttrib& rAttr = *aAttribs[i];
for (sal_Int32 nNext = i+1; nNext < static_cast<sal_Int32>(aAttribs.size()); ++nNext)
{
- EditCharAttrib& rNext = *aAttribs[nNext].get();
+ EditCharAttrib& rNext = *aAttribs[nNext];
if (!rAttr.IsFeature() && rNext.GetStart() == rAttr.GetEnd() && rNext.Which() == rAttr.Which())
{
if (*rNext.GetItem() == *rAttr.GetItem())
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 582c42d56062..d787bc65628c 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2335,7 +2335,7 @@ void EditEngine::RemoveFields( const std::function<bool ( const SvxFieldData* )>
const CharAttribList::AttribsType& rAttrs = pNode->GetCharAttribs().GetAttribs();
for (size_t nAttr = rAttrs.size(); nAttr; )
{
- const EditCharAttrib& rAttr = *rAttrs[--nAttr].get();
+ const EditCharAttrib& rAttr = *rAttrs[--nAttr];
if (rAttr.Which() == EE_FEATURE_FIELD)
{
const SvxFieldData* pFldData = static_cast<const SvxFieldItem*>(rAttr.GetItem())->GetField();
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index be4f1d920c92..eab2d3645f30 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -105,7 +105,7 @@ void XParaPortionList::push_back(XParaPortion* p)
const XParaPortion& XParaPortionList::operator [](size_t i) const
{
- return *maList[i].get();
+ return *maList[i];
}
ContentInfo::ContentInfo( SfxItemPool& rPool ) :
@@ -687,7 +687,7 @@ void EditTextObjectImpl::GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttr
return;
rLst.clear();
- const ContentInfo& rC = *aContents[nPara].get();
+ const ContentInfo& rC = *aContents[nPara];
for (const auto & aAttrib : rC.maCharAttribs)
{
const XEditAttribute& rAttr = *aAttrib;
@@ -708,13 +708,13 @@ const SvxFieldItem* EditTextObjectImpl::GetField() const
{
if (aContents.size() == 1)
{
- const ContentInfo& rC = *aContents[0].get();
+ const ContentInfo& rC = *aContents[0];
if (rC.GetText().getLength() == 1)
{
size_t nAttribs = rC.maCharAttribs.size();
for (size_t nAttr = nAttribs; nAttr; )
{
- const XEditAttribute& rX = *rC.maCharAttribs[--nAttr].get();
+ const XEditAttribute& rX = *rC.maCharAttribs[--nAttr];
if (rX.GetItem()->Which() == EE_FEATURE_FIELD)
return static_cast<const SvxFieldItem*>(rX.GetItem());
}
@@ -728,7 +728,7 @@ const SvxFieldData* EditTextObjectImpl::GetFieldData(sal_Int32 nPara, size_t nPo
if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size())
return nullptr;
- const ContentInfo& rC = *aContents[nPara].get();
+ const ContentInfo& rC = *aContents[nPara];
if (nPos >= rC.maCharAttribs.size())
// URL position is out-of-bound.
return nullptr;
@@ -762,11 +762,11 @@ bool EditTextObjectImpl::HasField( sal_Int32 nType ) const
size_t nParagraphs = aContents.size();
for (size_t nPara = 0; nPara < nParagraphs; ++nPara)
{
- const ContentInfo& rC = *aContents[nPara].get();
+ const ContentInfo& rC = *aContents[nPara];
size_t nAttrs = rC.maCharAttribs.size();
for (size_t nAttr = 0; nAttr < nAttrs; ++nAttr)
{
- const XEditAttribute& rAttr = *rC.maCharAttribs[nAttr].get();
+ const XEditAttribute& rAttr = *rC.maCharAttribs[nAttr];
if (rAttr.GetItem()->Which() != EE_FEATURE_FIELD)
continue;
@@ -784,7 +784,7 @@ bool EditTextObjectImpl::HasField( sal_Int32 nType ) const
const SfxItemSet& EditTextObjectImpl::GetParaAttribs(sal_Int32 nPara) const
{
- const ContentInfo& rC = *aContents[nPara].get();
+ const ContentInfo& rC = *aContents[nPara];
return rC.GetParaAttribs();
}
@@ -794,11 +794,11 @@ bool EditTextObjectImpl::RemoveCharAttribs( sal_uInt16 _nWhich )
for ( size_t nPara = aContents.size(); nPara; )
{
- ContentInfo& rC = *aContents[--nPara].get();
+ ContentInfo& rC = *aContents[--nPara];
for (size_t nAttr = rC.maCharAttribs.size(); nAttr; )
{
- XEditAttribute& rAttr = *rC.maCharAttribs[--nAttr].get();
+ XEditAttribute& rAttr = *rC.maCharAttribs[--nAttr];
if ( !_nWhich || (rAttr.GetItem()->Which() == _nWhich) )
{
pPool->Remove(*rAttr.GetItem());
@@ -848,7 +848,7 @@ void EditTextObjectImpl::GetAllSections( std::vector<editeng::Section>& rAttrs )
// First pass: determine section borders for each paragraph.
for (size_t nPara = 0; nPara < aContents.size(); ++nPara)
{
- const ContentInfo& rC = *aContents[nPara].get();
+ const ContentInfo& rC = *aContents[nPara];
std::vector<size_t>& rBorders = aParaBorders[nPara];
rBorders.push_back(0);
rBorders.push_back(rC.GetText().getLength());
@@ -906,7 +906,7 @@ void EditTextObjectImpl::GetAllSections( std::vector<editeng::Section>& rAttrs )
std::vector<editeng::Section>::iterator itAttr = aAttrs.begin();
for (sal_Int32 nPara = 0; nPara < static_cast<sal_Int32>(aContents.size()); ++nPara)
{
- const ContentInfo& rC = *aContents[nPara].get();
+ const ContentInfo& rC = *aContents[nPara];
itAttr = std::find_if(itAttr, aAttrs.end(), FindByParagraph(nPara));
if (itAttr == aAttrs.end())
@@ -960,7 +960,7 @@ void EditTextObjectImpl::GetStyleSheet(sal_Int32 nPara, OUString& rName, SfxStyl
if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size())
return;
- const ContentInfo& rC = *aContents[nPara].get();
+ const ContentInfo& rC = *aContents[nPara];
rName = rC.GetStyle();
rFamily = rC.GetFamily();
}
@@ -970,7 +970,7 @@ void EditTextObjectImpl::SetStyleSheet(sal_Int32 nPara, const OUString& rName, c
if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size())
return;
- ContentInfo& rC = *aContents[nPara].get();
+ ContentInfo& rC = *aContents[nPara];
rC.SetStyle(rName);
rC.SetFamily(rFamily);
}
@@ -984,7 +984,7 @@ bool EditTextObjectImpl::ImpChangeStyleSheets(
for (size_t nPara = 0; nPara < nParagraphs; ++nPara)
{
- ContentInfo& rC = *aContents[nPara].get();
+ ContentInfo& rC = *aContents[nPara];
if ( rC.GetFamily() == eOldFamily )
{
if ( rC.GetStyle() == rOldName )
@@ -1053,8 +1053,8 @@ bool EditTextObjectImpl::isWrongListEqual(const EditTextObjectImpl& rCompare) co
for (size_t i = 0, n = aContents.size(); i < n; ++i)
{
- const ContentInfo& rCandA = *aContents[i].get();
- const ContentInfo& rCandB = *rCompare.aContents[i].get();
+ const ContentInfo& rCandA = *aContents[i];
+ const ContentInfo& rCandB = *rCompare.aContents[i];
if(!rCandA.isWrongListEqual(rCandB))
{
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index de6f4f4940b8..5ab476c98698 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -539,7 +539,7 @@ void EditUndoSetAttribs::Undo()
bool bFields = false;
for ( sal_Int32 nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ )
{
- const ContentAttribsInfo& rInf = *aPrevAttribs[nPara-aESel.nStartPara].get();
+ const ContentAttribsInfo& rInf = *aPrevAttribs[nPara-aESel.nStartPara];
// first the paragraph attributes ...
pEE->SetParaAttribsOnly(nPara, rInf.GetPrevParaAttribs());
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 5e16a43fe095..9ada4292ba12 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1214,7 +1214,7 @@ const SvxFieldItem* EditView::GetFieldAtSelection() const
const sal_Int32 nXPos = aPaM.GetIndex();
for (size_t nAttr = rAttrs.size(); nAttr; )
{
- const EditCharAttrib& rAttr = *rAttrs[--nAttr].get();
+ const EditCharAttrib& rAttr = *rAttrs[--nAttr];
if (rAttr.GetStart() == nXPos)
if (rAttr.Which() == EE_FEATURE_FIELD)
{
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 265dc3cbe79c..1137a1447e61 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1494,7 +1494,7 @@ const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_Int32* pPara,
const sal_Int32 nXPos = aPaM.GetIndex();
for (size_t nAttr = rAttrs.size(); nAttr; )
{
- const EditCharAttrib& rAttr = *rAttrs[--nAttr].get();
+ const EditCharAttrib& rAttr = *rAttrs[--nAttr];
if (rAttr.GetStart() == nXPos)
{
if (rAttr.Which() == EE_FEATURE_FIELD)
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 865d6554ca60..846687d763f8 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1849,7 +1849,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
const CharAttribList::AttribsType& rAttrs = pNode->GetCharAttribs().GetAttribs();
for (size_t nAttr = rAttrs.size(); nAttr; )
{
- const EditCharAttrib& rAttr = *rAttrs[--nAttr].get();
+ const EditCharAttrib& rAttr = *rAttrs[--nAttr];
if (rAttr.IsFeature() && rAttr.GetEnd() > nMinBreakPos && rAttr.GetEnd() <= nMaxBreakPos)
{
nMinBreakPos = rAttr.GetEnd();
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 836ae9557e6f..9e8110d4cde1 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1214,7 +1214,7 @@ EditSelection ImpEditEngine::InsertTextObject( const EditTextObject& rTextObject
bool bUpdateFields = false;
for (size_t nAttr = 0; nAttr < nNewAttribs; ++nAttr)
{
- const XEditAttribute& rX = *pC->GetCharAttribs()[nAttr].get();
+ const XEditAttribute& rX = *pC->GetCharAttribs()[nAttr];
// Can happen when paragraphs > 16K, it is simply wrapped.
//TODO! Still true, still needed?
if ( rX.GetEnd() <= aPaM.GetNode()->Len() )
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index dfb3395cd848..cb01c05b24f3 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -210,7 +210,7 @@ std::unique_ptr<EditUndoSetAttribs> ImpEditEngine::CreateAttribUndo( EditSelecti
for ( sal_Int32 nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ )
{
- const EditCharAttrib& rAttr = *pNode->GetCharAttribs().GetAttribs()[nAttr].get();
+ const EditCharAttrib& rAttr = *pNode->GetCharAttribs().GetAttribs()[nAttr];
if (rAttr.GetLen())
{
EditCharAttrib* pNew = MakeCharAttrib(*pPool, *rAttr.GetItem(), rAttr.GetStart(), rAttr.GetEnd());
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 06:15:11 +0000