sw/inc/view.hxx | 4 ++-- sw/source/core/text/inftxt.cxx | 4 ++-- sw/source/uibase/docvw/edtwin2.cxx | 4 ++-- sw/source/uibase/uiview/view0.cxx | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-)
New commits: commit c2930f9721f5186c5cc96d6ff28eeaa10c205e60 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Sep 10 10:34:06 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Sep 10 12:23:07 2025 +0200 sw: rename variable To be inline with the other ones after commit 6fc54eea2f904a6704495f6b53fd5eff0dff1496 Author: Xisco Fauli <[email protected]> Date: Mon Sep 8 19:55:45 2025 +0200 crashreport: avoid crash in InspectorTextPanel Change-Id: If3ac530ee069a9d1ed308c96a0633cad40cbe78c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190737 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 7380d225139c..843536a5026d 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -272,7 +272,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell int m_nMaxOutlineLevelShown = 10; - bool m_bIsHighlightCharDF = false; + bool m_bIsSpotlightCharDF = false; bool m_bIsSpotlightParaStyles = false; bool m_bIsSpotlightCharStyles = false; @@ -734,7 +734,7 @@ public: virtual void flushPendingLOKInvalidateTiles() override; virtual std::optional<OString> getLOKPayload(int nType, int nViewId) const override; - bool IsHighlightCharDF() const { return m_bIsHighlightCharDF; } + bool IsSpotlightCharDF() const { return m_bIsSpotlightCharDF; } bool IsSpotlightParaStyles() const { return m_bIsSpotlightParaStyles; } bool IsSpotlightCharStyles() const { return m_bIsSpotlightCharStyles; } diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index a9333e66b9b4..4f6eca343c12 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -1375,7 +1375,7 @@ void SwTextPaintInfo::DrawCSDFHighlighting(const SwLinePortion &rPor) const if (!pView) return; - if (!pView->IsSpotlightCharStyles() && !pView->IsHighlightCharDF()) + if (!pView->IsSpotlightCharStyles() && !pView->IsSpotlightCharDF()) return; SwRect aRect; @@ -1430,7 +1430,7 @@ void SwTextPaintInfo::DrawCSDFHighlighting(const SwLinePortion &rPor) const } } // not character style formatted - else if (pView->IsHighlightCharDF()) + else if (pView->IsSpotlightCharDF()) { const std::vector<OUString> aHiddenProperties{ UNO_NAME_RSID, UNO_NAME_PARA_IS_NUMBERING_RESTART, diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx index d087cc2c666c..7da57f94f37c 100644 --- a/sw/source/uibase/docvw/edtwin2.cxx +++ b/sw/source/uibase/docvw/edtwin2.cxx @@ -105,7 +105,7 @@ bool PSCSDFPropsQuickHelp(const HelpEvent &rEvt, SwWrtShell& rSh) UIName sText; SwView& rView = rSh.GetView(); - if (rView.IsHighlightCharDF() || rView.IsSpotlightParaStyles() + if (rView.IsSpotlightCharDF() || rView.IsSpotlightParaStyles() || rView.IsSpotlightCharStyles()) { SwPosition aPos(rSh.GetDoc()->GetNodes()); @@ -150,7 +150,7 @@ bool PSCSDFPropsQuickHelp(const HelpEvent &rEvt, SwWrtShell& rSh) sText = SwStyleNameMapper::GetUIName(ProgName(sCharStyle), SwGetPoolIdFromName::ChrFmt); } - if (sText.isEmpty() && rView.IsHighlightCharDF()) + if (sText.isEmpty() && rView.IsSpotlightCharDF()) { // check if in direct formatting highlighted area const std::vector<OUString> aHiddenProperties{ UNO_NAME_RSID, diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index 0147e3679cba..e88730ce0ba7 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -360,7 +360,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet) aBool.SetValue( pOpt->IsShowChangesInMargin() ); break; case SID_SPOTLIGHT_CHAR_DF: - aBool.SetValue(m_bIsHighlightCharDF); + aBool.SetValue(m_bIsSpotlightCharDF); break; case SID_SPOTLIGHT_PARASTYLES: aBool.SetValue(m_bIsSpotlightParaStyles); @@ -596,8 +596,8 @@ void SwView::ExecViewOptions(SfxRequest &rReq) case SID_SPOTLIGHT_CHAR_DF: if (STATE_TOGGLE == eState) - bFlag = !m_bIsHighlightCharDF; - m_bIsHighlightCharDF = bFlag; + bFlag = !m_bIsSpotlightCharDF; + m_bIsSpotlightCharDF = bFlag; break; case SID_SPOTLIGHT_PARASTYLES:
