include/sfx2/viewsh.hxx            |   10 ++---
 include/svl/hint.hxx               |    2 -
 sfx2/source/dialog/StyleList.cxx   |   64 +++++++++++++++++--------------------
 sfx2/source/dialog/templdlg.cxx    |   30 ++++++++---------
 sfx2/source/inc/StyleList.hxx      |   16 ++++-----
 sfx2/source/inc/templdgi.hxx       |    4 +-
 sfx2/uiconfig/ui/templatepanel.ui  |    8 ++--
 sw/source/core/layout/paintfrm.cxx |    4 +-
 sw/source/core/text/inftxt.cxx     |    2 -
 sw/source/uibase/uiview/view.cxx   |    4 +-
 10 files changed, 71 insertions(+), 73 deletions(-)

New commits:
commit 22ef238e820955f6f8ac84781289b8a1d8e477b9
Author:     Jim Raykowski <[email protected]>
AuthorDate: Thu Apr 3 09:43:51 2025 -0800
Commit:     Jim Raykowski <[email protected]>
CommitDate: Fri Apr 4 21:53:28 2025 +0200

    Replace 'highlight' with 'spotlight' in variable names used in the
    
    styles spotlight feature
    
    The feature was initially referred to as styles highlighter. Shortly
    before merging it was relabeled styles spotlight.
    
    Change-Id: Ie65c6dd9c759c6ff1ea0ca23642a4041a932881c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183693
    Reviewed-by: Vernon, Stuart Foote <[email protected]>
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <[email protected]>

diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 3680a515e8cc..c49fa11c8902 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -153,7 +153,7 @@ template<class T> bool checkSfxViewShell(const 
SfxViewShell& pShell)
     return dynamic_cast<const T*>(&pShell) != nullptr;
 }
 
-typedef std::unordered_map<OUString, std::pair<Color, int>> 
StylesHighlighterColorMap;
+typedef std::unordered_map<OUString, std::pair<Color, int>> 
StylesSpotlightColorMap;
 
 /**
  * One SfxViewShell more or less represents one edit window for a document, 
there can be multiple
@@ -185,8 +185,8 @@ friend class SfxPrinterController;
     /// Used for async export
     std::shared_ptr<SfxStoringHelper> m_xHelper;
 
-    StylesHighlighterColorMap ParaStylesColorMap;
-    StylesHighlighterColorMap CharStylesColorMap;
+    StylesSpotlightColorMap ParaStylesSpotlightColorMap;
+    StylesSpotlightColorMap CharStylesSpotlightColorMap;
 
 protected:
     virtual void                Activate(bool IsMDIActivate) override;
@@ -488,8 +488,8 @@ public:
 
     void SetStoringHelper(const std::shared_ptr<SfxStoringHelper>& xHelper) { 
m_xHelper = xHelper; }
 
-    StylesHighlighterColorMap& GetStylesHighlighterParaColorMap() { return 
ParaStylesColorMap; }
-    StylesHighlighterColorMap& GetStylesHighlighterCharColorMap() { return 
CharStylesColorMap; }
+    StylesSpotlightColorMap& GetStylesSpotlightParaColorMap() { return 
ParaStylesSpotlightColorMap; }
+    StylesSpotlightColorMap& GetStylesSpotlightCharColorMap() { return 
CharStylesSpotlightColorMap; }
 
     OUString getA11yFocusedParagraph() const;
     int getA11yCaretPosition() const;
diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index f38dd0d95435..1c2ec92de7d1 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -155,7 +155,7 @@ enum class SfxHintId {
     StyleSheetChanged,  // erased and re-created (replaced)
     StyleSheetErased,  // erased
     StyleSheetInDestruction,  // in the process of being destructed
-    StylesHighlighterModified,  // what styles to highlight in a document 
changed
+    StylesSpotlightModified,  // what styles to spotlight in a document changed
 
 // STARMATH
     MathFormatChanged,
diff --git a/sfx2/source/dialog/StyleList.cxx b/sfx2/source/dialog/StyleList.cxx
index b925b7e6e6a9..6643cc8e2981 100644
--- a/sfx2/source/dialog/StyleList.cxx
+++ b/sfx2/source/dialog/StyleList.cxx
@@ -130,7 +130,7 @@ Color ColorHash(std::u16string_view rString)
 
 namespace
 {
-// used to disallow the default character style in the styles highlighter 
character styles color map
+// used to disallow the default character style in the styles spotlight 
character styles color map
 std::optional<OUString> sDefaultCharStyleUIName;
 }
 
@@ -168,7 +168,7 @@ StyleList::StyleList(weld::Builder* pBuilder, SfxBindings* 
pBindings,
 
     uno::Reference<frame::XFrame> xFrame
         = 
m_pBindings->GetDispatcher()->GetFrame()->GetFrame().GetFrameInterface();
-    m_bModuleHasStylesHighlighterFeature
+    m_bModuleHasStylesSpotlightFeature
         = vcl::CommandInfoProvider::GetModuleIdentifier(xFrame) == 
"com.sun.star.text.TextDocument";
 }
 
@@ -246,7 +246,7 @@ IMPL_LINK_NOARG(StyleList, ReadResource, void*, size_t)
         {
             m_nActFilter = m_pCurObjShell->GetAutoStyleFilterIndex();
         }
-        if (m_bModuleHasStylesHighlighterFeature)
+        if (m_bModuleHasStylesSpotlightFeature)
             sDefaultCharStyleUIName = 
getDefaultStyleName(SfxStyleFamily::Char);
     }
     size_t nCount = m_aStyleFamilies.size();
@@ -724,9 +724,9 @@ static void lcl_Update(weld::TreeView& rTreeView, const 
weld::TreeIter& rIter,
         nSpotlightId = rEntry.getSpotlightId();
     else
     {
-        StylesHighlighterColorMap& rColorMap = (eFam == SfxStyleFamily::Para)
-                                                   ? 
pViewSh->GetStylesHighlighterParaColorMap()
-                                                   : 
pViewSh->GetStylesHighlighterCharColorMap();
+        StylesSpotlightColorMap& rColorMap = (eFam == SfxStyleFamily::Para)
+                                                 ? 
pViewSh->GetStylesSpotlightParaColorMap()
+                                                 : 
pViewSh->GetStylesSpotlightCharColorMap();
         nSpotlightId = rColorMap.size();
         rColorMap[rName] = std::pair(aColor, nSpotlightId);
     }
@@ -1101,25 +1101,25 @@ void StyleList::FillTreeBox(SfxStyleFamily eFam)
     const sal_uInt16 nCount = aArr.size();
 
     SfxViewShell* pViewShell = m_pCurObjShell->GetViewShell();
-    StylesHighlighterColorMap* pHighlighterColorMap = nullptr;
+    StylesSpotlightColorMap* pSpotlightColorMap = nullptr;
     bool bOrigMapHasEntries = false;
-    if (pViewShell && m_bModuleHasStylesHighlighterFeature)
+    if (pViewShell && m_bModuleHasStylesSpotlightFeature)
     {
         if (eFam == SfxStyleFamily::Para)
-            pHighlighterColorMap = 
&pViewShell->GetStylesHighlighterParaColorMap();
+            pSpotlightColorMap = &pViewShell->GetStylesSpotlightParaColorMap();
         else if (eFam == SfxStyleFamily::Char)
-            pHighlighterColorMap = 
&pViewShell->GetStylesHighlighterCharColorMap();
+            pSpotlightColorMap = &pViewShell->GetStylesSpotlightCharColorMap();
     }
 
-    if (pHighlighterColorMap && !pHighlighterColorMap->empty())
+    if (pSpotlightColorMap && !pSpotlightColorMap->empty())
     {
         bOrigMapHasEntries = true;
-        pHighlighterColorMap->clear();
+        pSpotlightColorMap->clear();
     }
 
-    bool blcl_insert = pViewShell && m_bModuleHasStylesHighlighterFeature
-                       && ((eFam == SfxStyleFamily::Para && 
m_bHighlightParaStyles)
-                           || (eFam == SfxStyleFamily::Char && 
m_bHighlightCharStyles));
+    bool blcl_insert = pViewShell && m_bModuleHasStylesSpotlightFeature
+                       && ((eFam == SfxStyleFamily::Para && 
m_bSpotlightParaStyles)
+                           || (eFam == SfxStyleFamily::Char && 
m_bSpotlightCharStyles));
 
     FillBox_Impl(*m_xTreeBox, aArr, eFam, nullptr, blcl_insert, pViewShell, 
m_pStyleSheetPool);
     for (sal_uInt16 i = 0; i < nCount; ++i)
@@ -1134,10 +1134,9 @@ void StyleList::FillTreeBox(SfxStyleFamily eFam)
     m_xTreeBox->thaw();
 
     // make view update
-    if (pViewShell && pHighlighterColorMap
-        && (!pHighlighterColorMap->empty() || bOrigMapHasEntries))
+    if (pViewShell && pSpotlightColorMap && (!pSpotlightColorMap->empty() || 
bOrigMapHasEntries))
         static_cast<SfxListener*>(pViewShell)
-            ->Notify(*m_pStyleSheetPool, 
SfxHint(SfxHintId::StylesHighlighterModified));
+            ->Notify(*m_pStyleSheetPool, 
SfxHint(SfxHintId::StylesSpotlightModified));
 
     std::unique_ptr<weld::TreeIter> xEntry = m_xTreeBox->make_iterator();
     bool bEntry = m_xTreeBox->get_iter_first(*xEntry);
@@ -1304,27 +1303,27 @@ void StyleList::UpdateStyles(StyleFlags nFlags)
     m_xFmtLb->clear();
 
     SfxViewShell* pViewShell = m_pCurObjShell->GetViewShell();
-    StylesHighlighterColorMap* pHighlighterColorMap = nullptr;
+    StylesSpotlightColorMap* pSpotlightColorMap = nullptr;
     bool bOrigMapHasEntries = false;
-    if (pViewShell && m_bModuleHasStylesHighlighterFeature)
+    if (pViewShell && m_bModuleHasStylesSpotlightFeature)
     {
         if (eFam == SfxStyleFamily::Para)
-            pHighlighterColorMap = 
&pViewShell->GetStylesHighlighterParaColorMap();
+            pSpotlightColorMap = &pViewShell->GetStylesSpotlightParaColorMap();
         else if (eFam == SfxStyleFamily::Char)
-            pHighlighterColorMap = 
&pViewShell->GetStylesHighlighterCharColorMap();
+            pSpotlightColorMap = &pViewShell->GetStylesSpotlightCharColorMap();
     }
 
-    if (pHighlighterColorMap && !pHighlighterColorMap->empty())
+    if (pSpotlightColorMap && !pSpotlightColorMap->empty())
     {
         bOrigMapHasEntries = true;
-        pHighlighterColorMap->clear();
+        pSpotlightColorMap->clear();
     }
 
     size_t nCount = aStyles.size();
 
-    if (pViewShell && m_bModuleHasStylesHighlighterFeature
-        && ((eFam == SfxStyleFamily::Para && m_bHighlightParaStyles)
-            || (eFam == SfxStyleFamily::Char && m_bHighlightCharStyles)))
+    if (pViewShell && m_bModuleHasStylesSpotlightFeature
+        && ((eFam == SfxStyleFamily::Para && m_bSpotlightParaStyles)
+            || (eFam == SfxStyleFamily::Char && m_bSpotlightCharStyles)))
     {
         m_xFmtLb->bulk_insert_for_each(
             nCount,
@@ -1357,10 +1356,9 @@ void StyleList::UpdateStyles(StyleFlags nFlags)
     m_xFmtLb->thaw();
 
     // make view update
-    if (pViewShell && pHighlighterColorMap
-        && (!pHighlighterColorMap->empty() || bOrigMapHasEntries))
+    if (pViewShell && pSpotlightColorMap && (!pSpotlightColorMap->empty() || 
bOrigMapHasEntries))
         static_cast<SfxListener*>(pViewShell)
-            ->Notify(*m_pStyleSheetPool, 
SfxHint(SfxHintId::StylesHighlighterModified));
+            ->Notify(*m_pStyleSheetPool, 
SfxHint(SfxHintId::StylesSpotlightModified));
 
     // Selects the current style if any
     SfxTemplateItem* pState = m_pFamilyState[m_nActFamily - 1].get();
@@ -1557,13 +1555,13 @@ IMPL_LINK_NOARG(StyleList, EnableDelete, void*, void)
 
 IMPL_LINK_NOARG(StyleList, Clear, void*, void)
 {
-    if (m_pCurObjShell && m_bModuleHasStylesHighlighterFeature)
+    if (m_pCurObjShell && m_bModuleHasStylesSpotlightFeature)
     {
         SfxViewShell* pViewShell = m_pCurObjShell->GetViewShell();
         if (pViewShell)
         {
-            pViewShell->GetStylesHighlighterParaColorMap().clear();
-            pViewShell->GetStylesHighlighterCharColorMap().clear();
+            pViewShell->GetStylesSpotlightParaColorMap().clear();
+            pViewShell->GetStylesSpotlightCharColorMap().clear();
         }
     }
     m_aStyleFamilies.clear();
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 20515f2d1f0d..9204e8779478 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -175,9 +175,9 @@ void SfxTemplatePanelControl::NotifyItemUpdate(const 
sal_uInt16 nSId, const SfxI
                 if (pItem)
                 {
                     bool bValue = pItem->GetValue();
-                    if (bValue || (!bValue && 
pImpl->m_aStyleList.IsHighlightParaStyles()))
+                    if (bValue || (!bValue && 
pImpl->m_aStyleList.IsSpotlightParaStyles()))
                     {
-                        pImpl->m_aStyleList.SetHighlightParaStyles(bValue);
+                        pImpl->m_aStyleList.SetSpotlightParaStyles(bValue);
                         
pImpl->FamilySelect(SfxTemplate::SfxFamilyIdToNId(SfxStyleFamily::Para),
                                             pImpl->m_aStyleList, true);
                     }
@@ -191,9 +191,9 @@ void SfxTemplatePanelControl::NotifyItemUpdate(const 
sal_uInt16 nSId, const SfxI
                 if (pItem)
                 {
                     bool bValue = pItem->GetValue();
-                    if (bValue || (!bValue && 
pImpl->m_aStyleList.IsHighlightCharStyles()))
+                    if (bValue || (!bValue && 
pImpl->m_aStyleList.IsSpotlightCharStyles()))
                     {
-                        pImpl->m_aStyleList.SetHighlightCharStyles(bValue);
+                        pImpl->m_aStyleList.SetSpotlightCharStyles(bValue);
                         
pImpl->FamilySelect(SfxTemplate::SfxFamilyIdToNId(SfxStyleFamily::Char),
                                             pImpl->m_aStyleList, true);
                     }
@@ -243,7 +243,7 @@ 
SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl(SfxBindings* pB, weld
     , m_pDeletionWatcher(nullptr)
     , m_aStyleList(pBuilder, pB, this, pC, u"treeview"_ustr, u"flatview"_ustr)
     , mxPreviewCheckbox(pBuilder->weld_check_button(u"showpreview"_ustr))
-    , mxHighlightCheckbox(pBuilder->weld_check_button(u"highlightstyles"_ustr))
+    , mxSpotlightCheckbox(pBuilder->weld_check_button(u"spotlightstyles"_ustr))
     , mxFilterLb(pBuilder->weld_combo_box(u"filter"_ustr))
     , nActFamily(0xffff)
     , nActFilter(0)
@@ -333,12 +333,12 @@ void SfxCommonTemplateDialog_Impl::Initialize()
 
     mxFilterLb->connect_changed(LINK(this, SfxCommonTemplateDialog_Impl, 
FilterSelectHdl));
     mxPreviewCheckbox->connect_toggled(LINK(this, 
SfxCommonTemplateDialog_Impl, PreviewHdl));
-    mxHighlightCheckbox->connect_toggled(LINK(this, 
SfxCommonTemplateDialog_Impl, HighlightHdl));
+    mxSpotlightCheckbox->connect_toggled(LINK(this, 
SfxCommonTemplateDialog_Impl, SpotlightHdl));
 
     m_aStyleList.Initialize();
 
     SfxStyleFamily eFam = SfxTemplate::NIdToSfxFamilyId(nActFamily);
-    mxHighlightCheckbox->set_visible(m_aStyleList.HasStylesHighlighterFeature()
+    mxSpotlightCheckbox->set_visible(m_aStyleList.HasStylesSpotlightFeature()
                                 && (eFam == SfxStyleFamily::Para || eFam == 
SfxStyleFamily::Char));
 }
 
@@ -399,13 +399,13 @@ 
SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
 {
     // Set the UNO's in an 'off' state. FN_PARAM_1 is used to prevent the 
sidebar from trying to
     // reopen while it is being closed here.
-    if (m_aStyleList.IsHighlightParaStyles())
+    if (m_aStyleList.IsSpotlightParaStyles())
     {
         SfxDispatcher &rDispatcher = *SfxGetpApp()->GetDispatcher_Impl();
         SfxFlagItem aParam(FN_PARAM_1);
         rDispatcher.ExecuteList(SID_SPOTLIGHT_PARASTYLES, 
SfxCallMode::SYNCHRON, { &aParam });
     }
-    if (m_aStyleList.IsHighlightCharStyles())
+    if (m_aStyleList.IsSpotlightCharStyles())
     {
         SfxDispatcher &rDispatcher = *SfxGetpApp()->GetDispatcher_Impl();
         SfxFlagItem aParam(FN_PARAM_1);
@@ -618,16 +618,16 @@ void 
SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry, StyleList&, b
         m_aStyleList.FamilySelect(nEntry, bRefresh);
 
         SfxStyleFamily eFam = SfxTemplate::NIdToSfxFamilyId(nActFamily);
-        
mxHighlightCheckbox->set_visible(m_aStyleList.HasStylesHighlighterFeature()
+        
mxSpotlightCheckbox->set_visible(m_aStyleList.HasStylesSpotlightFeature()
                                 && (eFam == SfxStyleFamily::Para || eFam == 
SfxStyleFamily::Char));
-        if (mxHighlightCheckbox->is_visible())
+        if (mxSpotlightCheckbox->is_visible())
         {
             bool bActive = false;
             if (eFam == SfxStyleFamily::Para)
-                bActive = m_aStyleList.IsHighlightParaStyles();
+                bActive = m_aStyleList.IsSpotlightParaStyles();
             else if (eFam == SfxStyleFamily::Char)
-                bActive = m_aStyleList.IsHighlightCharStyles();
-            mxHighlightCheckbox->set_active(bActive);
+                bActive = m_aStyleList.IsSpotlightCharStyles();
+            mxSpotlightCheckbox->set_active(bActive);
         }
     }
 }
@@ -743,7 +743,7 @@ IMPL_LINK_NOARG(SfxCommonTemplateDialog_Impl, PreviewHdl, 
weld::Toggleable&, voi
     FamilySelect(nActFamily, m_aStyleList, true);
 }
 
-IMPL_LINK_NOARG(SfxCommonTemplateDialog_Impl, HighlightHdl, weld::Toggleable&, 
void)
+IMPL_LINK_NOARG(SfxCommonTemplateDialog_Impl, SpotlightHdl, weld::Toggleable&, 
void)
 {
     SfxDispatcher &rDispatcher = *SfxGetpApp()->GetDispatcher_Impl();
     SfxStyleFamily eFam = SfxTemplate::NIdToSfxFamilyId(nActFamily);
diff --git a/sfx2/source/inc/StyleList.hxx b/sfx2/source/inc/StyleList.hxx
index 3d466409a67e..af2e7728d1f3 100644
--- a/sfx2/source/inc/StyleList.hxx
+++ b/sfx2/source/inc/StyleList.hxx
@@ -131,11 +131,11 @@ public:
     DECL_LINK(NewMenuExecuteAction, void*, void);
     DECL_LINK(OnPopupEnd, const OUString&, void);
 
-    bool HasStylesHighlighterFeature() { return 
m_bModuleHasStylesHighlighterFeature; }
-    void SetHighlightParaStyles(bool bSet) { m_bHighlightParaStyles = bSet; }
-    bool IsHighlightParaStyles() { return m_bHighlightParaStyles; }
-    void SetHighlightCharStyles(bool bSet) { m_bHighlightCharStyles = bSet; }
-    bool IsHighlightCharStyles() { return m_bHighlightCharStyles; }
+    bool HasStylesSpotlightFeature() { return 
m_bModuleHasStylesSpotlightFeature; }
+    void SetSpotlightParaStyles(bool bSet) { m_bSpotlightParaStyles = bSet; }
+    bool IsSpotlightParaStyles() { return m_bSpotlightParaStyles; }
+    void SetSpotlightCharStyles(bool bSet) { m_bSpotlightCharStyles = bSet; }
+    bool IsSpotlightCharStyles() { return m_bSpotlightCharStyles; }
 
 private:
     void FillTreeBox(SfxStyleFamily eFam);
@@ -243,7 +243,7 @@ private:
     sal_uInt16 m_nModifier;
     weld::Container* m_pContainer;
 
-    bool m_bModuleHasStylesHighlighterFeature = false;
-    bool m_bHighlightParaStyles = false;
-    bool m_bHighlightCharStyles = false;
+    bool m_bModuleHasStylesSpotlightFeature = false;
+    bool m_bSpotlightParaStyles = false;
+    bool m_bSpotlightCharStyles = false;
 };
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 59c21f659bd6..45fd1a04e540 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -69,7 +69,7 @@ protected:
 
     StyleList m_aStyleList;
     std::unique_ptr<weld::CheckButton> mxPreviewCheckbox;
-    std::unique_ptr<weld::CheckButton> mxHighlightCheckbox;
+    std::unique_ptr<weld::CheckButton> mxSpotlightCheckbox;
     std::unique_ptr<weld::ComboBox> mxFilterLb;
 
     sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1
@@ -98,7 +98,7 @@ protected:
 
     DECL_LINK(FilterSelectHdl, weld::ComboBox&, void );
     DECL_LINK(PreviewHdl, weld::Toggleable&, void);
-    DECL_LINK(HighlightHdl, weld::Toggleable&, void);
+    DECL_LINK(SpotlightHdl, weld::Toggleable&, void);
 
     virtual void InsertFamilyItem(sal_uInt16 nId, const SfxStyleFamilyItem& 
rItem) = 0;
     virtual void EnableFamilyItem(sal_uInt16 nId, bool bEnabled) = 0;
diff --git a/sfx2/uiconfig/ui/templatepanel.ui 
b/sfx2/uiconfig/ui/templatepanel.ui
index a5d232659113..239249f2f9f0 100644
--- a/sfx2/uiconfig/ui/templatepanel.ui
+++ b/sfx2/uiconfig/ui/templatepanel.ui
@@ -238,15 +238,15 @@
           </packing>
         </child>
         <child>
-          <object class="GtkCheckButton" id="highlightstyles">
-            <property name="label" translatable="yes" 
context="commontemplate|STR_HIGHLIGHT_CHECKBOX">Spotlight</property>
+          <object class="GtkCheckButton" id="spotlightstyles">
+            <property name="label" translatable="yes" 
context="commontemplate|STR_SPOTLIGHT_CHECKBOX">Spotlight</property>
             <property name="can-focus">True</property>
             <property name="receives-default">False</property>
             <property name="use-underline">True</property>
             <property name="draw-indicator">True</property>
             <child internal-child="accessible">
-              <object class="AtkObject" id="highlightstyles-atkobject">
-                <property name="AtkObject::accessible-description" 
translatable="yes" 
context="templatepanel|extended_tip|highlightstyles">Displays a color and a 
unique number code for each applied paragraph or character style in the 
document. </property>
+              <object class="AtkObject" id="spotlightstyles-atkobject">
+                <property name="AtkObject::accessible-description" 
translatable="yes" 
context="templatepanel|extended_tip|spotlightstyles">Displays a color and a 
unique number code for each applied paragraph or character style in the 
document. </property>
               </object>
             </child>
           </object>
diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 682dfd91a013..7f77966593dc 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4561,8 +4561,8 @@ void SwTextFrame::PaintParagraphStylesHighlighting() const
     }
     else
     {
-        StylesHighlighterColorMap& rParaStylesColorMap
-                = pWrtSh->GetView().GetStylesHighlighterParaColorMap();
+        StylesSpotlightColorMap& rParaStylesColorMap
+                = pWrtSh->GetView().GetStylesSpotlightParaColorMap();
         bSpotlightStyle = rParaStylesColorMap.contains(sStyleName);
         if (bSpotlightStyle)
         {
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index b8eca0f24575..b3e30c4c8c1d 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1374,7 +1374,7 @@ void SwTextPaintInfo::DrawCSDFHighlighting(const 
SwLinePortion &rPor) const
         {
             if (!sCharStyleDisplayName.isEmpty())
             {
-                StylesHighlighterColorMap& rCharStylesColorMap = 
pView->GetStylesHighlighterCharColorMap();
+                StylesSpotlightColorMap& rCharStylesColorMap = 
pView->GetStylesSpotlightCharColorMap();
                 auto it = rCharStylesColorMap.find(sCharStyleDisplayName);
                 if (it != rCharStylesColorMap.end())
                 {
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index ef116f50f38a..c5bec7511103 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1868,10 +1868,10 @@ void SwView::Notify( SfxBroadcaster& rBC, const 
SfxHint& rHint )
                 GetViewFrame().GetBindings().Invalidate(aSlotRedLine);
             }
             break;
-        case SfxHintId::StylesHighlighterModified:
+        case SfxHintId::StylesSpotlightModified:
             {
                 // we need to Invalidate to render with the new set of
-                // highlighted styles
+                // spotlighted styles
                 if (vcl::Window *pMyWin = GetWrtShell().GetWin())
                     pMyWin->Invalidate();
             }

Reply via email to