diff options
| -rw-r--r-- | include/svl/style.hxx | 2 | ||||
| -rw-r--r-- | svl/source/items/style.cxx | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/include/svl/style.hxx b/include/svl/style.hxx index b3db632c4841..5ad4d0d33773 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -216,7 +216,7 @@ private: SVL_DLLPRIVATE bool IsTrivialSearch() const; SfxStyleSheetBase* pCurrentStyle; - sal_uInt16 nCurrentPosition; + sal_Int32 mnCurrentPosition; bool bSearchUsed; friend class SfxStyleSheetBasePool; diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 13b3d949027c..4e7655a9ae08 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -387,7 +387,7 @@ struct DoesStyleMatchStyleSheetPredicate final : public svl::StyleSheetPredicate SfxStyleSheetIterator::SfxStyleSheetIterator(SfxStyleSheetBasePool *pBase, SfxStyleFamily eFam, SfxStyleSearchBits n) : pCurrentStyle(nullptr) - , nCurrentPosition(0) + , mnCurrentPosition(0) { pBasePool=pBase; nSearchFamily=eFam; @@ -430,7 +430,7 @@ SfxStyleSheetBase* SfxStyleSheetIterator::operator[](sal_Int32 nIdx) if( IsTrivialSearch()) { retval = pBasePool->pImpl->mxIndexedStyleSheets->GetStyleSheetByPosition(nIdx); - nCurrentPosition = nIdx; + mnCurrentPosition = nIdx; } else if(nMask == SfxStyleSearchBits::All) { @@ -439,7 +439,7 @@ SfxStyleSheetBase* SfxStyleSheetIterator::operator[](sal_Int32 nIdx) pBasePool->pImpl->mxIndexedStyleSheets->GetStyleSheetPositionsByFamily(nSearchFamily).at(nIdx)) ; retval = ref.get(); - nCurrentPosition = nIdx; + mnCurrentPosition = nIdx; } else { @@ -448,7 +448,7 @@ SfxStyleSheetBase* SfxStyleSheetIterator::operator[](sal_Int32 nIdx) pBasePool->pImpl->mxIndexedStyleSheets->GetNthStyleSheetThatMatchesPredicate(nIdx, predicate); if (ref) { - nCurrentPosition = pBasePool->pImpl->mxIndexedStyleSheets->FindStyleSheetPosition(*ref); + mnCurrentPosition = pBasePool->pImpl->mxIndexedStyleSheets->FindStyleSheetPosition(*ref); retval = ref.get(); } } @@ -478,22 +478,22 @@ SfxStyleSheetBase* SfxStyleSheetIterator::Next() if ( IsTrivialSearch() ) { sal_Int32 nStyleSheets = pBasePool->pImpl->mxIndexedStyleSheets->GetNumberOfStyleSheets(); - sal_Int32 newPosition = nCurrentPosition + 1; + sal_Int32 newPosition = mnCurrentPosition + 1; if (nStyleSheets > newPosition) { - nCurrentPosition = newPosition; - retval = pBasePool->pImpl->mxIndexedStyleSheets->GetStyleSheetByPosition(nCurrentPosition); + mnCurrentPosition = newPosition; + retval = pBasePool->pImpl->mxIndexedStyleSheets->GetStyleSheetByPosition(mnCurrentPosition); } } else if(nMask == SfxStyleSearchBits::All) { - sal_Int32 newPosition = nCurrentPosition + 1; + sal_Int32 newPosition = mnCurrentPosition + 1; const std::vector<sal_Int32>& familyVector = pBasePool->pImpl->mxIndexedStyleSheets->GetStyleSheetPositionsByFamily(nSearchFamily); if (static_cast<sal_Int32>(familyVector.size()) > newPosition) { - nCurrentPosition = newPosition; + mnCurrentPosition = newPosition; sal_Int32 stylePosition = familyVector[newPosition]; retval = pBasePool->pImpl->mxIndexedStyleSheets->GetStyleSheetByPosition(stylePosition); } @@ -503,10 +503,10 @@ SfxStyleSheetBase* SfxStyleSheetIterator::Next() DoesStyleMatchStyleSheetPredicate predicate(this); rtl::Reference< SfxStyleSheetBase > ref = pBasePool->pImpl->mxIndexedStyleSheets->GetNthStyleSheetThatMatchesPredicate( - 0, predicate, nCurrentPosition+1); + 0, predicate, mnCurrentPosition+1); retval = ref.get(); if (retval != nullptr) { - nCurrentPosition = pBasePool->pImpl->mxIndexedStyleSheets->FindStyleSheetPosition(*ref); + mnCurrentPosition = pBasePool->pImpl->mxIndexedStyleSheets->FindStyleSheetPosition(*ref); } } pCurrentStyle = retval; @@ -526,7 +526,7 @@ SfxStyleSheetBase* SfxStyleSheetIterator::Find(const OUString& rStr) sal_Int32 pos = positions.front(); SfxStyleSheetBase* pStyle = pBasePool->pImpl->mxIndexedStyleSheets->GetStyleSheetByPosition(pos); - nCurrentPosition = pos; + mnCurrentPosition = pos; pCurrentStyle = pStyle; return pCurrentStyle; } |