include/vcl/font.hxx | 2 ++
vcl/source/font/font.cxx | 34 ++++++++++++++++++----------------
2 files changed, 20 insertions(+), 16 deletions(-)
New commits:
commit bf81be2641e8c66d78374289497b117fe3dfb024
Author: sahil <gautamsahil1...@gmail.com>
AuthorDate: Mon Sep 11 04:40:26 2023 +0530
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Sep 13 06:30:59 2023 +0200
tdf#90341 Clean up excessive const_cast'ing
Change-Id: I5e3cc14ed75309d0569a4bad710e7adea007329f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156807
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index 8f7363d816b7..944b43fae22f 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -108,6 +108,8 @@ public:
tools::Long GetFontHeight() const;
void SetAverageFontWidth( tools::Long nWidth );
tools::Long GetAverageFontWidth() const;
+ const Size& GetAverageFontSize() const;
+ const FontFamily& GetFontFamily() const;
// tdf#127471 for corrections on EMF/WMF we need the AvgFontWidth in
Windows-specific notation
tools::Long GetOrCalculateAverageFontWidth() const;
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 5c2857770a73..7b48855f247a 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -70,8 +70,8 @@ Font::Font( vcl::Font&& rFont ) noexcept : mpImplFont(
std::move(rFont.mpImplFon
Font::Font( const OUString& rFamilyName, const Size& rSize )
{
- if (const_cast<const ImplType&>(mpImplFont)->maFamilyName != rFamilyName
- || const_cast<const ImplType&>(mpImplFont)->maAverageFontSize != rSize)
+ if (GetFamilyName() != rFamilyName
+ || GetAverageFontSize() != rSize)
{
mpImplFont->SetFamilyName( rFamilyName );
mpImplFont->SetFontSize( rSize );
@@ -80,9 +80,9 @@ Font::Font( const OUString& rFamilyName, const Size& rSize )
Font::Font( const OUString& rFamilyName, const OUString& rStyleName, const
Size& rSize )
{
- if (const_cast<const ImplType&>(mpImplFont)->maFamilyName != rFamilyName
- || const_cast<const ImplType&>(mpImplFont)->maStyleName != rStyleName
- || const_cast<const ImplType&>(mpImplFont)->maAverageFontSize != rSize)
+ if (GetFamilyName() != rFamilyName
+ || GetStyleName() != rStyleName
+ || GetAverageFontSize() != rSize)
{
mpImplFont->SetFamilyName( rFamilyName );
mpImplFont->SetStyleName( rStyleName );
@@ -92,8 +92,8 @@ Font::Font( const OUString& rFamilyName, const OUString&
rStyleName, const Size&
Font::Font( FontFamily eFamily, const Size& rSize )
{
- if (const_cast<const ImplType&>(mpImplFont)->meFamily != eFamily
- || const_cast<const ImplType&>(mpImplFont)->maAverageFontSize != rSize)
+ if (GetFontFamily() != eFamily
+ || GetAverageFontSize() != rSize)
{
mpImplFont->SetFamilyType( eFamily );
mpImplFont->SetFontSize( rSize );
@@ -106,7 +106,7 @@ Font::~Font()
void Font::SetColor( const Color& rColor )
{
- if (const_cast<const ImplType&>(mpImplFont)->maColor != rColor)
+ if (GetColor() != rColor)
{
mpImplFont->maColor = rColor;
}
@@ -114,7 +114,7 @@ void Font::SetColor( const Color& rColor )
void Font::SetFillColor( const Color& rColor )
{
- if (const_cast<const ImplType&>(mpImplFont)->maFillColor != rColor)
+ if (GetFillColor() != rColor)
{
mpImplFont->maFillColor = rColor;
if ( rColor.IsTransparent() )
@@ -124,7 +124,7 @@ void Font::SetFillColor( const Color& rColor )
void Font::SetTransparent( bool bTransparent )
{
- if (const_cast<const ImplType&>(mpImplFont)->mbTransparent != bTransparent)
+ if (IsTransparent() != bTransparent)
mpImplFont->mbTransparent = bTransparent;
}
@@ -136,13 +136,13 @@ void Font::SetAlignment( TextAlign eAlign )
void Font::SetFamilyName( const OUString& rFamilyName )
{
- if (const_cast<const ImplType&>(mpImplFont)->maFamilyName != rFamilyName)
+ if (GetFamilyName() != rFamilyName)
mpImplFont->SetFamilyName( rFamilyName );
}
void Font::SetStyleName( const OUString& rStyleName )
{
- if (const_cast<const ImplType&>(mpImplFont)->maStyleName != rStyleName)
+ if (GetStyleName() != rStyleName)
mpImplFont->maStyleName = rStyleName;
}
@@ -166,25 +166,25 @@ void Font::SetCharSet( rtl_TextEncoding eCharSet )
void Font::SetLanguageTag( const LanguageTag& rLanguageTag )
{
- if (const_cast<const ImplType&>(mpImplFont)->maLanguageTag != rLanguageTag)
+ if (GetLanguageTag() != rLanguageTag)
mpImplFont->maLanguageTag = rLanguageTag;
}
void Font::SetCJKContextLanguageTag( const LanguageTag& rLanguageTag )
{
- if (const_cast<const ImplType&>(mpImplFont)->maCJKLanguageTag !=
rLanguageTag)
+ if (GetCJKContextLanguageTag() != rLanguageTag)
mpImplFont->maCJKLanguageTag = rLanguageTag;
}
void Font::SetLanguage( LanguageType eLanguage )
{
- if (const_cast<const
ImplType&>(mpImplFont)->maLanguageTag.getLanguageType(false) != eLanguage)
+ if (GetLanguage() != eLanguage)
mpImplFont->maLanguageTag.reset( eLanguage);
}
void Font::SetCJKContextLanguage( LanguageType eLanguage )
{
- if (const_cast<const
ImplType&>(mpImplFont)->maCJKLanguageTag.getLanguageType(false) != eLanguage)
+ if (GetCJKContextLanguage() != eLanguage)
mpImplFont->maCJKLanguageTag.reset( eLanguage);
}
@@ -903,12 +903,14 @@ TextAlign Font::GetAlignment() const { return
mpImplFont->GetAlignment(); }
const OUString& Font::GetFamilyName() const { return
mpImplFont->GetFamilyName(); }
const OUString& Font::GetStyleName() const { return mpImplFont->maStyleName; }
+const FontFamily& Font::GetFontFamily() const { return mpImplFont->meFamily; }
const Size& Font::GetFontSize() const { return mpImplFont->GetFontSize(); }
void Font::SetFontHeight( tools::Long nHeight ) { SetFontSize( Size(
std::as_const(mpImplFont)->GetFontSize().Width(), nHeight ) ); }
tools::Long Font::GetFontHeight() const { return
mpImplFont->GetFontSize().Height(); }
void Font::SetAverageFontWidth( tools::Long nWidth ) { SetFontSize( Size(
nWidth, std::as_const(mpImplFont)->GetFontSize().Height() ) ); }
tools::Long Font::GetAverageFontWidth() const { return
mpImplFont->GetFontSize().Width(); }
+const Size& Font::GetAverageFontSize() const { return
mpImplFont->maAverageFontSize; }
rtl_TextEncoding Font::GetCharSet() const { return mpImplFont->GetCharSet(); }
