include/svl/hint.hxx | 4 ++--
svl/source/items/style.cxx | 2 +-
sw/source/core/layout/paintfrm.cxx | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 41581fe7d782f261c19594c89875666f99c91af1
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Apr 4 11:21:13 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Apr 4 13:41:03 2024 +0200
fix 'tdf#158773 reduce dynamic_cast'ing in CustomShapeProperties::Notify'
I messed up in
commit 9c5fda14fff397d5d503f749ad019791d7e4ef83
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Wed Mar 6 16:20:41 2024 +0200
tdf#158773 reduce dynamic_cast'ing in CustomShapeProperties::Notify
and forgot to actually use the new SfxHintId::StyleSheetModifiedExtended
I created in the constructor of the SfxStyleSheetHint class
Change-Id: Ica661a156d72c8a4b8ad415b6f45fe5d3458ba26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165787
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index 860ea4219c56..e8971934c7d4 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -103,8 +103,8 @@ enum class SfxHintId {
// SFX stylesheet
StyleSheetCreated, // new
- StyleSheetModified, // changed
- StyleSheetModifiedExtended, // changed, but using the
SfxStyleSheetModifiedHint, not the SfxStyleSheetHint
+ StyleSheetModified, // changed (used by the SfxStyleSheetHint class)
+ StyleSheetModifiedExtended, // changed (used by the
SfxStyleSheetModifiedHint class)
StyleSheetChanged, // erased and re-created (replaced)
StyleSheetErased, // erased
StyleSheetInDestruction, // in the process of being destructed
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 0f208ad1cf26..bcd90faeaef4 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -66,7 +66,7 @@ SfxStyleSheetModifiedHint::SfxStyleSheetModifiedHint
OUString aOldName,
SfxStyleSheetBase& rStyleSheet // Remains with the caller
)
-: SfxStyleSheetHint( SfxHintId::StyleSheetModified, rStyleSheet ),
+: SfxStyleSheetHint( SfxHintId::StyleSheetModifiedExtended, rStyleSheet ),
aName(std::move( aOldName ))
{}
commit 76fbdc6638824d2509d29a4993e5e5805bac65b0
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Apr 4 10:31:45 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Apr 4 13:40:52 2024 +0200
improve font name in SwPageFrame::GetEmptyPageFont()
Fix the problem similar to what commit
1d9221ebc86f2696a65c12287ea19eea44d680cf (tdf#124601 sw: fix misplaced
images in table cells, 2022-11-30) did: use a font that we ship to avoid
font fallback.
Change-Id: I59be457e018c96f7edda80fb5d3787593d75b010
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165784
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 8479436a88c8..8aa4c3738934 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -7730,7 +7730,7 @@ const vcl::Font& SwPageFrame::GetEmptyPageFont()
tmp.SetFontSize( Size( 0, 80 * 20 )); // == 80 pt
tmp.SetWeight( WEIGHT_BOLD );
tmp.SetStyleName(OUString());
- tmp.SetFamilyName("Helvetica");
+ tmp.SetFamilyName("Noto Sans");
tmp.SetFamily( FAMILY_SWISS );
tmp.SetTransparent( true );
tmp.SetColor( COL_GRAY );
