From 2b0626e2e9d112280e9d9a296cc7d7ba3022bdc9 Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Wed, 27 Jul 2022 10:54:22 -0400 Subject: [PATCH] remove unused SETBULLETTEXT flag in editeng Already unused in initial import. Change-Id: I423442a2b036c64727af608fa667f1f8a427391f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137542 Tested-by: Jenkins Reviewed-by: Justin Luth --- compilerplugins/clang/unusedenumconstants.writeonly.results | 2 -- editeng/source/outliner/outliner.cxx | 6 ------ include/editeng/outliner.hxx | 1 - 3 files changed, 9 deletions(-) diff --git a/compilerplugins/clang/unusedenumconstants.writeonly.results b/compilerplugins/clang/unusedenumconstants.writeonly.results index 0d2f68303c8a..b4f02f215137 100644 --- a/compilerplugins/clang/unusedenumconstants.writeonly.results +++ b/compilerplugins/clang/unusedenumconstants.writeonly.results @@ -1492,8 +1492,6 @@ include/editeng/numitem.hxx:247 enum SvxNumRuleType OUTLINE_NUMBERING include/editeng/numitem.hxx:248 enum SvxNumRuleType PRESENTATION_NUMBERING -include/editeng/outliner.hxx:99 - enum ParaFlag SETBULLETTEXT include/editeng/outliner.hxx:190 enum OutlinerView::MouseTarget Outside include/editeng/svxrtf.hxx:207 diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 13e490f87b7f..ae4aac401bee 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -123,7 +123,6 @@ void Outliner::ParagraphInserted( sal_Int32 nPara ) pParaList->Insert( std::unique_ptr(pPara), nPara ); if( pEditEngine->IsInUndo() ) { - pPara->nFlags = ParaFlag::SETBULLETTEXT; pPara->bVisible = true; const SfxInt16Item& rLevel = pEditEngine->GetParaAttrib( nPara, EE_PARA_OUTLLEVEL ); pPara->SetDepth( rLevel.GetValue() ); @@ -665,7 +664,6 @@ void Outliner::SetStyleSheet( sal_Int32 nPara, SfxStyleSheet* pStyle ) if (pPara) { pEditEngine->SetStyleSheet( nPara, pStyle ); - pPara->nFlags |= ParaFlag::SETBULLETTEXT; ImplCheckNumBulletItem( nPara ); } } @@ -1837,8 +1835,6 @@ void Outliner::ImplCalcBulletText( sal_Int32 nPara, bool bRecalcLevel, bool bRec if (pPara->GetText() != aBulletText) pPara->SetText( aBulletText ); - pPara->nFlags &= ~ParaFlag::SETBULLETTEXT; - if ( bRecalcLevel ) { sal_Int16 nDepth = pPara->GetDepth(); @@ -1897,8 +1893,6 @@ OUString Outliner::ImplGetBulletText( sal_Int32 nPara ) Paragraph* pPara = pParaList->GetParagraph( nPara ); if (pPara) { - // Enable optimization again ... -// if( pPara->nFlags & ParaFlag::SETBULLETTEXT ) ImplCalcBulletText( nPara, false, false ); aRes = pPara->GetText(); } diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index ab24be0b1e0e..6e19aa129a78 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -96,7 +96,6 @@ enum class ParaFlag { NONE = 0x0000, HOLDDEPTH = 0x4000, - SETBULLETTEXT = 0x8000, ISPAGE = 0x0100, }; namespace o3tl