[Libreoffice-commits] core.git: accessibility/source chart2/source cui/source editeng/source extensions/source filter/source forms/source include/vcl sc/source sd/source starmath/source svx/source sw/source toolkit/source vcl/source
Chris Sherlock
chris.sherlock79 at gmail.com
Wed Jan 20 22:22:33 PST 2016
accessibility/source/helper/characterattributeshelper.cxx | 2 +-
chart2/source/controller/main/ChartController_TextEdit.cxx | 2 +-
chart2/source/tools/CharacterProperties.cxx | 6 +++---
cui/source/dialogs/cuicharmap.cxx | 2 +-
cui/source/tabpages/chardlg.cxx | 4 ++--
editeng/source/editeng/editeng.cxx | 2 +-
editeng/source/editeng/eehtml.cxx | 6 +++---
editeng/source/editeng/eertfpar.cxx | 2 +-
editeng/source/editeng/impedit4.cxx | 2 +-
editeng/source/editeng/textconv.cxx | 2 +-
editeng/source/items/bulitem.cxx | 4 ++--
editeng/source/items/textitem.cxx | 4 ++--
editeng/source/misc/acorrcfg.cxx | 4 ++--
editeng/source/rtf/rtfitem.cxx | 4 ++--
editeng/source/uno/unofdesc.cxx | 2 +-
extensions/source/propctrlr/fontdialog.cxx | 4 ++--
filter/source/graphicfilter/eps/eps.cxx | 2 +-
filter/source/svg/svgwriter.cxx | 4 ++--
forms/source/richtext/richtextengine.cxx | 2 +-
include/vcl/font.hxx | 4 ++--
sc/source/core/data/docpool.cxx | 2 +-
sc/source/core/data/stlpool.cxx | 2 +-
sc/source/core/tool/autoform.cxx | 6 +++---
sc/source/filter/excel/xlstyle.cxx | 2 +-
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 2 +-
sc/source/ui/drawfunc/drtxtob.cxx | 2 +-
sc/source/ui/view/cellsh1.cxx | 2 +-
sc/source/ui/view/editsh.cxx | 2 +-
sc/source/ui/view/viewfun2.cxx | 2 +-
sd/source/core/drawdoc4.cxx | 12 ++++++------
sd/source/core/stlpool.cxx | 6 +++---
sd/source/ui/annotations/annotationmanager.cxx | 2 +-
sd/source/ui/func/fubullet.cxx | 2 +-
sd/source/ui/func/fuhhconv.cxx | 2 +-
sd/source/ui/presenter/PresenterTextView.cxx | 2 +-
starmath/source/cfgitem.cxx | 2 +-
starmath/source/document.cxx | 2 +-
starmath/source/unomodel.cxx | 2 +-
starmath/source/utility.cxx | 8 ++++----
svx/source/fmcomp/fmgridif.cxx | 2 +-
svx/source/svdraw/svdfmtf.cxx | 6 +++---
svx/source/svdraw/svdmodel.cxx | 6 +++---
svx/source/tbxctrls/tbcontrl.cxx | 4 ++--
sw/source/core/doc/DocumentStylePoolManager.cxx | 8 ++++----
sw/source/core/edit/autofmt.cxx | 2 +-
sw/source/core/text/txtfld.cxx | 2 +-
sw/source/core/txtnode/txtedt.cxx | 2 +-
sw/source/filter/ascii/parasc.cxx | 2 +-
sw/source/filter/html/htmlform.cxx | 2 +-
sw/source/filter/writer/writer.cxx | 2 +-
sw/source/filter/ww8/wrtw8num.cxx | 2 +-
sw/source/ui/config/optpage.cxx | 4 ++--
sw/source/uibase/app/docshini.cxx | 6 +++---
sw/source/uibase/lingu/hhcwrp.cxx | 4 ++--
sw/source/uibase/shells/annotsh.cxx | 2 +-
sw/source/uibase/shells/drwtxtsh.cxx | 2 +-
sw/source/uibase/shells/textsh.cxx | 2 +-
toolkit/source/helper/vclunohelper.cxx | 2 +-
vcl/source/components/fontident.cxx | 2 +-
vcl/source/filter/wmf/emfwr.cxx | 2 +-
vcl/source/filter/wmf/wmfwr.cxx | 2 +-
vcl/source/font/font.cxx | 4 ++--
vcl/source/gdi/cvtsvm.cxx | 2 +-
63 files changed, 100 insertions(+), 100 deletions(-)
New commits:
commit 5659b68be3acc08a1c70f1be05c99658f2b04e34
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Thu Jan 21 03:30:10 2016 +1100
vcl: rename Font::GetFamily to Font::GetFamilyType
Change-Id: Ie427a43bd126dcdd89c6f66582736e67130f2254
Reviewed-on: https://gerrit.libreoffice.org/21633
Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79 at gmail.com>
diff --git a/accessibility/source/helper/characterattributeshelper.cxx b/accessibility/source/helper/characterattributeshelper.cxx
index 1fb79e7..7bcfe7a 100644
--- a/accessibility/source/helper/characterattributeshelper.cxx
+++ b/accessibility/source/helper/characterattributeshelper.cxx
@@ -30,7 +30,7 @@ CharacterAttributesHelper::CharacterAttributesHelper( const vcl::Font& rFont, sa
m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharBackColor" ), makeAny( (sal_Int32) nBackColor ) ) );
m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharColor" ), makeAny( (sal_Int32) nColor ) ) );
m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharFontCharSet" ), makeAny( (sal_Int16) rFont.GetCharSet() ) ) );
- m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharFontFamily" ), makeAny( (sal_Int16) rFont.GetFamily() ) ) );
+ m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharFontFamily" ), makeAny( (sal_Int16) rFont.GetFamilyType() ) ) );
m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharFontName" ), makeAny( rFont.GetFamilyName() ) ) );
m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharFontPitch" ), makeAny( (sal_Int16) rFont.GetPitch() ) ) );
m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharFontStyleName" ), makeAny( rFont.GetStyleName() ) ) );
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index f190dfd..1f25ece 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -167,7 +167,7 @@ void ChartController::executeDispatch_InsertSpecialCharacter()
aSet.Put( SfxBoolItem( FN_PARAM_2, true ) ); //maybe not necessary in future
vcl::Font aCurFont = m_pDrawViewWrapper->getOutliner()->GetRefDevice()->GetFont();
- aSet.Put( SvxFontItem( aCurFont.GetFamily(), aCurFont.GetFamilyName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), SID_ATTR_CHAR_FONT ) );
+ aSet.Put( SvxFontItem( aCurFont.GetFamilyType(), aCurFont.GetFamilyName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), SID_ATTR_CHAR_FONT ) );
std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( m_pChartWindow, aSet, getFrame(), RID_SVXDLG_CHARMAP ));
OSL_ENSURE( pDlg, "Couldn't create SvxCharacterMap dialog" );
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index cecaeb7..b5a8799 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -416,7 +416,7 @@ void CharacterProperties::AddDefaultsToMap(
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_NAME, OUString( aFont.GetFamilyName() ) );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_STYLE_NAME, OUString(aFont.GetStyleName()) );
- ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_FAMILY, sal_Int16(aFont.GetFamily()) );//awt::FontFamily::SWISS
+ ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_FAMILY, sal_Int16(aFont.GetFamilyType()) );//awt::FontFamily::SWISS
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_CHAR_SET, sal_Int16(aFont.GetCharSet()) );//use awt::CharSet::DONTKNOW instead of SYSTEM to avoid assertion issue 50249
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_PITCH, sal_Int16(aFont.GetPitch()) );//awt::FontPitch::VARIABLE
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_CHAR_COLOR, -1 ); //automatic color (COL_AUTO)
@@ -446,7 +446,7 @@ void CharacterProperties::AddDefaultsToMap(
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_LOCALE, aDefaultLocale_CJK );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_FONT_NAME, OUString( aFontCJK.GetFamilyName() ) );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_FONT_STYLE_NAME, OUString(aFontCJK.GetStyleName()) );
- ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_FONT_FAMILY, sal_Int16(aFontCJK.GetFamily()) );
+ ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_FONT_FAMILY, sal_Int16(aFontCJK.GetFamilyType()) );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_CHAR_SET, sal_Int16(aFontCJK.GetCharSet()) );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_FONT_PITCH, sal_Int16(aFontCJK.GetPitch()) );
@@ -457,7 +457,7 @@ void CharacterProperties::AddDefaultsToMap(
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_LOCALE, aDefaultLocale_CTL );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_FONT_NAME, OUString( aFontCTL.GetFamilyName() ) );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_FONT_STYLE_NAME, OUString(aFontCTL.GetStyleName()) );
- ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_FONT_FAMILY, sal_Int16(aFontCTL.GetFamily()) );
+ ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_FONT_FAMILY, sal_Int16(aFontCTL.GetFamilyType()) );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_CHAR_SET, sal_Int16(aFontCTL.GetCharSet()) );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_FONT_PITCH, sal_Int16(aFontCTL.GetPitch()) );
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index fa4d331..467fe8a 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -164,7 +164,7 @@ short SvxCharacterMap::Execute()
const SfxItemPool* pPool = pSet->GetPool();
const vcl::Font& rFont( GetCharFont() );
pSet->Put( SfxStringItem( pPool->GetWhich(SID_CHARMAP), GetCharacters() ) );
- pSet->Put( SvxFontItem( rFont.GetFamily(), rFont.GetFamilyName(),
+ pSet->Put( SvxFontItem( rFont.GetFamilyType(), rFont.GetFamilyName(),
rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(), pPool->GetWhich(SID_ATTR_CHAR_FONT) ) );
pSet->Put( SfxStringItem( pPool->GetWhich(SID_FONT_NAME), rFont.GetFamilyName() ) );
pSet->Put( SfxInt32Item( pPool->GetWhich(SID_ATTR_CHAR), GetChar() ) );
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 458d654..e90b300 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -529,7 +529,7 @@ namespace
_rFont.SetLanguage(_pLanguageLB->GetSelectLanguage());
- _rFont.SetFamily( aFontMetrics.GetFamily() );
+ _rFont.SetFamily( aFontMetrics.GetFamilyType() );
_rFont.SetFamilyName( aFontMetrics.GetFamilyName() );
_rFont.SetStyleName( aFontMetrics.GetStyleName() );
_rFont.SetPitch( aFontMetrics.GetPitch() );
@@ -934,7 +934,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
if ( nEntryPos >= m_pImpl->m_nExtraEntryPos )
aStyleBoxText.clear();
FontMetric aInfo( pFontList->Get( rFontName, aStyleBoxText ) );
- SvxFontItem aFontItem( aInfo.GetFamily(), aInfo.GetFamilyName(), aInfo.GetStyleName(),
+ SvxFontItem aFontItem( aInfo.GetFamilyType(), aInfo.GetFamilyName(), aInfo.GetStyleName(),
aInfo.GetPitch(), aInfo.GetCharSet(), nWhich );
pOld = GetOldItem( rSet, nSlot );
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index ad52b0f..3d909a5 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2565,7 +2565,7 @@ void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const vcl::Font& rFont
void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const SvxFont& rFont )
{
rSet.Put( SvxLanguageItem( rFont.GetLanguage(), EE_CHAR_LANGUAGE ) );
- rSet.Put( SvxFontItem( rFont.GetFamily(), rFont.GetFamilyName(), OUString(), rFont.GetPitch(), rFont.GetCharSet(), EE_CHAR_FONTINFO ) );
+ rSet.Put( SvxFontItem( rFont.GetFamilyType(), rFont.GetFamilyName(), OUString(), rFont.GetPitch(), rFont.GetCharSet(), EE_CHAR_FONTINFO ) );
rSet.Put( SvxFontHeightItem( rFont.GetSize().Height(), 100, EE_CHAR_FONTHEIGHT ) );
rSet.Put( SvxCharScaleWidthItem( 100, EE_CHAR_FONTWIDTH ) );
rSet.Put( SvxShadowedItem( rFont.IsShadow(), EE_CHAR_SHADOW ) );
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index 52a1d89..0d060ce 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -653,13 +653,13 @@ void EditHTMLParser::ImpSetStyleSheet( sal_uInt16 nHLevel )
if ( nHLevel == STYLE_PRE )
{
vcl::Font aFont = OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_SYSTEM, GetDefaultFontFlags::NONE );
- SvxFontItem aFontItem( aFont.GetFamily(), aFont.GetFamilyName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO );
+ SvxFontItem aFontItem( aFont.GetFamilyType(), aFont.GetFamilyName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO );
aItems.Put( aFontItem );
- SvxFontItem aFontItemCJK( aFont.GetFamily(), aFont.GetFamilyName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
+ SvxFontItem aFontItemCJK( aFont.GetFamilyType(), aFont.GetFamilyName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
aItems.Put( aFontItemCJK );
- SvxFontItem aFontItemCTL( aFont.GetFamily(), aFont.GetFamilyName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
+ SvxFontItem aFontItemCTL( aFont.GetFamilyType(), aFont.GetFamilyName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
aItems.Put( aFontItemCTL );
}
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index bcf5da8..341adca 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -152,7 +152,7 @@ void EditRTFParser::AddRTFDefaultValues( const EditPaM& rStart, const EditPaM& r
aSz = mpEditEngine->GetRefDevice()->LogicToLogic(aSz, &aPntMode, &_aEditMapMode);
SvxFontHeightItem aFontHeightItem( aSz.Width(), 100, EE_CHAR_FONTHEIGHT );
vcl::Font aDefFont( GetDefFont() );
- SvxFontItem aFontItem( aDefFont.GetFamily(), aDefFont.GetFamilyName(),
+ SvxFontItem aFontItem( aDefFont.GetFamilyType(), aDefFont.GetFamilyName(),
aDefFont.GetStyleName(), aDefFont.GetPitch(), aDefFont.GetCharSet(), EE_CHAR_FONTINFO );
sal_Int32 nStartPara = mpEditEngine->GetEditDoc().GetPos( rStart.GetNode() );
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 6e0d343..36eaa05 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1662,7 +1662,7 @@ void ImpEditEngine::SetLanguageAndFont(
// set new font attribute
SvxFontItem aFontItem = static_cast<const SvxFontItem&>( aNewSet.Get( nFontWhichId ) );
aFontItem.SetFamilyName( pFont->GetFamilyName());
- aFontItem.SetFamily( pFont->GetFamily());
+ aFontItem.SetFamily( pFont->GetFamilyType());
aFontItem.SetStyleName( pFont->GetStyleName());
aFontItem.SetPitch( pFont->GetPitch());
aFontItem.SetCharSet( pFont->GetCharSet() );
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 6e3f17b..15f5618 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -243,7 +243,7 @@ void TextConvWrapper::SetLanguageAndFont( const ESelection &rESel,
// set new font attribute
SvxFontItem aFontItem = static_cast<const SvxFontItem&>( aNewSet.Get( nFontWhichId ) );
aFontItem.SetFamilyName( pFont->GetFamilyName());
- aFontItem.SetFamily( pFont->GetFamily());
+ aFontItem.SetFamily( pFont->GetFamilyType());
aFontItem.SetStyleName( pFont->GetStyleName());
aFontItem.SetPitch( pFont->GetPitch());
aFontItem.SetCharSet(pFont->GetCharSet());
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 199c50c..09f37e9 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -38,7 +38,7 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const vcl::Font& rFont )
sal_uInt16 nTemp;
WriteColor( rStream, rFont.GetColor() );
- nTemp = (sal_uInt16)rFont.GetFamily(); rStream.WriteUInt16( nTemp );
+ nTemp = (sal_uInt16)rFont.GetFamilyType(); rStream.WriteUInt16( nTemp );
nTemp = (sal_uInt16)GetSOStoreTextEncoding((rtl_TextEncoding)rFont.GetCharSet());
rStream.WriteUInt16( nTemp );
@@ -232,7 +232,7 @@ void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom )
vcl::Font _aFont = GetFont();
vcl::Font aNewFont = rCopyFrom.GetFont();
_aFont.SetFamilyName( aNewFont.GetFamilyName() );
- _aFont.SetFamily( aNewFont.GetFamily() );
+ _aFont.SetFamily( aNewFont.GetFamilyType() );
_aFont.SetStyleName( aNewFont.GetStyleName() );
_aFont.SetColor( aNewFont.GetColor() );
SetSymbol( rCopyFrom.GetSymbol() );
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 411ecb7..4806948 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -231,7 +231,7 @@ SvxFontItem& SvxFontItem::operator=(const SvxFontItem& rFont)
aFamilyName = rFont.GetFamilyName();
aStyleName = rFont.GetStyleName();
eFamily = rFont.GetFamily();
- ePitch = rFont.GetPitch();
+ ePitch = rFont.GetPitch();
eTextEncoding = rFont.GetCharSet();
return *this;
}
@@ -3540,7 +3540,7 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo
aOutTypeArr[ n ].nLanguage,
GetDefaultFontFlags::OnlyOne ) );
SvxFontItem* pItem = aItemArr[ n ];
- pItem->SetFamily( aFont.GetFamily() );
+ pItem->SetFamily( aFont.GetFamilyType() );
pItem->SetFamilyName( aFont.GetFamilyName() );
pItem->SetStyleName( OUString() );
pItem->SetPitch( aFont.GetPitch());
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 869783e..36b0b43 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -585,7 +585,7 @@ void SvxSwAutoCorrCfg::ImplCommit()
pValues[nProp] <<= OUString(rSwFlags.aBulletFont.GetFamilyName());
break; // "Format/Option/ChangeToBullets/SpecialCharacter/Font",
case 18:
- pValues[nProp] <<= (sal_Int32)rSwFlags.aBulletFont.GetFamily();
+ pValues[nProp] <<= (sal_Int32)rSwFlags.aBulletFont.GetFamilyType();
break; // "Format/Option/ChangeToBullets/SpecialCharacter/FontFamily",
case 19:
pValues[nProp] <<= (sal_Int32)rSwFlags.aBulletFont.GetCharSet();
@@ -629,7 +629,7 @@ void SvxSwAutoCorrCfg::ImplCommit()
pValues[nProp] <<= OUString(rSwFlags.aByInputBulletFont.GetFamilyName());
break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/Font",
case 44 :
- pValues[nProp] <<= (sal_Int32)rSwFlags.aByInputBulletFont.GetFamily();
+ pValues[nProp] <<= (sal_Int32)rSwFlags.aByInputBulletFont.GetFamilyType();
break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontFamily",
case 45 :
pValues[nProp] <<= (sal_Int32)rSwFlags.aByInputBulletFont.GetCharSet();
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 91d1741..ee0282a 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -641,7 +641,7 @@ SET_FONTALIGNMENT:
case RTF_AF:
{
const vcl::Font& rSVFont = GetFont( sal_uInt16(nTokenValue) );
- SvxFontItem aTmpItem( rSVFont.GetFamily(),
+ SvxFontItem aTmpItem( rSVFont.GetFamilyType(),
rSVFont.GetFamilyName(), rSVFont.GetStyleName(),
rSVFont.GetPitch(), rSVFont.GetCharSet(),
SID_ATTR_CHAR_FONT );
@@ -1823,7 +1823,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
nValue = 0;
const vcl::Font& rSVFont = GetFont( sal_uInt16(nValue) );
SvxFontItem aTmpItem(
- rSVFont.GetFamily(), rSVFont.GetFamilyName(),
+ rSVFont.GetFamilyType(), rSVFont.GetFamilyName(),
rSVFont.GetStyleName(), rSVFont.GetPitch(),
rSVFont.GetCharSet(), SID_ATTR_CHAR_FONT );
SetScriptAttr( NOTDEF_CHARTYPE, aTmp, aTmpItem );
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index dcc4885..996b43f 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -61,7 +61,7 @@ void SvxUnoFontDescriptor::ConvertFromFont( const vcl::Font& rFont, awt::FontDes
rDesc.StyleName = rFont.GetStyleName();
rDesc.Width = sal::static_int_cast< sal_Int16 >(rFont.GetSize().Width());
rDesc.Height = sal::static_int_cast< sal_Int16 >(rFont.GetSize().Height());
- rDesc.Family = sal::static_int_cast< sal_Int16 >(rFont.GetFamily());
+ rDesc.Family = sal::static_int_cast< sal_Int16 >(rFont.GetFamilyType());
rDesc.CharSet = rFont.GetCharSet();
rDesc.Pitch = sal::static_int_cast< sal_Int16 >(rFont.GetPitch());
rDesc.Orientation = static_cast< float >(rFont.GetOrientation() / 10);
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 5b82177..cf932da 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -493,7 +493,7 @@ namespace pcr
vcl::Font aDefaultVCLFont = Application::GetDefaultDevice()->GetSettings().GetStyleSettings().GetAppFont();
SfxPoolItem** pCounter = _rppDefaults; // want to modify this without affecting the out param _rppDefaults
- *pCounter++ = new SvxFontItem(aDefaultVCLFont.GetFamily(), aDefaultVCLFont.GetFamilyName(), aDefaultVCLFont.GetStyleName(), aDefaultVCLFont.GetPitch(), aDefaultVCLFont.GetCharSet(), CFID_FONT);
+ *pCounter++ = new SvxFontItem(aDefaultVCLFont.GetFamilyType(), aDefaultVCLFont.GetFamilyName(), aDefaultVCLFont.GetStyleName(), aDefaultVCLFont.GetPitch(), aDefaultVCLFont.GetCharSet(), CFID_FONT);
*pCounter++ = new SvxFontHeightItem(aDefaultVCLFont.GetHeight(), 100, CFID_HEIGHT);
*pCounter++ = new SvxWeightItem(aDefaultVCLFont.GetWeight(), CFID_WEIGHT);
*pCounter++ = new SvxPostureItem(aDefaultVCLFont.GetItalic(), CFID_POSTURE);
@@ -505,7 +505,7 @@ namespace pcr
*pCounter++ = new SvxCharReliefItem(aDefaultVCLFont.GetRelief(), CFID_RELIEF);
*pCounter++ = new SvxEmphasisMarkItem(aDefaultVCLFont.GetEmphasisMark(), CFID_EMPHASIS);
- *pCounter++ = new SvxFontItem(aDefaultVCLFont.GetFamily(), aDefaultVCLFont.GetFamilyName(), aDefaultVCLFont.GetStyleName(), aDefaultVCLFont.GetPitch(), aDefaultVCLFont.GetCharSet(), CFID_CJK_FONT);
+ *pCounter++ = new SvxFontItem(aDefaultVCLFont.GetFamilyType(), aDefaultVCLFont.GetFamilyName(), aDefaultVCLFont.GetStyleName(), aDefaultVCLFont.GetPitch(), aDefaultVCLFont.GetCharSet(), CFID_CJK_FONT);
*pCounter++ = new SvxFontHeightItem(aDefaultVCLFont.GetHeight(), 100, CFID_CJK_HEIGHT);
*pCounter++ = new SvxWeightItem(aDefaultVCLFont.GetWeight(), CFID_CJK_WEIGHT);
*pCounter++ = new SvxPostureItem(aDefaultVCLFont.GetItalic(), CFID_CJK_POSTURE);
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 8bc304e..7c763b4 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -2192,7 +2192,7 @@ void PSWriter::ImplSetAttrForText( const Point& rPoint )
ImplDefineFont( "Courier", "Oblique" );
else if ( maFont.GetCharSet() == RTL_TEXTENCODING_SYMBOL )
ImplWriteLine( "/Symbol findfont" );
- else if ( maFont.GetFamily() == FAMILY_SWISS )
+ else if ( maFont.GetFamilyType() == FAMILY_SWISS )
ImplDefineFont( "Helvetica", "Oblique" );
else
ImplDefineFont( "Times", "Italic" );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 5b60271..9f92c99 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -391,7 +391,7 @@ void SVGAttributeWriter::setFontFamily()
}
else
{
- FontFamily eFamily = maCurFont.GetFamily();
+ FontFamily eFamily = maCurFont.GetFamilyType();
if( eFamily == FAMILY_ROMAN )
sFontFamily += ", serif";
else if( eFamily == FAMILY_SWISS )
@@ -849,7 +849,7 @@ void SVGTextWriter::implSetFontFamily()
}
else
{
- FontFamily eFamily = maCurrentFont.GetFamily();
+ FontFamily eFamily = maCurrentFont.GetFamilyType();
if( eFamily == FAMILY_ROMAN )
sFontFamily += ", serif";
else if( eFamily == FAMILY_SWISS )
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index f0d10d1..98f88fd 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -60,7 +60,7 @@ namespace frm
// defaults
vcl::Font aFont = Application::GetSettings().GetStyleSettings().GetAppFont();
aFont.SetFamilyName( "Times New Roman" );
- pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetFamilyName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) );
+ pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamilyType(), aFont.GetFamilyName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) );
// 12 pt font size
MapMode aPointMapMode( MAP_POINT );
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index dc7ab9e..8cb34b6 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -52,8 +52,8 @@ public:
virtual ~Font();
const OUString& GetFamilyName() const;
- FontFamily GetFamily();
- FontFamily GetFamily() const;
+ FontFamily GetFamilyType();
+ FontFamily GetFamilyType() const;
const OUString& GetStyleName() const;
FontWeight GetWeight();
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 05e7fa8..8dccc32 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -196,7 +196,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool)
// latin font from GetDefaultFonts is not used, DEFAULTFONT_LATIN_SPREADSHEET instead
vcl::Font aStdFont = OutputDevice::GetDefaultFont( DefaultFontType::LATIN_SPREADSHEET, LANGUAGE_ENGLISH_US,
GetDefaultFontFlags::OnlyOne );
- SvxFontItem* pStdFont = new SvxFontItem( aStdFont.GetFamily(),
+ SvxFontItem* pStdFont = new SvxFontItem( aStdFont.GetFamilyType(),
aStdFont.GetFamilyName(), aStdFont.GetStyleName(),
aStdFont.GetPitch(), aStdFont.GetCharSet(),
ATTR_FONT );
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index aec6dcb..2dd1048 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -202,7 +202,7 @@ static void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, DefaultFontType
if ( eLang != LANGUAGE_NONE && eLang != LANGUAGE_DONTKNOW && eLang != LANGUAGE_SYSTEM )
{
vcl::Font aDefFont = OutputDevice::GetDefaultFont( nFontType, eLang, GetDefaultFontFlags::OnlyOne );
- SvxFontItem aNewItem( aDefFont.GetFamily(), aDefFont.GetFamilyName(), aDefFont.GetStyleName(),
+ SvxFontItem aNewItem( aDefFont.GetFamilyType(), aDefFont.GetFamilyName(), aDefFont.GetStyleName(),
aDefFont.GetPitch(), aDefFont.GetCharSet(), nItemId );
if ( aNewItem != rSet.Get( nItemId ) )
{
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index aa10ec5..9aae455 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -825,19 +825,19 @@ ScAutoFormat::ScAutoFormat() :
vcl::Font aStdFont = OutputDevice::GetDefaultFont(
DefaultFontType::LATIN_SPREADSHEET, LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne );
SvxFontItem aFontItem(
- aStdFont.GetFamily(), aStdFont.GetFamilyName(), aStdFont.GetStyleName(),
+ aStdFont.GetFamilyType(), aStdFont.GetFamilyName(), aStdFont.GetStyleName(),
aStdFont.GetPitch(), aStdFont.GetCharSet(), ATTR_FONT );
aStdFont = OutputDevice::GetDefaultFont(
DefaultFontType::CJK_SPREADSHEET, LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne );
SvxFontItem aCJKFontItem(
- aStdFont.GetFamily(), aStdFont.GetFamilyName(), aStdFont.GetStyleName(),
+ aStdFont.GetFamilyType(), aStdFont.GetFamilyName(), aStdFont.GetStyleName(),
aStdFont.GetPitch(), aStdFont.GetCharSet(), ATTR_CJK_FONT );
aStdFont = OutputDevice::GetDefaultFont(
DefaultFontType::CTL_SPREADSHEET, LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne );
SvxFontItem aCTLFontItem(
- aStdFont.GetFamily(), aStdFont.GetFamilyName(), aStdFont.GetStyleName(),
+ aStdFont.GetFamilyType(), aStdFont.GetFamilyName(), aStdFont.GetStyleName(),
aStdFont.GetPitch(), aStdFont.GetCharSet(), ATTR_CTL_FONT );
SvxFontHeightItem aHeight( 200, 100, ATTR_FONT_HEIGHT ); // 10 pt;
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx
index 3b8b6de..776eac5 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -205,7 +205,7 @@ void XclFontData::FillFromVclFont( const vcl::Font& rFont )
mnEscapem = EXC_FONTESC_NONE;
SetScHeight( rFont.GetSize().Height() );
SetScWeight( rFont.GetWeight() );
- SetScFamily( rFont.GetFamily() );
+ SetScFamily( rFont.GetFamilyType() );
SetFontEncoding( rFont.GetCharSet() );
SetScPosture( rFont.GetItalic() );
SetScStrikeout( rFont.GetStrikeout() );
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index dc3fcec..439caba 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -314,7 +314,7 @@ static inline void lcl_FillProperty( PropertyValue& rVal, const OUString& rPropN
/** Fills the sequence with all font attributes of rFont. */
static void lcl_FillFontAttributes( Sequence< PropertyValue >& rSeq, const vcl::Font& rFont )
{
- SvxFontItem aFontItem( rFont.GetFamily(), rFont.GetFamilyName(), rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(), ATTR_FONT );
+ SvxFontItem aFontItem( rFont.GetFamilyType(), rFont.GetFamilyName(), rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(), ATTR_FONT );
SvxFontHeightItem aHeightItem( rFont.GetSize().Height(), 100, ATTR_FONT_HEIGHT );
SvxLanguageItem aLangItem( rFont.GetLanguage(), ATTR_FONT_LANGUAGE );
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 5efc9c7..520e2f2 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -231,7 +231,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq )
{
OUString aFontName(pFontItem->GetValue());
vcl::Font aFont(aFontName, Size(1,1)); // Size nur wg. CTOR
- aNewItem = SvxFontItem( aFont.GetFamily(), aFont.GetFamilyName(),
+ aNewItem = SvxFontItem( aFont.GetFamilyType(), aFont.GetFamilyName(),
aFont.GetStyleName(), aFont.GetPitch(),
aFont.GetCharSet(), ATTR_FONT );
}
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index e389787..4ce41c7 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2352,7 +2352,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
SfxAllItemSet aSet( GetPool() );
aSet.Put( SfxBoolItem( FN_PARAM_1, false ) );
- aSet.Put( SvxFontItem( aCurFont.GetFamily(), aCurFont.GetFamilyName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), GetPool().GetWhich(SID_ATTR_CHAR_FONT) ) );
+ aSet.Put( SvxFontItem( aCurFont.GetFamilyType(), aCurFont.GetFamilyName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), GetPool().GetWhich(SID_ATTR_CHAR_FONT) ) );
std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( pTabViewShell->GetDialogParent(), aSet,
pTabViewShell->GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP ));
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 01b54bd..311b283 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -399,7 +399,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
{
OUString aFontName(pFontItem->GetValue());
vcl::Font aFont(aFontName, Size(1,1)); // Size just because CTOR
- aNewItem = SvxFontItem( aFont.GetFamily(), aFont.GetFamilyName(),
+ aNewItem = SvxFontItem( aFont.GetFamilyType(), aFont.GetFamilyName(),
aFont.GetStyleName(), aFont.GetPitch(),
aFont.GetCharSet(), ATTR_FONT );
}
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 267fa8b..8037a54 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2974,7 +2974,7 @@ void ScViewFunc::InsertSpecialChar( const OUString& rStr, const vcl::Font& rFont
const sal_Unicode* pChar = rStr.getStr();
ScTabViewShell* pViewShell = GetViewData().GetViewShell();
- SvxFontItem aFontItem( rFont.GetFamily(),
+ SvxFontItem aFontItem( rFont.GetFamilyType(),
rFont.GetFamilyName(),
rFont.GetStyleName(),
rFont.GetPitch(),
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 7424e80..8bdb102 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -185,13 +185,13 @@ void SdDrawDocument::CreateLayoutTemplates()
getDefaultFonts( aLatinFont, aCJKFont, aCTLFont );
- SvxFontItem aSvxFontItem( aLatinFont.GetFamily(), aLatinFont.GetFamilyName(), aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
+ SvxFontItem aSvxFontItem( aLatinFont.GetFamilyType(), aLatinFont.GetFamilyName(), aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
aLatinFont.GetCharSet(), EE_CHAR_FONTINFO );
- SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(), aCJKFont.GetFamilyName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
+ SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamilyType(), aCJKFont.GetFamilyName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
aCJKFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
- SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(), aCTLFont.GetFamilyName(), aCTLFont.GetStyleName(), aCTLFont.GetPitch(),
+ SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamilyType(), aCTLFont.GetFamilyName(), aCTLFont.GetStyleName(), aCTLFont.GetPitch(),
aCTLFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
rISet.Put( aSvxFontItem );
@@ -564,13 +564,13 @@ void SdDrawDocument::CreateDefaultCellStyles()
getDefaultFonts( aLatinFont, aCJKFont, aCTLFont );
- SvxFontItem aSvxFontItem( aLatinFont.GetFamily(), aLatinFont.GetFamilyName(), aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
+ SvxFontItem aSvxFontItem( aLatinFont.GetFamilyType(), aLatinFont.GetFamilyName(), aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
aLatinFont.GetCharSet(), EE_CHAR_FONTINFO );
- SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(), aCJKFont.GetFamilyName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
+ SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamilyType(), aCJKFont.GetFamilyName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
aCJKFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
- SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(), aCTLFont.GetFamilyName(), aCTLFont.GetStyleName(), aCTLFont.GetPitch(),
+ SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamilyType(), aCTLFont.GetFamilyName(), aCTLFont.GetStyleName(), aCTLFont.GetPitch(),
aCTLFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
rISet.Put( aSvxFontItem );
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 0df8f1c..d6d7c2a2 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -192,13 +192,13 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
mpDoc->getDefaultFonts( aLatinFont, aCJKFont, aCTLFont );
// Font for title and outline
- SvxFontItem aSvxFontItem( aLatinFont.GetFamily(), aLatinFont.GetFamilyName(), aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
+ SvxFontItem aSvxFontItem( aLatinFont.GetFamilyType(), aLatinFont.GetFamilyName(), aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
aLatinFont.GetCharSet(), EE_CHAR_FONTINFO );
- SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(), aCJKFont.GetFamilyName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
+ SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamilyType(), aCJKFont.GetFamilyName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
aCJKFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
- SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(), aCTLFont.GetFamilyName(), aCTLFont.GetStyleName(), aCTLFont.GetPitch(),
+ SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamilyType(), aCTLFont.GetFamilyName(), aCTLFont.GetStyleName(), aCTLFont.GetPitch(),
aCTLFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
vcl::Font aBulletFont( GetBulletFont() );
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index b119242..8377c06 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -110,7 +110,7 @@ SfxItemPool* GetAnnotationPool()
mpAnnotationPool->SetPoolDefaultItem(SvxFontHeightItem(423,100,EE_CHAR_FONTHEIGHT));
vcl::Font aAppFont( Application::GetSettings().GetStyleSettings().GetAppFont() );
- mpAnnotationPool->SetPoolDefaultItem(SvxFontItem(aAppFont.GetFamily(),aAppFont.GetFamilyName(),"",PITCH_DONTKNOW,RTL_TEXTENCODING_DONTKNOW,EE_CHAR_FONTINFO));
+ mpAnnotationPool->SetPoolDefaultItem(SvxFontItem(aAppFont.GetFamilyType(),aAppFont.GetFamilyName(),"",PITCH_DONTKNOW,RTL_TEXTENCODING_DONTKNOW,EE_CHAR_FONTINFO));
}
return mpAnnotationPool;
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 5e5d4fd..6ff754a 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -261,7 +261,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
// set attributes (set font)
SfxItemSet aSet(pOL->GetEmptyItemSet());
- SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetFamilyName(),
+ SvxFontItem aFontItem (aFont.GetFamilyType(), aFont.GetFamilyName(),
aFont.GetStyleName(), aFont.GetPitch(),
aFont.GetCharSet(),
EE_CHAR_FONTINFO);
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 380d760..7e3a74d 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -172,7 +172,7 @@ void FuHangulHanjaConversion::ConvertStyles( sal_Int16 nTargetLanguage, const vc
// set new font attribute
SvxFontItem aFontItem( static_cast<const SvxFontItem&>( rSet.Get( EE_CHAR_FONTINFO_CJK ) ) );
aFontItem.SetFamilyName( pTargetFont->GetFamilyName());
- aFontItem.SetFamily( pTargetFont->GetFamily());
+ aFontItem.SetFamily( pTargetFont->GetFamilyType());
aFontItem.SetStyleName( pTargetFont->GetStyleName());
aFontItem.SetPitch( pTargetFont->GetPitch());
aFontItem.SetCharSet( pTargetFont->GetCharSet());
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index 6f08a5d..609f807 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -311,7 +311,7 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine()
rFntDta.nFontType, nLang, GetDefaultFontFlags::OnlyOne);
mpEditEngineItemPool->SetPoolDefaultItem(
SvxFontItem(
- aFont.GetFamily(),
+ aFont.GetFamilyType(),
aFont.GetFamilyName(),
aFont.GetStyleName(),
aFont.GetPitch(),
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 24f626d..ea936a7 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -162,7 +162,7 @@ SmFontFormat::SmFontFormat( const vcl::Font &rFont )
{
aName = rFont.GetFamilyName();
nCharSet = (sal_Int16) rFont.GetCharSet();
- nFamily = (sal_Int16) rFont.GetFamily();
+ nFamily = (sal_Int16) rFont.GetFamilyType();
nPitch = (sal_Int16) rFont.GetPitch();
nWeight = (sal_Int16) rFont.GetWeight();
nItalic = (sal_Int16) rFont.GetItalic();
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 53f33fd..a6068a8 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -336,7 +336,7 @@ void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool)
vcl::Font aFont = OutputDevice::GetDefaultFont(
rFntDta.nFontType, nLang, GetDefaultFontFlags::OnlyOne );
rEditEngineItemPool.SetPoolDefaultItem(
- SvxFontItem( aFont.GetFamily(), aFont.GetFamilyName(),
+ SvxFontItem( aFont.GetFamilyType(), aFont.GetFamilyName(),
aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(),
rFntDta.nFontInfoId ) );
}
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index d0c7d79..b976d9f 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -881,7 +881,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
vcl::Font rFont = (*aIter)->GetFace();
pDescriptor->sFontName = rFont.GetFamilyName();
pDescriptor->nCharSet = sal::static_int_cast< sal_Int16 >(rFont.GetCharSet());
- pDescriptor->nFamily = sal::static_int_cast< sal_Int16 >(rFont.GetFamily());
+ pDescriptor->nFamily = sal::static_int_cast< sal_Int16 >(rFont.GetFamilyType());
pDescriptor->nPitch = sal::static_int_cast< sal_Int16 >(rFont.GetPitch());
pDescriptor->nWeight = sal::static_int_cast< sal_Int16 >(rFont.GetWeight());
pDescriptor->nItalic = sal::static_int_cast< sal_Int16 >(rFont.GetItalic());
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index cfb4917..3e79a86 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -74,10 +74,10 @@ vcl::Font SmFontPickList::Get(sal_uInt16 nPos) const
bool SmFontPickList::CompareItem(const vcl::Font & rFirstFont, const vcl::Font & rSecondFont)
{
return rFirstFont.GetFamilyName() == rSecondFont.GetFamilyName() &&
- rFirstFont.GetFamily() == rSecondFont.GetFamily() &&
- rFirstFont.GetCharSet() == rSecondFont.GetCharSet() &&
- rFirstFont.GetWeight() == rSecondFont.GetWeight() &&
- rFirstFont.GetItalic() == rSecondFont.GetItalic();
+ rFirstFont.GetFamilyType() == rSecondFont.GetFamilyType() &&
+ rFirstFont.GetCharSet() == rSecondFont.GetCharSet() &&
+ rFirstFont.GetWeight() == rSecondFont.GetWeight() &&
+ rFirstFont.GetItalic() == rSecondFont.GetItalic();
}
OUString SmFontPickList::GetStringItem(const vcl::Font &rFont)
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 676ed96..c2d3458 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -86,7 +86,7 @@ css::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont )
aFD.StyleName = rFont.GetStyleName();
aFD.Height = (sal_Int16)rFont.GetSize().Height();
aFD.Width = (sal_Int16)rFont.GetSize().Width();
- aFD.Family = (sal_Int16)rFont.GetFamily();
+ aFD.Family = (sal_Int16)rFont.GetFamilyType();
aFD.CharSet = rFont.GetCharSet();
aFD.Pitch = (sal_Int16)rFont.GetPitch();
aFD.CharacterWidth = VCLUnoHelper::ConvertFontWidth( rFont.GetWidthType() );
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 5710493..dbd14d7 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -411,9 +411,9 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr
vcl::Font aFnt(mpVD->GetFont());
const sal_uInt32 nHeight(FRound(aFnt.GetSize().Height() * mfScaleY));
- mpTextAttr->Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetFamilyName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO ) );
- mpTextAttr->Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetFamilyName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO_CJK ) );
- mpTextAttr->Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetFamilyName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO_CTL ) );
+ mpTextAttr->Put( SvxFontItem( aFnt.GetFamilyType(), aFnt.GetFamilyName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO ) );
+ mpTextAttr->Put( SvxFontItem( aFnt.GetFamilyType(), aFnt.GetFamilyName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO_CJK ) );
+ mpTextAttr->Put( SvxFontItem( aFnt.GetFamilyType(), aFnt.GetFamilyName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO_CTL ) );
mpTextAttr->Put(SvxPostureItem(aFnt.GetItalic(), EE_CHAR_ITALIC));
mpTextAttr->Put(SvxWeightItem(aFnt.GetWeight(), EE_CHAR_WEIGHT));
mpTextAttr->Put( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT ) );
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index a761f74..f17a4ff 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -726,7 +726,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt
// get DEFAULTFONT_LATIN_TEXT and set at pool as dynamic default
vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT, nLanguage, GetDefaultFontFlags::OnlyOne));
- aSvxFontItem.SetFamily(aFont.GetFamily());
+ aSvxFontItem.SetFamily(aFont.GetFamilyType());
aSvxFontItem.SetFamilyName(aFont.GetFamilyName());
aSvxFontItem.SetStyleName(OUString());
aSvxFontItem.SetPitch( aFont.GetPitch());
@@ -735,7 +735,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt
// get DEFAULTFONT_CJK_TEXT and set at pool as dynamic default
vcl::Font aFontCJK(OutputDevice::GetDefaultFont(DefaultFontType::CJK_TEXT, nLanguage, GetDefaultFontFlags::OnlyOne));
- aSvxFontItemCJK.SetFamily( aFontCJK.GetFamily());
+ aSvxFontItemCJK.SetFamily( aFontCJK.GetFamilyType());
aSvxFontItemCJK.SetFamilyName(aFontCJK.GetFamilyName());
aSvxFontItemCJK.SetStyleName(OUString());
aSvxFontItemCJK.SetPitch( aFontCJK.GetPitch());
@@ -744,7 +744,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt
// get DEFAULTFONT_CTL_TEXT and set at pool as dynamic default
vcl::Font aFontCTL(OutputDevice::GetDefaultFont(DefaultFontType::CTL_TEXT, nLanguage, GetDefaultFontFlags::OnlyOne));
- aSvxFontItemCTL.SetFamily(aFontCTL.GetFamily());
+ aSvxFontItemCTL.SetFamily(aFontCTL.GetFamilyType());
aSvxFontItemCTL.SetFamilyName(aFontCTL.GetFamilyName());
aSvxFontItemCTL.SetStyleName(OUString());
aSvxFontItemCTL.SetPitch( aFontCTL.GetPitch() );
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 0b3d172..b5e84b9 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1144,7 +1144,7 @@ void SvxFontNameBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
aCurFont.GetWeight(),
aCurFont.GetItalic() ) );
- SvxFontItem aFontItem( aFontMetric.GetFamily(),
+ SvxFontItem aFontItem( aFontMetric.GetFamilyType(),
aFontMetric.GetFamilyName(),
aFontMetric.GetStyleName(),
aFontMetric.GetPitch(),
@@ -1171,7 +1171,7 @@ void SvxFontNameBox_Impl::Select()
aCurFont.GetItalic() ) );
aCurFont = aFontMetric;
- pFontItem.reset( new SvxFontItem( aFontMetric.GetFamily(),
+ pFontItem.reset( new SvxFontItem( aFontMetric.GetFamilyType(),
aFontMetric.GetFamilyName(),
aFontMetric.GetStyleName(),
aFontMetric.GetPitch(),
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 57cc458..86a4cef 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -127,7 +127,7 @@ namespace
vcl::Font aFnt( OutputDevice::GetDefaultFont( nFntType,
nLng, GetDefaultFontFlags::OnlyOne ) );
- rSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetFamilyName(),
+ rSet.Put( SvxFontItem( aFnt.GetFamilyType(), aFnt.GetFamilyName(),
OUString(), aFnt.GetPitch(),
aFnt.GetCharSet(), aArr[n].nResFntId ));
}
@@ -156,7 +156,7 @@ namespace
vcl::Font aFnt( OutputDevice::GetDefaultFont( aArr[n].nFntType,
nLng, GetDefaultFontFlags::OnlyOne ) );
- rSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetFamilyName(),
+ rSet.Put( SvxFontItem( aFnt.GetFamilyType(), aFnt.GetFamilyName(),
OUString(), aFnt.GetPitch(),
aFnt.GetCharSet(), aArr[n].nResFntId ));
}
@@ -469,7 +469,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
vcl::Font aFnt( OutputDevice::GetDefaultFont( nFontTypes[i],
nLng, GetDefaultFontFlags::OnlyOne ) );
- aSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetFamilyName(),
+ aSet.Put( SvxFontItem( aFnt.GetFamilyType(), aFnt.GetFamilyName(),
OUString(), aFnt.GetPitch(),
aFnt.GetCharSet(), aFontWhich[i] ));
}
@@ -1201,7 +1201,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
case RES_POOLCHR_BUL_LEVEL: // Bullet character
{
const vcl::Font& rBulletFont = numfunc::GetDefBulletFont();
- SetAllScriptItem( aSet, SvxFontItem( rBulletFont.GetFamily(),
+ SetAllScriptItem( aSet, SvxFontItem( rBulletFont.GetFamilyType(),
rBulletFont.GetFamilyName(), rBulletFont.GetStyleName(),
rBulletFont.GetPitch(), rBulletFont.GetCharSet(), RES_CHRATR_FONT ));
}
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index bd5e6a5..a730080 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1619,7 +1619,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
m_aDelPam.SetMark();
m_aDelPam.GetMark()->nContent = 1;
SetAllScriptItem( aSet,
- SvxFontItem( m_aFlags.aBulletFont.GetFamily(),
+ SvxFontItem( m_aFlags.aBulletFont.GetFamilyType(),
m_aFlags.aBulletFont.GetFamilyName(),
m_aFlags.aBulletFont.GetStyleName(),
m_aFlags.aBulletFont.GetPitch(),
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index dc01d79..ac97a06 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -536,7 +536,7 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( SwTextFormatInfo &rInf ) con
if ( pFormatFnt )
{
const sal_uInt8 nAct = pNumFnt->GetActual();
- pNumFnt->SetFamily( pFormatFnt->GetFamily(), nAct );
+ pNumFnt->SetFamily( pFormatFnt->GetFamilyType(), nAct );
pNumFnt->SetName( pFormatFnt->GetFamilyName(), nAct );
pNumFnt->SetStyleName( pFormatFnt->GetStyleName(), nAct );
pNumFnt->SetCharSet( pFormatFnt->GetCharSet(), nAct );
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 7ae1320..8cc2f39 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1085,7 +1085,7 @@ void SwTextNode::SetLanguageAndFont( const SwPaM &rPaM,
{
SvxFontItem aFontItem = static_cast<const SvxFontItem&>( aSet.Get( nFontWhichId ) );
aFontItem.SetFamilyName( pFont->GetFamilyName());
- aFontItem.SetFamily( pFont->GetFamily());
+ aFontItem.SetFamily( pFont->GetFamilyType());
aFontItem.SetStyleName( pFont->GetStyleName());
aFontItem.SetPitch( pFont->GetPitch());
aFontItem.SetCharSet( pFont->GetCharSet() );
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index aec0ecd..a1b7c90 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -116,7 +116,7 @@ SwASCIIParser::SwASCIIParser(SwDoc* pD, const SwPaM& rCursor, SvStream& rIn,
vcl::Font aTextFont( rOpt.GetFontName(), Size( 0, 10 ) );
if( pDoc->getIDocumentDeviceAccess().getPrinter( false ) )
aTextFont = pDoc->getIDocumentDeviceAccess().getPrinter( false )->GetFontMetric( aTextFont );
- SvxFontItem aFont( aTextFont.GetFamily(), aTextFont.GetFamilyName(),
+ SvxFontItem aFont( aTextFont.GetFamilyType(), aTextFont.GetFamilyName(),
OUString(), aTextFont.GetPitch(), aTextFont.GetCharSet(), RES_CHRATR_FONT );
pItemSet->Put( aFont );
pItemSet->Put( aFont, RES_CHRATR_CJK_FONT );
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 8e6b4a2..19bb42d 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -619,7 +619,7 @@ static void lcl_html_setFixedFontProperty(
rPropSet->setPropertyValue("FontStyleName",
aTmp );
- aTmp <<= (sal_Int16) aFixedFont.GetFamily();
+ aTmp <<= (sal_Int16) aFixedFont.GetFamilyType();
rPropSet->setPropertyValue("FontFamily", aTmp );
aTmp <<= (sal_Int16) aFixedFont.GetCharSet();
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index b696e7f..f60c16a 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -331,7 +331,7 @@ void Writer::PutNumFormatFontsInAttrPool()
else if( *pFont == *pDefFont )
bCheck = true;
- _AddFontItem( rPool, SvxFontItem( pFont->GetFamily(),
+ _AddFontItem( rPool, SvxFontItem( pFont->GetFamilyType(),
pFont->GetFamilyName(), pFont->GetStyleName(),
pFont->GetPitch(), pFont->GetCharSet(), RES_CHRATR_FONT ));
}
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 9b58dd3..b062c8a 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -425,7 +425,7 @@ void MSWordExportBase::AbstractNumberingDefinitions()
eChrSet = pBulletFont->GetCharSet();
sFontName = pBulletFont->GetFamilyName();
- eFamily = pBulletFont->GetFamily();
+ eFamily = pBulletFont->GetFamilyType();
if ( IsStarSymbol(sFontName) )
SubstituteBullet( sNumStr, eChrSet, sFontName );
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 016b35b..d12d037 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -641,7 +641,7 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType,
if( pPrt )
aFont = pPrt->GetFontMetric( aFont );
SwTextFormatColl *pColl = pWrtShell->GetTextCollFromPool(nType);
- pColl->SetFormatAttr(SvxFontItem(aFont.GetFamily(), aFont.GetFamilyName(),
+ pColl->SetFormatAttr(SvxFontItem(aFont.GetFamilyType(), aFont.GetFamilyName(),
aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich));
}
@@ -717,7 +717,7 @@ bool SwStdFontTabPage::FillItemSet( SfxItemSet* )
vcl::Font aFont( sStandard, Size( 0, 10 ) );
if( pPrinter )
aFont = pPrinter->GetFontMetric( aFont );
- m_pWrtShell->SetDefault(SvxFontItem(aFont.GetFamily(), aFont.GetFamilyName(),
+ m_pWrtShell->SetDefault(SvxFontItem(aFont.GetFamilyType(), aFont.GetFamilyName(),
aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich));
SwTextFormatColl *pColl = m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_STANDARD);
pColl->ResetFormatAttr(nFontWhich);
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 4489865..da865f4 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -196,7 +196,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
aFont = pPrt->GetFontMetric( aFont );
}
- pFontItem.reset(new SvxFontItem(aFont.GetFamily(), aFont.GetFamilyName(),
+ pFontItem.reset(new SvxFontItem(aFont.GetFamilyType(), aFont.GetFamilyName(),
aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich));
}
else
@@ -213,7 +213,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
nFontTypes[i],
eLanguage,
GetDefaultFontFlags::OnlyOne );
- pFontItem.reset(new SvxFontItem(aLangDefFont.GetFamily(), aLangDefFont.GetFamilyName(),
+ pFontItem.reset(new SvxFontItem(aLangDefFont.GetFamilyType(), aLangDefFont.GetFamilyName(),
aEmptyOUStr, aLangDefFont.GetPitch(), aLangDefFont.GetCharSet(), nFontWhich));
}
m_pDoc->SetDefault(*pFontItem);
@@ -281,7 +281,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
SfxItemState::SET != pColl->GetAttrSet().GetItemState(
nFontWhich, false ) )
{
- pColl->SetFormatAttr(SvxFontItem(aFont.GetFamily(), aFont.GetFamilyName(),
+ pColl->SetFormatAttr(SvxFontItem(aFont.GetFamilyType(), aFont.GetFamilyName(),
aEmptyOUStr, aFont.GetPitch(), aFont.GetCharSet(), nFontWhich));
}
}
diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx
index 7a9b020..0974e87 100644
--- a/sw/source/uibase/lingu/hhcwrp.cxx
+++ b/sw/source/uibase/lingu/hhcwrp.cxx
@@ -151,7 +151,7 @@ SwHHCWrapper::~SwHHCWrapper()
const vcl::Font *pFont = GetTargetFont();
if (pFont)
{
- SvxFontItem aFontItem( pFont->GetFamily(), pFont->GetFamilyName(),
+ SvxFontItem aFontItem( pFont->GetFamilyType(), pFont->GetFamilyName(),
pFont->GetStyleName(), pFont->GetPitch(),
pFont->GetCharSet(), RES_CHRATR_CJK_FONT );
pDoc->SetDefault( aFontItem );
@@ -493,7 +493,7 @@ void SwHHCWrapper::ReplaceUnit(
{
SvxFontItem aFontItem(static_cast<const SvxFontItem&>( aSet.Get( RES_CHRATR_CJK_FONT ) ));
aFontItem.SetFamilyName( pTargetFont->GetFamilyName());
- aFontItem.SetFamily( pTargetFont->GetFamily());
+ aFontItem.SetFamily( pTargetFont->GetFamilyType());
aFontItem.SetStyleName( pTargetFont->GetStyleName());
aFontItem.SetPitch( pTargetFont->GetPitch());
aFontItem.SetCharSet( pTargetFont->GetCharSet() );
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 7e3a3fa..9867c8a 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -1771,7 +1771,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
// Attributing (set font)
SfxItemSet aSetFont( *aFontSet.GetPool(), aFontSet.GetRanges() );
- SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetFamilyName(),
+ SvxFontItem aFontItem (aFont.GetFamilyType(), aFont.GetFamilyName(),
aFont.GetStyleName(), aFont.GetPitch(),
aFont.GetCharSet(),
EE_CHAR_FONTINFO );
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 2762c1b..ff55a62 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -786,7 +786,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
// assign attributes (Set font)
SfxItemSet aFontAttribSet( *aFontSet.GetPool(), aFontSet.GetRanges() );
- SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetFamilyName(),
+ SvxFontItem aFontItem (aFont.GetFamilyType(), aFont.GetFamilyName(),
aFont.GetStyleName(), aFont.GetPitch(),
aFont.GetCharSet(),
EE_CHAR_FONTINFO );
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index fa01b58..b9220a0 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -995,7 +995,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
{
SvxFontItem aNewFontItem( aFont );
aNewFontItem.SetFamilyName( aNewFont.GetFamilyName() );
- aNewFontItem.SetFamily( aNewFont.GetFamily());
+ aNewFontItem.SetFamily( aNewFont.GetFamilyType());
aNewFontItem.SetPitch( aNewFont.GetPitch());
aNewFontItem.SetCharSet( aNewFont.GetCharSet() );
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index ee802b4..22179df 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -370,7 +370,7 @@ css::awt::FontDescriptor VCLUnoHelper::CreateFontDescriptor( const vcl::Font& rF
aFD.StyleName = rFont.GetStyleName();
aFD.Height = (sal_Int16)rFont.GetSize().Height();
aFD.Width = (sal_Int16)rFont.GetSize().Width();
- aFD.Family = sal::static_int_cast< sal_Int16 >(rFont.GetFamily());
+ aFD.Family = sal::static_int_cast< sal_Int16 >(rFont.GetFamilyType());
aFD.CharSet = rFont.GetCharSet();
aFD.Pitch = sal::static_int_cast< sal_Int16 >(rFont.GetPitch());
aFD.CharacterWidth = VCLUnoHelper::ConvertFontWidth( rFont.GetWidthType() );
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index bbf3b5f..10acf82 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -105,7 +105,7 @@ Any SAL_CALL FontIdentificator::getMaterial() throw(RuntimeException, std::excep
aFD.Kerning = false;
aFD.WordLineMode = false;
aFD.Type = 0;
- switch( m_aFont.GetFamily() )
+ switch( m_aFont.GetFamilyType() )
{
case FAMILY_DECORATIVE: aFD.Family = css::awt::FontFamily::DECORATIVE;break;
case FAMILY_MODERN: aFD.Family = css::awt::FontFamily::MODERN;break;
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index f583729..4785f36 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -544,7 +544,7 @@ void EMFWriter::ImplCheckTextAttr()
default: nPitchAndFamily = 0x00; break;
}
- switch( rFont.GetFamily() )
+ switch( rFont.GetFamilyType() )
{
case FAMILY_DECORATIVE: nPitchAndFamily |= 0x50; break;
case FAMILY_MODERN: nPitchAndFamily |= 0x30; break;
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 816e536..aa873e3 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -349,7 +349,7 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const vcl::Font & rFont)
case PITCH_VARIABLE: nPitchFamily=W_VARIABLE_PITCH; break;
default: nPitchFamily=W_DEFAULT_PITCH;
}
- switch (rFont.GetFamily()) {
+ switch (rFont.GetFamilyType()) {
case FAMILY_DECORATIVE: nPitchFamily|=W_FF_DECORATIVE; break;
case FAMILY_MODERN: nPitchFamily|=W_FF_MODERN; break;
case FAMILY_ROMAN: nPitchFamily|=W_FF_ROMAN; break;
diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx
index 6022ebb..ad38744 100644
--- a/vcl/source/font/font.cxx
+++ b/vcl/source/font/font.cxx
@@ -800,13 +800,13 @@ FontPitch Font::GetPitch() { return mpImplFont->GetPitch(); }
FontWeight Font::GetWeight() { return mpImplFont->GetWeight(); }
FontWidth Font::GetWidthType() { return mpImplFont->GetWidthType(); }
FontItalic Font::GetItalic() { return mpImplFont->GetItalic(); }
-FontFamily Font::GetFamily() { return mpImplFont->GetFamily(); }
+FontFamily Font::GetFamilyType() { return mpImplFont->GetFamily(); }
FontPitch Font::GetPitch() const { return mpImplFont->GetPitchNoAsk(); }
FontWeight Font::GetWeight() const { return mpImplFont->GetWeightNoAsk(); }
FontWidth Font::GetWidthType() const { return mpImplFont->GetWidthTypeNoAsk(); }
FontItalic Font::GetItalic() const { return mpImplFont->GetItalicNoAsk(); }
-FontFamily Font::GetFamily() const { return mpImplFont->GetFamilyNoAsk(); }
+FontFamily Font::GetFamilyType() const { return mpImplFont->GetFamilyNoAsk(); }
int Font::GetQuality() const { return mpImplFont->GetQuality(); }
void Font::SetQuality( int nQuality ) { mpImplFont->SetQuality( nQuality ); }
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index c561a39..1df3d78 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -246,7 +246,7 @@ void ImplWriteFont( SvStream& rOStm, const vcl::Font& rFont,
rOStm.WriteInt16( 0 ); // no character orientation anymore
rOStm.WriteInt16( rFont.GetOrientation() );
rOStm.WriteInt16( rActualCharSet );
- rOStm.WriteInt16( rFont.GetFamily() );
+ rOStm.WriteInt16( rFont.GetFamilyType() );
rOStm.WriteInt16( rFont.GetPitch() );
rOStm.WriteInt16( rFont.GetAlign() );
rOStm.WriteInt16( nWeight );
More information about the Libreoffice-commits
mailing list