summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/control/ctrlbox.cxx6
-rw-r--r--svtools/source/control/ctrltool.cxx8
-rw-r--r--svtools/source/control/tabbar.cxx2
3 files changed, 8 insertions, 8 deletions
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 736de5be4850..f73050d6a7b6 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -947,9 +947,9 @@ void FontStyleBox::Fill( std::u16string_view rName, const FontList* pList )
{
aFontMetric = FontList::GetFontMetric( hFontMetric );
- FontWeight eWeight = aFontMetric.GetWeight();
- FontItalic eItalic = aFontMetric.GetItalic();
- FontWidth eWidth = aFontMetric.GetWidthType();
+ FontWeight eWeight = aFontMetric.GetWeightMaybeAskConfig();
+ FontItalic eItalic = aFontMetric.GetItalicMaybeAskConfig();
+ FontWidth eWidth = aFontMetric.GetWidthTypeMaybeAskConfig();
// Only if the attributes are different, we insert the
// Font to avoid double Entries in different languages
if ( (eWeight != eLastWeight) || (eItalic != eLastItalic) ||
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index a117b75123b9..76f8c975747c 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -536,8 +536,8 @@ const OUString & FontList::GetFontMapText( const FontMetric& rInfo ) const
ImplFontListFontMetric* pFontMetric = pData->mpFirst;
while ( pFontMetric )
{
- if ( (eWeight == pFontMetric->GetWeight()) &&
- (eItalic == pFontMetric->GetItalic()) )
+ if ( (eWeight == pFontMetric->GetWeightMaybeAskConfig()) &&
+ (eItalic == pFontMetric->GetItalicMaybeAskConfig()) )
{
bNotSynthetic = true;
break;
@@ -687,8 +687,8 @@ FontMetric FontList::Get(const OUString& rName,
pFontNameInfo = pSearchInfo;
while ( pSearchInfo )
{
- if ( (eWeight == pSearchInfo->GetWeight()) &&
- (eItalic == pSearchInfo->GetItalic()) )
+ if ( (eWeight == pSearchInfo->GetWeightMaybeAskConfig()) &&
+ (eItalic == pSearchInfo->GetItalicMaybeAskConfig()) )
{
pFontMetric = pSearchInfo;
break;
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 6f38a6072e67..aa2ed304262f 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -653,7 +653,7 @@ bool TabBar::ImplCalcWidth()
// retrieve width of tabs with bold font
vcl::Font aFont = GetFont();
- if (aFont.GetWeight() != WEIGHT_BOLD)
+ if (aFont.GetWeightMaybeAskConfig() != WEIGHT_BOLD)
{
aFont.SetWeight(WEIGHT_BOLD);
SetFont(aFont);