accessibility/source/extended/textwindowaccessibility.cxx | 2
accessibility/source/helper/characterattributeshelper.cxx | 2
basctl/source/basicide/baside2b.cxx | 2
canvas/source/cairo/cairo_textlayout.cxx | 2
chart2/source/controller/dialogs/tp_DataSource.cxx | 2
chart2/source/controller/main/ChartController_TextEdit.cxx | 2
chart2/source/tools/CharacterProperties.cxx | 6
chart2/source/view/main/DummyXShape.cxx | 2
cppcanvas/source/mtfrenderer/implrenderer.cxx | 2
cui/source/dialogs/cuicharmap.cxx | 14
cui/source/options/fontsubs.cxx | 2
cui/source/tabpages/chardlg.cxx | 6
cui/source/tabpages/numpages.cxx | 2
dbaccess/source/ui/control/sqledit.cxx | 2
dbaccess/source/ui/misc/TokenWriter.cxx | 2
desktop/source/lib/init.cxx | 4
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 2
editeng/source/editeng/editattr.cxx | 2
editeng/source/editeng/editdoc.cxx | 2
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/eehtml.cxx | 6
editeng/source/editeng/eertfpar.cxx | 2
editeng/source/editeng/impedit3.cxx | 2
editeng/source/editeng/impedit4.cxx | 2
editeng/source/editeng/textconv.cxx | 2
editeng/source/items/bulitem.cxx | 10
editeng/source/items/numitem.cxx | 4
editeng/source/items/textitem.cxx | 4
editeng/source/misc/acorrcfg.cxx | 8
editeng/source/rtf/rtfitem.cxx | 4
editeng/source/rtf/svxrtf.cxx | 4
editeng/source/uno/unofdesc.cxx | 4
extensions/source/propctrlr/fontdialog.cxx | 4
filter/source/flash/swfwriter1.cxx | 2
filter/source/graphicfilter/ios2met/ios2met.cxx | 2
filter/source/graphicfilter/ipict/ipict.cxx | 2
filter/source/msfilter/svdfppt.cxx | 8
filter/source/svg/svgfontexport.cxx | 6
filter/source/svg/svgwriter.cxx | 10
forms/source/richtext/richtextengine.cxx | 7
include/vcl/font.hxx | 89 -
include/vcl/metric.hxx | 8
reportdesign/source/ui/misc/UITools.cxx | 2
sc/source/core/data/docpool.cxx | 2
sc/source/core/data/patattr.cxx | 4
sc/source/core/data/stlpool.cxx | 2
sc/source/core/tool/autoform.cxx | 6
sc/source/filter/excel/xehelper.cxx | 2
sc/source/filter/excel/xlstyle.cxx | 2
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 2
sc/source/ui/drawfunc/drtxtob.cxx | 4
sc/source/ui/miscdlgs/autofmt.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/filter/eppt/pptx-text.cxx | 2
sd/source/ui/annotations/annotationmanager.cxx | 2
sd/source/ui/func/bulmaper.cxx | 2
sd/source/ui/func/fubullet.cxx | 4
sd/source/ui/func/fuhhconv.cxx | 2
sd/source/ui/presenter/PresenterTextView.cxx | 2
sd/source/ui/view/outlview.cxx | 2
starmath/source/cfgitem.cxx | 6
starmath/source/dialog.cxx | 14
starmath/source/document.cxx | 2
starmath/source/format.cxx | 2
starmath/source/rect.cxx | 2
starmath/source/unomodel.cxx | 8
starmath/source/utility.cxx | 4
svtools/source/control/ctrlbox.cxx | 6
svtools/source/control/ctrltool.cxx | 14
svtools/source/control/stdmenu.cxx | 2
svtools/source/misc/sampletext.cxx | 58
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 4
svx/source/dialog/fntctrl.cxx | 6
svx/source/fmcomp/fmgridif.cxx | 4
svx/source/sidebar/nbdtmg.cxx | 16
svx/source/styles/CommonStylePreviewRenderer.cxx | 2
svx/source/svdraw/svdfmtf.cxx | 6
svx/source/svdraw/svdmodel.cxx | 6
svx/source/tbxctrls/tbcontrl.cxx | 10
svx/source/tbxctrls/tbunocontroller.cxx | 2
sw/source/core/doc/DocumentStylePoolManager.cxx | 8
sw/source/core/doc/notxtfrm.cxx | 2
sw/source/core/edit/autofmt.cxx | 2
sw/source/core/inc/swfont.hxx | 4
sw/source/core/layout/paintfrm.cxx | 2
sw/source/core/text/txtfld.cxx | 2
sw/source/core/txtnode/fntcache.cxx | 4
sw/source/core/txtnode/swfont.cxx | 12
sw/source/core/txtnode/txtedt.cxx | 2
sw/source/core/unocore/unocrsrhelper.cxx | 2
sw/source/core/unocore/unostyle.cxx | 995 +++++--------
sw/source/filter/ascii/parasc.cxx | 2
sw/source/filter/html/htmlform.cxx | 2
sw/source/filter/html/htmlforw.cxx | 2
sw/source/filter/writer/writer.cxx | 2
sw/source/filter/ww8/wrtw8num.cxx | 4
sw/source/filter/ww8/ww8par2.cxx | 2
sw/source/filter/ww8/ww8par3.cxx | 12
sw/source/ui/chrdlg/drpcps.cxx | 12
sw/source/ui/config/optpage.cxx | 6
sw/source/ui/dialog/ascfldlg.cxx | 4
sw/source/ui/misc/insfnote.cxx | 2
sw/source/ui/table/tautofmt.cxx | 2
sw/source/uibase/app/docshini.cxx | 6
sw/source/uibase/config/fontcfg.cxx | 2
sw/source/uibase/docvw/srcedtw.cxx | 2
sw/source/uibase/lingu/hhcwrp.cxx | 4
sw/source/uibase/shells/annotsh.cxx | 10
sw/source/uibase/shells/basesh.cxx | 2
sw/source/uibase/shells/drwtxtsh.cxx | 10
sw/source/uibase/shells/textsh.cxx | 10
test/source/mtfxmldump.cxx | 2
toolkit/source/helper/vclunohelper.cxx | 4
vcl/inc/fontattributes.hxx | 2
vcl/inc/impfontmetric.hxx | 4
vcl/qa/cppunit/font.cxx | 6
vcl/source/app/settings.cxx | 4
vcl/source/components/fontident.cxx | 2
vcl/source/filter/sgvtext.cxx | 4
vcl/source/filter/wmf/emfwr.cxx | 2
vcl/source/filter/wmf/winmtf.cxx | 18
vcl/source/filter/wmf/winwmf.cxx | 2
vcl/source/filter/wmf/wmfwr.cxx | 6
vcl/source/font/PhysicalFontCollection.cxx | 6
vcl/source/font/PhysicalFontFace.cxx | 12
vcl/source/font/PhysicalFontFamily.cxx | 6
vcl/source/font/font.cxx | 14
vcl/source/font/fontcache.cxx | 4
vcl/source/font/fontselect.cxx | 2
vcl/source/gdi/cvtsvm.cxx | 4
vcl/source/gdi/embeddedfontshelper.cxx | 4
vcl/source/gdi/metaact.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 26
vcl/source/outdev/font.cxx | 24
vcl/source/window/window.cxx | 2
vcl/source/window/window2.cxx | 2
vcl/unx/generic/fontmanager/fontconfig.cxx | 2
vcl/unx/generic/fontmanager/fontsubst.cxx | 10
vcl/unx/generic/gdi/cairotextrender.cxx | 2
vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 2
vcl/unx/generic/glyphs/glyphcache.cxx | 4
vcl/unx/generic/print/genpspgraphics.cxx | 2
vcl/win/window/salframe.cxx | 4
writerfilter/source/dmapper/SdtHelper.cxx | 2
148 files changed, 849 insertions(+), 970 deletions(-)
New commits:
commit 45654a1d4d96732912e6e4dc254c9612d3f241c0
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sat Jan 16 12:20:45 2016 -0600
revert vcl patch series that brok Mac and Windows
revert:
9bc2f3de8672e812f3a67541c6d7069b434a7e42
vcl: add comment about ImplFontMetric::{Get|Set}LineHeight()
26371f105bc44e04469ec03fc5bb12505e651c6b
vcl: FontAttributes::GetSlantType() -> FontAttributes::GetItalic()
2dd0b4317372b8022efe3911b38b4fa02956d8b9
vcl: font.hxx and metric.hxx cleanup, make ctors explicit and the dtor
virtual
5ab13bf3ead3539e4ad847656da81e7eb6029652
vcl: tabify font.hxx
f99550dae55e40e49bf9c9875053fe2abb4c71ca
vcl: change Font::SetName() to Font::SetFamilyName()
2b297116cb6bb1061c43e5714e2609c8ee9f57d2
vcl: rename Font::GetName to Font::GetFamilyName
Change-Id: I23f38921187d66b970ca815eb30dda4222a2da62
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx
b/accessibility/source/extended/textwindowaccessibility.cxx
index 947396a..fbf2cd7 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1015,7 +1015,7 @@ Document::retrieveCharacterAttributes(
//character font name
aAttribs[i].Name = "CharFontName";
aAttribs[i].Handle = -1;
- aAttribs[i].Value = css::uno::makeAny( aFont.GetFamilyName() );
+ aAttribs[i].Value = css::uno::makeAny( aFont.GetName() );
aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE;
i++;
diff --git a/accessibility/source/helper/characterattributeshelper.cxx
b/accessibility/source/helper/characterattributeshelper.cxx
index 1fb79e7..3f82d70 100644
--- a/accessibility/source/helper/characterattributeshelper.cxx
+++ b/accessibility/source/helper/characterattributeshelper.cxx
@@ -31,7 +31,7 @@ CharacterAttributesHelper::CharacterAttributesHelper( const
vcl::Font& rFont, sa
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( "CharFontName"
), makeAny( rFont.GetFamilyName() ) ) );
+ m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharFontName"
), makeAny( rFont.GetName() ) ) );
m_aAttributeMap.insert( AttributeMap::value_type( OUString(
"CharFontPitch" ), makeAny( (sal_Int16) rFont.GetPitch() ) ) );
m_aAttributeMap.insert( AttributeMap::value_type( OUString(
"CharFontStyleName" ), makeAny( rFont.GetStyleName() ) ) );
m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharHeight"
), makeAny( (sal_Int16) rFont.GetSize().Height() ) ) );
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index bc6177c..2729774 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1234,7 +1234,7 @@ void EditorWindow::ImplSetFont()
vcl::Font aTmpFont(OutputDevice::GetDefaultFont(DefaultFontType::FIXED,
Application::GetSettings().GetUILanguageTag().getLanguageType(),
GetDefaultFontFlags::NONE, this));
- sFontName = aTmpFont.GetFamilyName();
+ sFontName = aTmpFont.GetName();
}
Size aFontSize(0,
officecfg::Office::Common::Font::SourceViewFont::FontHeight::get());
vcl::Font aFont(sFontName, aFontSize);
diff --git a/canvas/source/cairo/cairo_textlayout.cxx
b/canvas/source/cairo/cairo_textlayout.cxx
index 1e076b3..735ebdf 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -499,7 +499,7 @@ namespace cairocanvas
<< (rSysFontData.bAntialias ? "AA " : "")
<< (rSysFontData.bFakeBold ? "FB " : "")
<< (rSysFontData.bFakeItalic ? "FI " : "") << " || Name:"
- << aFont.GetFamilyName() << " - "
+ << aFont.GetName() << " - "
<< maText.Text.copy(maText.StartPosition, maText.Length));
cairo_show_glyphs(pSCairo.get(), &cairo_glyphs[0],
cairo_glyphs.size());
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 1039115..b25390c 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -248,7 +248,7 @@ DataSourceTabPage::DataSourceTabPage(
// set symbol font for arrows
// note: StarSymbol is substituted to OpenSymbol for OOo
vcl::Font aSymbolFont( m_pBTN_UP->GetFont());
- aSymbolFont.SetFamilyName( "StarSymbol" );
+ aSymbolFont.SetName( "StarSymbol" );
m_pBTN_UP->SetControlFont( aSymbolFont );
m_pBTN_DOWN->SetControlFont( aSymbolFont );
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx
b/chart2/source/controller/main/ChartController_TextEdit.cxx
index f190dfd..9301e47 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.GetFamily(), aCurFont.GetName(),
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..cdc4de6 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -414,7 +414,7 @@ void CharacterProperties::AddDefaultsToMap(
nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(
aDefaultLocale_CTL, false), COMPLEX);
vcl::Font aFontCTL = OutputDevice::GetDefaultFont(
DefaultFontType::CTL_SPREADSHEET, nLang, GetDefaultFontFlags::OnlyOne );
- ::chart::PropertyHelper::setPropertyValueDefault( rOutMap,
PROP_CHAR_FONT_NAME, OUString( aFont.GetFamilyName() ) );
+ ::chart::PropertyHelper::setPropertyValueDefault( rOutMap,
PROP_CHAR_FONT_NAME, OUString( aFont.GetName() ) );
::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_CHAR_SET, sal_Int16(aFont.GetCharSet()) );//use
awt::CharSet::DONTKNOW instead of SYSTEM to avoid assertion issue 50249
@@ -444,7 +444,7 @@ void CharacterProperties::AddDefaultsToMap(
::chart::PropertyHelper::setPropertyValueDefault( rOutMap,
PROP_CHAR_ASIAN_WEIGHT, awt::FontWeight::NORMAL );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap,
PROP_CHAR_ASIAN_POSTURE, awt::FontSlant_NONE );
::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_NAME, OUString( aFontCJK.GetName() ) );
::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_CHAR_SET, sal_Int16(aFontCJK.GetCharSet()) );
@@ -455,7 +455,7 @@ void CharacterProperties::AddDefaultsToMap(
::chart::PropertyHelper::setPropertyValueDefault( rOutMap,
PROP_CHAR_COMPLEX_WEIGHT, awt::FontWeight::NORMAL );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap,
PROP_CHAR_COMPLEX_POSTURE, awt::FontSlant_NONE );
::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_NAME, OUString( aFontCTL.GetName() ) );
::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_CHAR_SET, sal_Int16(aFontCTL.GetCharSet()) );
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index e2e54df..fee3e34 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -757,7 +757,7 @@ struct FontAttribSetter
if(rPropName == "CharFontName")
{
OUString aName = rProp.second.get<OUString>();
- mrFont.SetFamilyName(aName);
+ mrFont.SetName(aName);
}
else if(rPropName == "CharColor")
{
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 69a5d66..4a3dae4 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -759,7 +759,7 @@ namespace cppcanvas
if( rParms.mrParms.maFontName.is_initialized() )
aFontRequest.FontDescription.FamilyName =
*rParms.mrParms.maFontName;
else
- aFontRequest.FontDescription.FamilyName =
rFont.GetFamilyName();
+ aFontRequest.FontDescription.FamilyName = rFont.GetName();
aFontRequest.FontDescription.StyleName = rFont.GetStyleName();
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index fa4d331..b17931c 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -96,7 +96,7 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool
bOne_, const SfxIte
else if ( pFontNameItem )
{
vcl::Font aTmpFont( GetCharFont() );
- aTmpFont.SetFamilyName( pFontNameItem->GetValue() );
+ aTmpFont.SetName( pFontNameItem->GetValue() );
SetCharFont( aTmpFont );
}
@@ -164,9 +164,9 @@ 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.GetFamily(), rFont.GetName(),
rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(),
pPool->GetWhich(SID_ATTR_CHAR_FONT) ) );
- pSet->Put( SfxStringItem( pPool->GetWhich(SID_FONT_NAME),
rFont.GetFamilyName() ) );
+ pSet->Put( SfxStringItem( pPool->GetWhich(SID_FONT_NAME),
rFont.GetName() ) );
pSet->Put( SfxInt32Item( pPool->GetWhich(SID_ATTR_CHAR), GetChar()
) );
}
}
@@ -325,12 +325,12 @@ void SvxCharacterMap::init()
m_pShowText->Hide();
}
- OUString aDefStr( aFont.GetFamilyName() );
+ OUString aDefStr( aFont.GetName() );
OUString aLastName;
int nCount = GetDevFontCount();
for ( int i = 0; i < nCount; i++ )
{
- OUString aFontName( GetDevFont( i ).GetFamilyName() );
+ OUString aFontName( GetDevFont( i ).GetName() );
if ( aFontName != aLastName )
{
aLastName = aFontName;
@@ -388,10 +388,10 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont
)
// like "Times New Roman;Times" resolved
vcl::Font aTmp( GetFontMetric( rFont ) );
- if ( m_pFontLB->GetEntryPos( aTmp.GetFamilyName() ) ==
LISTBOX_ENTRY_NOTFOUND )
+ if ( m_pFontLB->GetEntryPos( aTmp.GetName() ) == LISTBOX_ENTRY_NOTFOUND )
return;
- m_pFontLB->SelectEntry( aTmp.GetFamilyName() );
+ m_pFontLB->SelectEntry( aTmp.GetName() );
aFont = aTmp;
FontSelectHdl(*m_pFontLB);
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 3625d82..362cdd1 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -361,7 +361,7 @@ IMPL_LINK_TYPED(SvxFontSubstTabPage, NonPropFontsHdl,
Button*, pBox, void)
{
const FontMetric& rFontMetric = aFntLst.GetFontName( nFont );
if(!bNonPropOnly || rFontMetric.GetPitch() == PITCH_FIXED)
- m_pFontNameLB->InsertEntry(rFontMetric.GetFamilyName());
+ m_pFontNameLB->InsertEntry(rFontMetric.GetName());
}
m_pFontNameLB->SelectEntry(sFontName);
}
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 458d654..2d6550e 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -498,7 +498,7 @@ namespace
if ( eState >= SfxItemState::DEFAULT )
{
const SvxFontItem* pFontItem = static_cast<const
SvxFontItem*>(&( _pPage->GetItemSet().Get( _nFontWhich ) ));
- aFontMetrics.SetFamilyName(pFontItem->GetFamilyName());
+ aFontMetrics.SetName(pFontItem->GetFamilyName());
aFontMetrics.SetStyleName(pFontItem->GetStyleName());
aFontMetrics.SetFamily(pFontItem->GetFamily());
aFontMetrics.SetPitch(pFontItem->GetPitch());
@@ -530,7 +530,7 @@ namespace
_rFont.SetLanguage(_pLanguageLB->GetSelectLanguage());
_rFont.SetFamily( aFontMetrics.GetFamily() );
- _rFont.SetFamilyName( aFontMetrics.GetFamilyName() );
+ _rFont.SetName( aFontMetrics.GetName() );
_rFont.SetStyleName( aFontMetrics.GetStyleName() );
_rFont.SetPitch( aFontMetrics.GetPitch() );
_rFont.SetCharSet( aFontMetrics.GetCharSet() );
@@ -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.GetFamily(), aInfo.GetName(),
aInfo.GetStyleName(),
aInfo.GetPitch(), aInfo.GetCharSet(), nWhich );
pOld = GetOldItem( rSet, nSlot );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 325f930..74c0f70 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -723,7 +723,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, NumSelectHdl_Impl,
ValueSet*, void)
aFmt.SetSuffix(OUString());
if( !pLevelSettings->sBulletFont.isEmpty() &&
pLevelSettings->sBulletFont.compareTo(
- rActBulletFont.GetFamilyName()))
+ rActBulletFont.GetName()))
{
//search for the font
if(!pList)
diff --git a/dbaccess/source/ui/control/sqledit.cxx
b/dbaccess/source/ui/control/sqledit.cxx
index db4db51..19574fa 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -236,7 +236,7 @@ void OSqlEdit::ImplSetFont()
if ( sFontName.isEmpty() )
{
vcl::Font aTmpFont( OutputDevice::GetDefaultFont(
DefaultFontType::FIXED,
Application::GetSettings().GetUILanguageTag().getLanguageType(),
GetDefaultFontFlags::NONE, this ) );
- sFontName = aTmpFont.GetFamilyName();
+ sFontName = aTmpFont.GetName();
}
Size aFontSize(
0, officecfg::Office::Common::Font::SourceViewFont::FontHeight::get()
);
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx
b/dbaccess/source/ui/misc/TokenWriter.cxx
index 1c4b3c5..ffbb115 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -384,7 +384,7 @@ bool ORTFImportExport::Write()
OString aFonts(OUStringToOString(m_aFont.Name, eDestEnc));
if (aFonts.isEmpty())
{
- OUString aName =
Application::GetSettings().GetStyleSettings().GetAppFont().GetFamilyName();
+ OUString aName =
Application::GetSettings().GetStyleSettings().GetAppFont().GetName();
aFonts = OUStringToOString(aName, eDestEnc);
}
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f58d8a0..4afe19c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1225,7 +1225,7 @@ static char* getFonts (const char* pCommand)
aChildren.push_back(std::make_pair("", aChild));
nSizeCount++;
}
- aValues.add_child(rFontMetric.GetFamilyName().toUtf8().getStr(),
aChildren);
+ aValues.add_child(rFontMetric.GetName().toUtf8().getStr(),
aChildren);
}
}
aTree.add_child("commandValues", aValues);
@@ -1530,7 +1530,7 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument*
/*pThis*/,
for (sal_uInt16 i = 0; i < nFontCount; ++i)
{
const FontMetric& rFontMetric = pList->GetFontName(i);
- OUString aFontName = rFontMetric.GetFamilyName();
+ OUString aFontName = rFontMetric.GetName();
if (!aSearchedFontName.equals(aFontName.toUtf8().getStr()))
continue;
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index 092e71c..ee7df1f 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -440,7 +440,7 @@ namespace drawinglayer
bool bBiDiStrong)
{
const attribute::FontAttribute aRetval(
- rFont.GetFamilyName(),
+ rFont.GetName(),
rFont.GetStyleName(),
static_cast<sal_uInt16>(rFont.GetWeight()),
RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet(),
diff --git a/editeng/source/editeng/editattr.cxx
b/editeng/source/editeng/editattr.cxx
index fdc9d6a..a556fd3 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -83,7 +83,7 @@ void EditCharAttribFont::SetFont( SvxFont& rFont,
OutputDevice* )
{
const SvxFontItem& rAttr = static_cast<const SvxFontItem&>(*GetItem());
- rFont.SetFamilyName( rAttr.GetFamilyName() );
+ rFont.SetName( rAttr.GetFamilyName() );
rFont.SetFamily( rAttr.GetFamily() );
rFont.SetPitch( rAttr.GetPitch() );
rFont.SetCharSet( rAttr.GetCharSet() );
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index f120766..58be840 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2035,7 +2035,7 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet,
bool bSearchInParent, S
if ( bSearchInParent || ( rSet.GetItemState( nWhich_FontInfo ) ==
SfxItemState::SET ) )
{
const SvxFontItem& rFontItem = static_cast<const
SvxFontItem&>(rSet.Get( nWhich_FontInfo ));
- rFont.SetFamilyName( rFontItem.GetFamilyName() );
+ rFont.SetName( rFontItem.GetFamilyName() );
rFont.SetFamily( rFontItem.GetFamily() );
rFont.SetPitch( rFontItem.GetPitch() );
rFont.SetCharSet( rFontItem.GetCharSet() );
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index ad52b0f..d6b3e66 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.GetFamily(), rFont.GetName(), 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..584634c 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.GetFamily(), aFont.GetName(), 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.GetFamily(), aFont.GetName(),
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.GetFamily(), aFont.GetName(),
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..a918adf 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.GetFamily(), aDefFont.GetName(),
aDefFont.GetStyleName(), aDefFont.GetPitch(),
aDefFont.GetCharSet(), EE_CHAR_FONTINFO );
sal_Int32 nStartPara = mpEditEngine->GetEditDoc().GetPos( rStart.GetNode()
);
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 1cc860a..fac9787 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2600,7 +2600,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode,
sal_Int32 nPos, SvxFont& rFo
if ( ( nScriptTypeI18N == i18n::ScriptType::ASIAN ) || ( nScriptTypeI18N
== i18n::ScriptType::COMPLEX ) )
{
const SvxFontItem& rFontItem = static_cast<const
SvxFontItem&>(pNode->GetContentAttribs().GetItem( GetScriptItemId(
EE_CHAR_FONTINFO, nScriptType ) ));
- rFont.SetFamilyName( rFontItem.GetFamilyName() );
+ rFont.SetName( rFontItem.GetFamilyName() );
rFont.SetFamily( rFontItem.GetFamily() );
rFont.SetPitch( rFontItem.GetPitch() );
rFont.SetCharSet( rFontItem.GetCharSet() );
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index 6e0d343..beaf196 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1661,7 +1661,7 @@ void ImpEditEngine::SetLanguageAndFont(
{
// set new font attribute
SvxFontItem aFontItem = static_cast<const SvxFontItem&>( aNewSet.Get(
nFontWhichId ) );
- aFontItem.SetFamilyName( pFont->GetFamilyName());
+ aFontItem.SetFamilyName( pFont->GetName());
aFontItem.SetFamily( pFont->GetFamily());
aFontItem.SetStyleName( pFont->GetStyleName());
aFontItem.SetPitch( pFont->GetPitch());
diff --git a/editeng/source/editeng/textconv.cxx
b/editeng/source/editeng/textconv.cxx
index deb8acb..7807714 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -252,7 +252,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.SetFamilyName( pFont->GetName());
aFontItem.SetFamily( pFont->GetFamily());
aFontItem.SetStyleName( pFont->GetStyleName());
aFontItem.SetPitch( pFont->GetPitch());
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 199c50c..2791bf4 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -50,8 +50,8 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const
vcl::Font& rFont )
nTemp = (sal_uInt16)rFont.GetStrikeout(); rStream.WriteUInt16( nTemp );
nTemp = (sal_uInt16)rFont.GetItalic(); rStream.WriteUInt16( nTemp );
- // UNICODE: rStream << rFont.GetFamilyName();
- rStream.WriteUniOrByteString(rFont.GetFamilyName(),
rStream.GetStreamCharSet());
+ // UNICODE: rStream << rFont.GetName();
+ rStream.WriteUniOrByteString(rFont.GetName(), rStream.GetStreamCharSet());
rStream.WriteBool( rFont.IsOutline() );
rStream.WriteBool( rFont.IsShadow() );
@@ -79,9 +79,9 @@ vcl::Font SvxBulletItem::CreateFont( SvStream& rStream,
sal_uInt16 nVer )
rStream.ReadUInt16( nTemp ); aFont.SetStrikeout((FontStrikeout)nTemp);
rStream.ReadUInt16( nTemp ); aFont.SetItalic((FontItalic)nTemp);
- // UNICODE: rStream >> aName; aFont.SetFamilyName( aName );
+ // UNICODE: rStream >> aName; aFont.SetName( aName );
OUString aName = rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
- aFont.SetFamilyName( aName );
+ aFont.SetName( aName );
if( nVer == 1 )
{
@@ -231,7 +231,7 @@ void SvxBulletItem::CopyValidProperties( const
SvxBulletItem& rCopyFrom )
{
vcl::Font _aFont = GetFont();
vcl::Font aNewFont = rCopyFrom.GetFont();
- _aFont.SetFamilyName( aNewFont.GetFamilyName() );
+ _aFont.SetName( aNewFont.GetName() );
_aFont.SetFamily( aNewFont.GetFamily() );
_aFont.SetStyleName( aNewFont.GetStyleName() );
_aFont.SetColor( aNewFont.GetColor() );
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index b6247b4..4d59e45 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -249,7 +249,7 @@ void SvxNumberFormat::Store(SvStream &rStream,
FontToSubsFontConverter pConverte
{
cBullet = ConvertFontToSubsFontChar(pConverter, cBullet);
OUString sFontName = GetFontToSubsFontName(pConverter);
- pBulletFont->SetFamilyName(sFontName);
+ pBulletFont->SetName(sFontName);
}
rStream.WriteUInt16( NUMITEM_VERSION_04 );
@@ -677,7 +677,7 @@ void SvxNumRule::Store( SvStream &rStream )
{
if(!pConverter)
pConverter =
-
CreateFontToSubsFontConverter(aFmts[i]->GetBulletFont()->GetFamilyName(),
+
CreateFontToSubsFontConverter(aFmts[i]->GetBulletFont()->GetName(),
FontToSubsFontFlags::EXPORT|FontToSubsFontFlags::ONLYOLDSOSYMBOLFONTS);
}
aFmts[i]->Store(rStream, pConverter);
diff --git a/editeng/source/items/textitem.cxx
b/editeng/source/items/textitem.cxx
index 411ecb7..2837368 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -149,7 +149,7 @@ SvxFontListItem::SvxFontListItem( const FontList* pFontLst,
aFontNameSeq.realloc( nCount );
for ( sal_Int32 i = 0; i < nCount; i++ )
- aFontNameSeq[i] = pFontList->GetFontName(i).GetFamilyName();
+ aFontNameSeq[i] = pFontList->GetFontName(i).GetName();
}
}
@@ -3541,7 +3541,7 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem&
rAsian, SvxFontItem& rCo
GetDefaultFontFlags::OnlyOne
) );
SvxFontItem* pItem = aItemArr[ n ];
pItem->SetFamily( aFont.GetFamily() );
- pItem->SetFamilyName( aFont.GetFamilyName() );
+ pItem->SetFamilyName( aFont.GetName() );
pItem->SetStyleName( OUString() );
pItem->SetPitch( aFont.GetPitch());
pItem->SetCharSet(aFont.GetCharSet());
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 869783e..f63a44f 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -432,7 +432,7 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
case 17:
{
OUString sTemp; pValues[nProp] >>= sTemp;
- rSwFlags.aBulletFont.SetFamilyName(sTemp);
+ rSwFlags.aBulletFont.SetName(sTemp);
}
break; //
"Format/Option/ChangeToBullets/SpecialCharacter/Font",
case 18:
@@ -508,7 +508,7 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
case 43 :
{
OUString sTemp; pValues[nProp] >>= sTemp;
- rSwFlags.aByInputBulletFont.SetFamilyName(sTemp);
+ rSwFlags.aByInputBulletFont.SetName(sTemp);
}
break;//
"Format/ByInput/ApplyNumbering/SpecialCharacter/Font",
case 44 :
@@ -582,7 +582,7 @@ void SvxSwAutoCorrCfg::ImplCommit()
pValues[nProp] <<= (sal_Int32)rSwFlags.cBullet;
break; // "Format/Option/ChangeToBullets/SpecialCharacter/Char",
case 17:
- pValues[nProp] <<=
OUString(rSwFlags.aBulletFont.GetFamilyName());
+ pValues[nProp] <<= OUString(rSwFlags.aBulletFont.GetName());
break; // "Format/Option/ChangeToBullets/SpecialCharacter/Font",
case 18:
pValues[nProp] <<= (sal_Int32)rSwFlags.aBulletFont.GetFamily();
@@ -626,7 +626,7 @@ void SvxSwAutoCorrCfg::ImplCommit()
pValues[nProp] <<= (sal_Int32)rSwFlags.cByInputBullet;
break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/Char",
case 43 :
- pValues[nProp] <<=
OUString(rSwFlags.aByInputBulletFont.GetFamilyName());
+ pValues[nProp] <<=
OUString(rSwFlags.aByInputBulletFont.GetName());
break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/Font",
case 44 :
pValues[nProp] <<=
(sal_Int32)rSwFlags.aByInputBulletFont.GetFamily();
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 91d1741..68582a7 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -642,7 +642,7 @@ SET_FONTALIGNMENT:
{
const vcl::Font& rSVFont = GetFont(
sal_uInt16(nTokenValue) );
SvxFontItem aTmpItem( rSVFont.GetFamily(),
- rSVFont.GetFamilyName(),
rSVFont.GetStyleName(),
+ rSVFont.GetName(), rSVFont.GetStyleName(),
rSVFont.GetPitch(), rSVFont.GetCharSet(),
SID_ATTR_CHAR_FONT );
SetScriptAttr( eCharType, *pSet, aTmpItem );
@@ -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.GetFamily(), rSVFont.GetName(),
rSVFont.GetStyleName(), rSVFont.GetPitch(),
rSVFont.GetCharSet(), SID_ATTR_CHAR_FONT );
SetScriptAttr( NOTDEF_CHARTYPE, aTmp, aTmpItem );
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 893ee1a..83a804d 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -563,7 +563,7 @@ void SvxRTFParser::ReadFontTable()
if (!sAltNm.isEmpty())
sFntNm = sFntNm + ";" + sAltNm;
- pFont->SetFamilyName( sFntNm );
+ pFont->SetName( sFntNm );
m_FontTable.insert(std::make_pair(nInsFontNo, std::move(pFont)));
pFont.reset(new vcl::Font);
pFont->SetCharSet( nSystemChar );
@@ -806,7 +806,7 @@ const vcl::Font& SvxRTFParser::GetFont( sal_uInt16 nId )
}
const SvxFontItem& rDfltFont = static_cast<const SvxFontItem&>(
pAttrPool->GetDefaultItem( aPlainMap.nFont ));
- pDfltFont->SetFamilyName( rDfltFont.GetStyleName() );
+ pDfltFont->SetName( rDfltFont.GetStyleName() );
pDfltFont->SetFamily( rDfltFont.GetFamily() );
return *pDfltFont;
}
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index dcc4885..368513d 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star;
void SvxUnoFontDescriptor::ConvertToFont( const awt::FontDescriptor& rDesc,
vcl::Font& rFont )
{
- rFont.SetFamilyName( rDesc.Name );
+ rFont.SetName( rDesc.Name );
rFont.SetStyleName( rDesc.StyleName );
rFont.SetSize( Size( rDesc.Width, rDesc.Height ) );
rFont.SetFamily( (FontFamily)rDesc.Family );
@@ -57,7 +57,7 @@ void SvxUnoFontDescriptor::ConvertToFont( const
awt::FontDescriptor& rDesc, vcl:
void SvxUnoFontDescriptor::ConvertFromFont( const vcl::Font& rFont,
awt::FontDescriptor& rDesc )
{
- rDesc.Name = rFont.GetFamilyName();
+ rDesc.Name = rFont.GetName();
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());
diff --git a/extensions/source/propctrlr/fontdialog.cxx
b/extensions/source/propctrlr/fontdialog.cxx
index 5b82177..bef8087 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.GetFamily(),
aDefaultVCLFont.GetName(), 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.GetFamily(),
aDefaultVCLFont.GetName(), 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/flash/swfwriter1.cxx
b/filter/source/flash/swfwriter1.cxx
index 260b29b..82480e2 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -371,7 +371,7 @@ void Writer::setClipping( const tools::PolyPolygon*
pClipPolyPolygon )
// that we care about.
bool compare_fonts_for_me(const vcl::Font& rFont1, const vcl::Font& rFont2)
{
- return rFont1.GetFamilyName() == rFont2.GetFamilyName() &&
+ return rFont1.GetName() == rFont2.GetName() &&
rFont1.GetWeight() == rFont2.GetWeight() &&
rFont1.GetItalic() == rFont2.GetItalic() &&
rFont1.IsOutline() == rFont2.IsOutline() &&
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx
b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 984f234..9ec66e9 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -2292,7 +2292,7 @@ void OS2METReader::ReadFont(sal_uInt16 nFieldSize)
OUString aStr( str, strlen(str),
osl_getThreadTextEncoding() );
if ( aStr.compareToIgnoreAsciiCase( "Helv" ) == 0 )
aStr = "Helvetica";
- pF->aFont.SetFamilyName( aStr );
+ pF->aFont.SetName( aStr );
break;
}
}
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx
b/filter/source/graphicfilter/ipict/ipict.cxx
index e7bbf71..00d5392 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -1571,7 +1571,7 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode)
pPict->Read( &sFName, nLen );
sFName[ nLen ] = 0;
OUString aString( sFName, strlen(sFName), osl_getThreadTextEncoding()
);
- aActFont.SetFamilyName( aString );
+ aActFont.SetName( aString );
eActMethod=PDM_UNDEFINED;
break;
}
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 971b571..c34f8dc 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2150,7 +2150,7 @@ bool SdrPowerPointImport::ReadFontCollection()
vcl::Font aFont;
aFont.SetCharSet( pFont->eCharSet );
- aFont.SetFamilyName( pFont->aName );
+ aFont.SetName( pFont->aName );
aFont.SetFamily( pFont->eFamily );
aFont.SetPitch( pFont->ePitch );
aFont.SetHeight( 100 );
@@ -3631,7 +3631,7 @@ void PPTNumberFormatCreator::GetNumberFormat(
SdrPowerPointImport& rManager, Svx
{
vcl::Font aFont;
aFont.SetCharSet( pFontEnityAtom->eCharSet );
- aFont.SetFamilyName( pFontEnityAtom->aName );
+ aFont.SetName( pFontEnityAtom->aName );
aFont.SetFamily( pFontEnityAtom->eFamily );
aFont.SetPitch( pFontEnityAtom->ePitch );
rNumberFormat.SetBulletFont( &aFont );
@@ -3690,7 +3690,7 @@ bool PPTNumberFormatCreator::GetNumberFormat(
SdrPowerPointImport& rManager, Svx
{
vcl::Font aFont;
aFont.SetCharSet( pFontEnityAtom->eCharSet );
- aFont.SetFamilyName( pFontEnityAtom->aName );
+ aFont.SetName( pFontEnityAtom->aName );
aFont.SetFamily( pFontEnityAtom->eFamily );
aFont.SetPitch( pFontEnityAtom->ePitch );
rNumberFormat.SetBulletFont( &aFont );
@@ -3710,7 +3710,7 @@ void PPTNumberFormatCreator::ImplGetNumberFormat(
SdrPowerPointImport& rManager,
if ( pAtom )
{
rtl_TextEncoding eCharSet( pAtom->eCharSet );
- aFont.SetFamilyName( pAtom->aName );
+ aFont.SetName( pAtom->aName );
aFont.SetCharSet( eCharSet );
aFont.SetFamily( pAtom->eFamily );
aFont.SetPitch( pAtom->ePitch );
diff --git a/filter/source/svg/svgfontexport.cxx
b/filter/source/svg/svgfontexport.cxx
index 16aa157..2d62da7 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -53,7 +53,7 @@ SVGFontExport::GlyphSet& SVGFontExport::implGetGlyphSet(
const vcl::Font& rFont
{
FontWeight eWeight( WEIGHT_NORMAL );
FontItalic eItalic( ITALIC_NONE );
- OUString aFontName( rFont.GetFamilyName() );
+ OUString aFontName( rFont.GetName() );
sal_Int32 nNextTokenPos( 0 );
switch( rFont.GetWeight() )
@@ -222,7 +222,7 @@ void SVGFontExport::implEmbedFont( const vcl::Font& rFont )
else
aFontStyle = "normal";
- mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-family",
GetMappedFontName( rFont.GetFamilyName() ) );
+ mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-family",
GetMappedFontName( rFont.GetName() ) );
mrExport.AddAttribute( XML_NAMESPACE_NONE, "units-per-em",
aUnitsPerEM );
mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-weight",
aFontWeight );
mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-style",
aFontStyle );
@@ -314,7 +314,7 @@ void SVGFontExport::EmbedFonts()
{
vcl::Font aFont;
- aFont.SetFamilyName( (*aGlyphTreeIter).first );
+ aFont.SetName( (*aGlyphTreeIter).first );
aFont.SetWeight( (*aFontWeightIter).first );
aFont.SetItalic( (*aFontItalicIter).first );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 5b60271..8613369 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -377,12 +377,12 @@ void SVGAttributeWriter::setFontFamily()
{
if( mrExport.IsUsePositionedCharacters() )
{
- mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontFamily,
mrFontExport.GetMappedFontName( maCurFont.GetFamilyName() ) );
+ mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontFamily,
mrFontExport.GetMappedFontName( maCurFont.GetName() ) );
}
else
{
sal_Int32 nNextTokenPos( 0 );
- const OUString& rsFontName = maCurFont.GetFamilyName();
+ const OUString& rsFontName = maCurFont.GetName();
OUString sFontFamily( rsFontName.getToken( 0, ';', nNextTokenPos ) );
FontPitch ePitch = maCurFont.GetPitch();
if( ePitch == PITCH_FIXED )
@@ -729,12 +729,12 @@ void SVGTextWriter::addFontAttributes( bool
bIsTextContainer )
if( maCurrentFont != maParentFont )
{
- const OUString& rsCurFontName =
maCurrentFont.GetFamilyName();
+ const OUString& rsCurFontName = maCurrentFont.GetName();
long int nCurFontSize =
maCurrentFont.GetHeight();
FontItalic eCurFontItalic =
maCurrentFont.GetItalic();
FontWeight eCurFontWeight =
maCurrentFont.GetWeight();
- const OUString& rsParFontName =
maParentFont.GetFamilyName();
+ const OUString& rsParFontName = maParentFont.GetName();
long int nParFontSize = maParentFont.GetHeight();
FontItalic eParFontItalic = maParentFont.GetItalic();
FontWeight eParFontWeight = maParentFont.GetWeight();
@@ -840,7 +840,7 @@ void SVGTextWriter::addFontAttributes( bool
bIsTextContainer )
void SVGTextWriter::implSetFontFamily()
{
sal_Int32 nNextTokenPos( 0 );
- const OUString& rsFontName = maCurrentFont.GetFamilyName();
+ const OUString& rsFontName = maCurrentFont.GetName();
OUString sFontFamily( rsFontName.getToken( 0, ';', nNextTokenPos ) );
FontPitch ePitch = maCurrentFont.GetPitch();
if( ePitch == PITCH_FIXED )
diff --git a/forms/source/richtext/richtextengine.cxx
b/forms/source/richtext/richtextengine.cxx
index f0d10d1..ede2b4d 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -39,6 +39,9 @@
namespace frm
{
+
+
+
//= RichTextEngine
@@ -59,8 +62,8 @@ 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 ) );
+ aFont.SetName( "Times New Roman" );
+ pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(),
aFont.GetName(), 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 bf50ab7..c8a2c2d 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -43,57 +43,33 @@ namespace vcl {
class VCL_DLLPUBLIC Font
{
-public:
- explicit Font();
- Font( const Font& ); // TODO make me explicit
- explicit Font( const OUString& rFamilyName, const Size& );
- explicit Font( const OUString& rFamilyName, const OUString&
rStyleName, const Size& );
- explicit Font( FontFamily eFamily, const Size& );
- virtual ~Font();
-
- const OUString& GetFamilyName() const;
- FontFamily GetFamily();
- FontFamily GetFamily() const;
- const OUString& GetStyleName() const;
-
- FontWeight GetWeight();
- FontWeight GetWeight() const;
- FontItalic GetItalic();
- FontItalic GetItalic() const;
- FontPitch GetPitch();
- FontPitch GetPitch() const;
- FontWidth GetWidthType();
- FontWidth GetWidthType() const;
- rtl_TextEncoding GetCharSet() const;
- FontAlign GetAlign() const;
-
- bool IsSymbolFont() const;
-
- void SetFamilyName( const OUString& rFamilyName );
- void SetStyleName( const OUString& rStyleName );
- void SetFamily( FontFamily );
-
- void SetPitch( FontPitch ePitch );
- void SetItalic( FontItalic );
- void SetWeight( FontWeight );
- void SetWidthType( FontWidth );
- void SetCharSet( rtl_TextEncoding );
- void SetAlign( FontAlign );
+private:
+ ImplFont* mpImplFont;
+ void MakeUnique();
- void SetSymbolFlag( bool );
+public:
+ Font();
+ Font( const Font& );
+ Font( const OUString& rFamilyName, const Size& );
+ Font( const OUString& rFamilyName, const OUString&
rStyleName, const Size& );
+ Font( FontFamily eFamily, const Size& );
+ ~Font();
// setting the color on the font is obsolete, the only remaining
// valid use is for keeping backward compatibility with old MetaFiles
- const Color& GetColor() const;
- const Color& GetFillColor() const;
-
- bool IsTransparent() const;
-
void SetColor( const Color& );
+ const Color& GetColor() const;
void SetFillColor( const Color& );
-
+ const Color& GetFillColor() const;
void SetTransparent( bool bTransparent );
+ bool IsTransparent() const;
+ void SetAlign( FontAlign );
+ FontAlign GetAlign() const;
+ void SetName( const OUString& rFamilyName );
+ const OUString& GetName() const;
+ void SetStyleName( const OUString& rStyleName );
+ const OUString& GetStyleName() const;
void SetSize( const Size& );
const Size& GetSize() const;
void SetHeight( long nHeight );
@@ -101,6 +77,14 @@ public:
void SetWidth( long nWidth );
long GetWidth() const;
+ void SetFamily( FontFamily );
+ FontFamily GetFamily();
+ FontFamily GetFamily() const;
+ void SetCharSet( rtl_TextEncoding );
+ rtl_TextEncoding GetCharSet() const;
+ void SetSymbolFlag( bool );
+ bool IsSymbolFont() const;
+
// Prefer LanguageTag over LanguageType
void SetLanguageTag( const LanguageTag & );
const LanguageTag& GetLanguageTag() const;
@@ -110,6 +94,9 @@ public:
LanguageType GetLanguage() const;
void SetCJKContextLanguage( LanguageType );
LanguageType GetCJKContextLanguage() const;
+ void SetPitch( FontPitch ePitch );
+ FontPitch GetPitch();
+ FontPitch GetPitch() const;
void SetOrientation( short nLineOrientation );
short GetOrientation() const;
@@ -117,8 +104,17 @@ public:
bool IsVertical() const;
void SetKerning( FontKerning nKerning );
FontKerning GetKerning() const;
- bool IsKerning() const;
+ bool IsKerning() const;
+ void SetWeight( FontWeight );
+ FontWeight GetWeight();
+ FontWeight GetWeight() const;
+ void SetWidthType( FontWidth );
+ FontWidth GetWidthType();
+ FontWidth GetWidthType() const;
+ void SetItalic( FontItalic );
+ FontItalic GetItalic();
+ FontItalic GetItalic() const;
void SetOutline( bool bOutline );
bool IsOutline() const;
void SetShadow( bool bShadow );
@@ -149,11 +145,6 @@ public:
friend VCL_DLLPUBLIC SvStream& ::WriteFont( SvStream& rOStm, const
vcl::Font& );
static Font identifyFont( const void* pBuffer, sal_uInt32 nLen );
-
-private:
- ImplFont* mpImplFont;
- void MakeUnique();
-
};
}
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index a263fda..e37b91f 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -38,9 +38,9 @@ typedef boost::intrusive_ptr< ImplFontMetric >
ImplFontMetricPtr;
class VCL_DLLPUBLIC FontMetric : public vcl::Font
{
public:
- explicit FontMetric();
- FontMetric( const FontMetric& ); // TODO make this
explicit
- virtual ~FontMetric();
+ FontMetric();
+ FontMetric( const FontMetric& );
+ ~FontMetric();
FontType GetType() const;
@@ -81,7 +81,7 @@ inline std::basic_ostream<charT, traits> & operator <<(
std::basic_ostream<charT, traits> & stream, const FontMetric& rMetric )
{
stream << "{"
- << "name=" << "\"" << rMetric.GetFamilyName() << "\""
+ << "name=" << "\"" << rMetric.GetName() << "\""
<< ",size=(" << rMetric.GetSize().Width() << "," <<
rMetric.GetSize().Height() << ")"
<< ",ascent=" << rMetric.GetAscent()
<< ",descent=" << rMetric.GetDescent()
diff --git a/reportdesign/source/ui/misc/UITools.cxx
b/reportdesign/source/ui/misc/UITools.cxx
index 873d6bf..6a5263f 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -380,7 +380,7 @@ namespace
if ( SfxItemState::SET == _rItemSet.GetItemState( _nFont,true,&pItem)
&& dynamic_cast< const SvxFontItem *>( pItem ) != nullptr)
{
const SvxFontItem* pFontItem = static_cast<const
SvxFontItem*>(pItem);
- aNewFont.SetFamilyName(pFontItem->GetFamilyName());
+ aNewFont.SetName( pFontItem->GetFamilyName());
aNewFont.SetStyleName(pFontItem->GetStyleName());
aNewFont.SetFamily(pFontItem->GetFamily());
aNewFont.SetPitch(pFontItem->GetPitch());
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 05e7fa8..e1eb495 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -197,7 +197,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool)
vcl::Font aStdFont = OutputDevice::GetDefaultFont(
DefaultFontType::LATIN_SPREADSHEET, LANGUAGE_ENGLISH_US,
GetDefaultFontFlags::OnlyOne );
SvxFontItem* pStdFont = new SvxFontItem( aStdFont.GetFamily(),
- aStdFont.GetFamilyName(),
aStdFont.GetStyleName(),
+ aStdFont.GetName(),
aStdFont.GetStyleName(),
aStdFont.GetPitch(),
aStdFont.GetCharSet(),
ATTR_FONT );
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index 01039b1..61ab5ca 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -368,8 +368,8 @@ void ScPatternAttr::GetFont(
// FontItem:
- if (rFont.GetFamilyName() != pFontAttr->GetFamilyName())
- rFont.SetFamilyName( pFontAttr->GetFamilyName() );
+ if (rFont.GetName() != pFontAttr->GetFamilyName())
+ rFont.SetName( pFontAttr->GetFamilyName() );
if (rFont.GetStyleName() != pFontAttr->GetStyleName())
rFont.SetStyleName( pFontAttr->GetStyleName() );
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index aec6dcb..4504454 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.GetFamily(), aDefFont.GetName(),
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..46db04a 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.GetFamily(), aStdFont.GetName(), 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.GetFamily(), aStdFont.GetName(), 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.GetFamily(), aStdFont.GetName(), 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/xehelper.cxx
b/sc/source/filter/excel/xehelper.cxx
index 18edb90..8299b9d 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -729,7 +729,7 @@ void XclExpHFConverter::AppendPortion( const
EditTextObject* pTextObj, sal_Unico
ScPatternAttr::GetFont( aFont, aItemSet, SC_AUTOCOL_RAW );
// font name and style
- aNewData.maName = XclTools::GetXclFontName(
aFont.GetFamilyName() );
+ aNewData.maName = XclTools::GetXclFontName( aFont.GetName() );
aNewData.mnWeight = (aFont.GetWeight() > WEIGHT_NORMAL) ?
EXC_FONTWGHT_BOLD : EXC_FONTWGHT_NORMAL;
aNewData.mbItalic = (aFont.GetItalic() != ITALIC_NONE);
bool bNewFont = !(aFontData.maName == aNewData.maName);
diff --git a/sc/source/filter/excel/xlstyle.cxx
b/sc/source/filter/excel/xlstyle.cxx
index 3b8b6de..9005282 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -198,7 +198,7 @@ void XclFontData::Clear()
void XclFontData::FillFromVclFont( const vcl::Font& rFont )
{
- maName = XclTools::GetXclFontName( rFont.GetFamilyName() ); //
substitute with MS fonts
+ maName = XclTools::GetXclFontName( rFont.GetName() ); // substitute with
MS fonts
maStyle.clear();
maColor = rFont.GetColor();
SetScUnderline( rFont.GetUnderline() );
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index dc3fcec..3ea7a9a 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.GetFamily(), rFont.GetName(),
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..ad25cd7 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.GetFamily(),
aFont.GetName(),
aFont.GetStyleName(), aFont.GetPitch(),
aFont.GetCharSet(), ATTR_FONT );
}
@@ -261,7 +261,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq )
if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, true,
&pItem ) == SfxItemState::SET )
{
const SvxHyperlinkItem* pHyper = static_cast<const
SvxHyperlinkItem*>(pItem);
- const OUString& rName = pHyper->GetName();
+ const OUString& rName = pHyper->GetName();
const OUString& rURL = pHyper->GetURL();
const OUString& rTarget = pHyper->GetTargetFrame();
SvxLinkInsertMode eMode = pHyper->GetInsertMode();
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx
b/sc/source/ui/miscdlgs/autofmt.cxx
index 647c2d5..7a91186 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -103,7 +103,7 @@ static void lcl_SetFontProperties(
const SvxPostureItem& rPostureItem )
{
rFont.SetFamily ( rFontItem.GetFamily() );
- rFont.SetFamilyName ( rFontItem.GetFamilyName() );
+ rFont.SetName ( rFontItem.GetFamilyName() );
rFont.SetStyleName ( rFontItem.GetStyleName() );
rFont.SetCharSet ( rFontItem.GetCharSet() );
rFont.SetPitch ( rFontItem.GetPitch() );
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index e389787..e4c790b 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.GetFamily(),
aCurFont.GetName(), 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..109376b 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.GetFamily(),
aFont.GetName(),
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..e88e5da 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2975,7 +2975,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(),
- rFont.GetFamilyName(),
+ rFont.GetName(),
rFont.GetStyleName(),
rFont.GetPitch(),
rFont.GetCharSet(),
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 7424e80..fc50caf 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.GetFamily(), aLatinFont.GetName(),
aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
aLatinFont.GetCharSet(), EE_CHAR_FONTINFO );
- SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(),
aCJKFont.GetFamilyName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
+ SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(), aCJKFont.GetName(),
aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
aCJKFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
- SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(),
aCTLFont.GetFamilyName(), aCTLFont.GetStyleName(), aCTLFont.GetPitch(),
+ SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(), aCTLFont.GetName(),
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.GetFamily(), aLatinFont.GetName(),
aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
aLatinFont.GetCharSet(), EE_CHAR_FONTINFO );
- SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(),
aCJKFont.GetFamilyName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
+ SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(), aCJKFont.GetName(),
aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
aCJKFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
- SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(),
aCTLFont.GetFamilyName(), aCTLFont.GetStyleName(), aCTLFont.GetPitch(),
+ SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(), aCTLFont.GetName(),
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..bc1f18b 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.GetFamily(), aLatinFont.GetName(),
aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
aLatinFont.GetCharSet(), EE_CHAR_FONTINFO );
- SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(),
aCJKFont.GetFamilyName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
+ SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(), aCJKFont.GetName(),
aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
aCJKFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
- SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(),
aCTLFont.GetFamilyName(), aCTLFont.GetStyleName(), aCTLFont.GetPitch(),
+ SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(), aCTLFont.GetName(),
aCTLFont.GetStyleName(), aCTLFont.GetPitch(),
aCTLFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
vcl::Font aBulletFont( GetBulletFont() );
diff --git a/sd/source/filter/eppt/pptx-text.cxx
b/sd/source/filter/eppt/pptx-text.cxx
index 6398228..51a4344 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -1410,7 +1410,7 @@ sal_uInt32 FontCollection::GetId( FontCollectionEntry&
rEntry )
}
vcl::Font aFont;
aFont.SetCharSet( rEntry.CharSet );
- aFont.SetFamilyName( rEntry.Original );
+ aFont.SetName( rEntry.Original );
aFont.SetHeight( 100 );
if ( !pVDev )
diff --git a/sd/source/ui/annotations/annotationmanager.cxx
b/sd/source/ui/annotations/annotationmanager.cxx
index b119242..2d09b7a 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.GetFamily(),aAppFont.GetName(),"",PITCH_DONTKNOW,RTL_TEXTENCODING_DONTKNOW,EE_CHAR_FONTINFO));
}
return mpAnnotationPool;
diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx
index 96316eb..2f27d91 100644
--- a/sd/source/ui/func/bulmaper.cxx
+++ b/sd/source/ui/func/bulmaper.cxx
@@ -66,7 +66,7 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule,
const SfxItemSet&
const SvxFontItem& rFItem =
static_cast<const SvxFontItem&>(rSet.Get(GetWhich(
(sal_uInt16)nFontID )));
aMyFont.SetFamily(rFItem.GetFamily());
- aMyFont.SetFamilyName(rFItem.GetFamilyName());
+ aMyFont.SetName(rFItem.GetFamilyName());
aMyFont.SetCharSet(rFItem.GetCharSet());
aMyFont.SetPitch(rFItem.GetPitch());
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index 5e5d4fd..445e4e8 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -205,7 +205,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq )
const SvxFontItem* pFItem =
SfxItemSet::GetItem<SvxFontItem>(pDlg->GetOutputItemSet(), SID_ATTR_CHAR_FONT,
false);
if ( pFItem )
{
- aFont.SetFamilyName( pFItem->GetFamilyName() );
+ aFont.SetName( pFItem->GetFamilyName() );
aFont.SetStyleName( pFItem->GetStyleName() );
aFont.SetCharSet( pFItem->GetCharSet() );
aFont.SetPitch( pFItem->GetPitch() );
@@ -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.GetFamily(), aFont.GetName(),
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..fa55949 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -171,7 +171,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.SetFamilyName( pTargetFont->GetName());
aFontItem.SetFamily( pTargetFont->GetFamily());
aFontItem.SetStyleName( pTargetFont->GetStyleName());
aFontItem.SetPitch( pTargetFont->GetPitch());
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx
b/sd/source/ui/presenter/PresenterTextView.cxx
index 6f08a5d..502f52c 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -312,7 +312,7 @@ EditEngine*
PresenterTextView::Implementation::CreateEditEngine()
mpEditEngineItemPool->SetPoolDefaultItem(
SvxFontItem(
aFont.GetFamily(),
- aFont.GetFamilyName(),
+ aFont.GetName(),
aFont.GetStyleName(),
aFont.GetPitch(),
aFont.GetCharSet(),
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 66bdc03..ab3e8ec 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -134,7 +134,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh,
vcl::Window* pWindow, OutlineVie
maBulletFont.SetColor( COL_AUTO );
maBulletFont.SetHeight( 1000 );
maBulletFont.SetCharSet(RTL_TEXTENCODING_MS_1252); // and replacing
other values by standard
- maBulletFont.SetFamilyName( "StarSymbol" );
+ maBulletFont.SetName( "StarSymbol" );
maBulletFont.SetWeight(WEIGHT_NORMAL);
maBulletFont.SetUnderline(UNDERLINE_NONE);
maBulletFont.SetStrikeout(STRIKEOUT_NONE);
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 24f626d..d6c91b7 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -160,7 +160,7 @@ SmFontFormat::SmFontFormat()
SmFontFormat::SmFontFormat( const vcl::Font &rFont )
{
- aName = rFont.GetFamilyName();
+ aName = rFont.GetName();
nCharSet = (sal_Int16) rFont.GetCharSet();
nFamily = (sal_Int16) rFont.GetFamily();
nPitch = (sal_Int16) rFont.GetPitch();
@@ -172,7 +172,7 @@ SmFontFormat::SmFontFormat( const vcl::Font &rFont )
const vcl::Font SmFontFormat::GetFont() const
{
vcl::Font aRes;
- aRes.SetFamilyName( aName );
+ aRes.SetName( aName );
aRes.SetCharSet( (rtl_TextEncoding) nCharSet );
aRes.SetFamily( (FontFamily) nFamily );
aRes.SetPitch( (FontPitch) nPitch );
@@ -881,7 +881,7 @@ void SmMathConfig::LoadFormat()
if (bUseDefaultFont)
{
aFnt = pFormat->GetFont( i );
- aFnt.SetFamilyName( GetDefaultFontName( nLang, i ) );
+ aFnt.SetName( GetDefaultFontName( nLang, i ) );
}
else
{
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index b6e9559..852bc1b5 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -271,7 +271,7 @@ void SmShowFont::Paint(vcl::RenderContext& rRenderContext,
const Rectangle& rRec
rRenderContext.SetFont(aFont);
rRenderContext.SetTextColor(aTextColor);
- OUString sText(rRenderContext.GetFont().GetFamilyName());
+ OUString sText(rRenderContext.GetFont().GetName());
Size aTextSize(rRenderContext.GetTextWidth(sText),
rRenderContext.GetTextHeight());
rRenderContext.DrawText(Point((rRenderContext.GetOutputSize().Width() -
aTextSize.Width()) / 2,
@@ -302,7 +302,7 @@ void SmShowFont::SetFont(const vcl::Font& rFont)
IMPL_LINK_TYPED( SmFontDialog, FontSelectHdl, ComboBox&, rComboBox, void )
{
- maFont.SetFamilyName(rComboBox.GetText());
+ maFont.SetName(rComboBox.GetText());
m_pShowFont->SetFont(maFont);
}
@@ -336,7 +336,7 @@ void SmFontDialog::SetFont(const vcl::Font &rFont)
{
maFont = rFont;
- m_pFontBox->SetText(maFont.GetFamilyName());
+ m_pFontBox->SetText(maFont.GetName());
m_pBoldCheckBox->Check(IsBold(maFont));
m_pItalicCheckBox->Check(IsItalic(maFont));
m_pShowFont->SetFont(maFont);
@@ -360,7 +360,7 @@ SmFontDialog::SmFontDialog(vcl::Window * pParent,
OutputDevice *pFntListDevice,
sal_uInt16 nCount = aFontList.GetFontNameCount();
for (sal_uInt16 i = 0; i < nCount; ++i)
{
- m_pFontBox->InsertEntry( aFontList.GetFontName(i).GetFamilyName()
);
+ m_pFontBox->InsertEntry( aFontList.GetFontName(i).GetName() );
}
maFont.SetSize(Size(0, 24));
maFont.SetWeight(WEIGHT_NORMAL);
@@ -1758,7 +1758,7 @@ void SmSymDefineDialog::FillFonts(bool bDelete)
{
sal_uInt16 nCount = pFontList->GetFontNameCount();
for (sal_uInt16 i = 0; i < nCount; i++)
- pFonts->InsertEntry( pFontList->GetFontName(i).GetFamilyName() );
+ pFonts->InsertEntry( pFontList->GetFontName(i).GetName() );
}
}
@@ -2018,7 +2018,7 @@ void SmSymDefineDialog::UpdateButtons()
&&
aTmpSymbolSetName.equalsIgnoreAsciiCase(pOldSymbolSetName->GetText())
&& aTmpSymbolName.equals(pOrigSymbol->GetName())
&& pFonts->GetSelectEntry().equalsIgnoreAsciiCase(
- pOrigSymbol->GetFace().GetFamilyName())
+ pOrigSymbol->GetFace().GetName())
&& pStyles->GetText().equalsIgnoreAsciiCase(
GetFontStyles().GetStyleName(pOrigSymbol->GetFace()))
&& pCharsetDisplay->GetSelectCharacter() ==
pOrigSymbol->GetCharacter();
@@ -2281,7 +2281,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
{
// choose font and style accordingly
const vcl::Font &rFont = pSymbol->GetFace();
- SelectFont(rFont.GetFamilyName(), false);
+ SelectFont(rFont.GetName(), false);
SelectStyle(GetFontStyles().GetStyleName(rFont), false);
// Since setting the Font via the Style name of the
SymbolFonts doesn't
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 53f33fd..41c6d6c 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.GetFamily(), aFont.GetName(),
aFont.GetStyleName(), aFont.GetPitch(),
aFont.GetCharSet(),
rFntDta.nFontInfoId ) );
}
diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx
index c1917da..9422282 100644
--- a/starmath/source/format.cxx
+++ b/starmath/source/format.cxx
@@ -89,7 +89,7 @@ OUString GetDefaultFontName( LanguageType nLang, sal_uInt16
nIdent )
return OutputDevice::GetDefaultFont(
pTable[ nIdent ], nLang,
- GetDefaultFontFlags::OnlyOne ).GetFamilyName();
+ GetDefaultFontFlags::OnlyOne ).GetName();
}
}
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index ebacd2c..7e43025 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -133,7 +133,7 @@ void SmRect::BuildRect(const OutputDevice &rDev, const
SmFormat *pFormat,
aSize = Size(rDev.GetTextWidth(rText), rDev.GetTextHeight());
const FontMetric aFM (rDev.GetFontMetric());
- bool bIsMath = aFM.GetFamilyName().equalsIgnoreAsciiCase(
FONTNAME_MATH );
+ bool bIsMath = aFM.GetName().equalsIgnoreAsciiCase(
FONTNAME_MATH );
bool bAllowSmaller = bIsMath && !SmIsMathAlpha(rText);
const long nFontHeight = rDev.GetFont().GetSize().Height();
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index d0c7d79..2c19f8a 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -454,7 +454,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry**
ppEntries, const Any*
if(sFontName.isEmpty())
throw IllegalArgumentException();
-
if(OUString(aFormat.GetFont((*ppEntries)->mnMemberId).GetFamilyName()) !=
sFontName)
+
if(OUString(aFormat.GetFont((*ppEntries)->mnMemberId).GetName()) != sFontName)
{
const SmFace rOld =
aFormat.GetFont((*ppEntries)->mnMemberId);
@@ -661,7 +661,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry**
ppEntries, const Any*
for (sal_uInt32 i = 0; i < nSize ; i++, pDescriptor++)
{
vcl::Font aFont;
- aFont.SetFamilyName ( pDescriptor->sFontName );
+ aFont.SetName ( pDescriptor->sFontName );
aFont.SetCharSet ( static_cast < rtl_TextEncoding >
(pDescriptor->nCharSet) );
aFont.SetFamily ( static_cast < FontFamily >
(pDescriptor->nFamily ) );
aFont.SetPitch ( static_cast < FontPitch >
(pDescriptor->nPitch ) );
@@ -727,7 +727,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry
**ppEntries, Any *pValu
case HANDLE_CUSTOM_FONT_NAME_FIXED :
{
const SmFace & rFace =
aFormat.GetFont((*ppEntries)->mnMemberId);
- *pValue <<= OUString(rFace.GetFamilyName());
+ *pValue <<= OUString(rFace.GetName());
}
break;
case HANDLE_CUSTOM_FONT_FIXED_POSTURE:
@@ -879,7 +879,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry
**ppEntries, Any *pValu
pDescriptor->nCharacter = static_cast < sal_Int32 >
((*aIter)->GetCharacter());
vcl::Font rFont = (*aIter)->GetFace();
- pDescriptor->sFontName = rFont.GetFamilyName();
+ pDescriptor->sFontName = rFont.GetName();
pDescriptor->nCharSet = sal::static_int_cast< sal_Int16
>(rFont.GetCharSet());
pDescriptor->nFamily = sal::static_int_cast< sal_Int16
>(rFont.GetFamily());
pDescriptor->nPitch = sal::static_int_cast< sal_Int16
>(rFont.GetPitch());
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index cfb4917..f66c385 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -73,7 +73,7 @@ vcl::Font SmFontPickList::Get(sal_uInt16 nPos) const
bool SmFontPickList::CompareItem(const vcl::Font & rFirstFont, const vcl::Font
& rSecondFont)
{
- return rFirstFont.GetFamilyName() == rSecondFont.GetFamilyName() &&
+ return rFirstFont.GetName() == rSecondFont.GetName() &&
rFirstFont.GetFamily() == rSecondFont.GetFamily() &&
rFirstFont.GetCharSet() == rSecondFont.GetCharSet() &&
rFirstFont.GetWeight() == rSecondFont.GetWeight() &&
@@ -82,7 +82,7 @@ bool SmFontPickList::CompareItem(const vcl::Font &
rFirstFont, const vcl::Font &
OUString SmFontPickList::GetStringItem(const vcl::Font &rFont)
{
- OUStringBuffer aString(rFont.GetFamilyName());
+ OUStringBuffer aString(rFont.GetName());
if (IsItalic( rFont ))
{
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 8bd7b59..5c41120 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1036,7 +1036,7 @@ void FontNameBox::Fill( const FontList* pList )
for ( sal_uInt16 i = 0; i < nFontCount; i++ )
{
const FontMetric& rFontMetric = pList->GetFontName( i );
- sal_uLong nIndex = InsertEntry( rFontMetric.GetFamilyName() );
+ sal_uLong nIndex = InsertEntry( rFontMetric.GetName() );
if ( nIndex != LISTBOX_ERROR )
{
if ( nIndex < mpFontList->size() ) {
@@ -1140,7 +1140,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt )
Rectangle aTextRect;
// Preview the font name
- OUString sFontName = rFontMetric.GetFamilyName();
+ OUString sFontName = rFontMetric.GetName();
//If it shouldn't or can't draw its own name because it doesn't have
the glyphs
if (!canRenderNameOfSelectedFont(*pRenderContext))
@@ -1171,7 +1171,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt )
if (!bSymbolFont)
{
- const bool bNameBeginsWithLatinText =
rFontMetric.GetFamilyName()[0] <= 'z';
+ const bool bNameBeginsWithLatinText = rFontMetric.GetName()[0] <=
'z';
if (bNameBeginsWithLatinText || !bUsingCorrectFont)
sSampleText =
makeShortRepresentativeTextForSelectedFont(*pRenderContext);
diff --git a/svtools/source/control/ctrltool.cxx
b/svtools/source/control/ctrltool.cxx
index ccbb3a1..fcaac73 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -259,7 +259,7 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, bool
bAll,
if ( !bAll && (aFontMetric.GetType() == TYPE_RASTER) )
continue;
- OUString aSearchName(aFontMetric.GetFamilyName());
+ OUString aSearchName(aFontMetric.GetName());
ImplFontListNameInfo* pData;
sal_uLong nIndex;
aSearchName = ImplMakeSearchString(aSearchName);
@@ -483,13 +483,13 @@ OUString FontList::GetStyleName(const FontMetric& rInfo)
const
OUString FontList::GetFontMapText( const FontMetric& rInfo ) const
{
- if ( rInfo.GetFamilyName().isEmpty() )
+ if ( rInfo.GetName().isEmpty() )
{
return OUString();
}
// Search Fontname
- ImplFontListNameInfo* pData = ImplFindByName( rInfo.GetFamilyName() );
+ ImplFontListNameInfo* pData = ImplFindByName( rInfo.GetName() );
if ( !pData )
{
if (maMapNotAvailable.isEmpty())
@@ -649,7 +649,7 @@ FontMetric FontList::Get(const OUString& rName, const
OUString& rStyleName) cons
aInfo = *pFontMetric;
// set Fontname to keep FontAlias
- aInfo.SetFamilyName( rName );
+ aInfo.SetName( rName );
aInfo.SetStyleName( rStyleName );
return aInfo;
@@ -686,7 +686,7 @@ FontMetric FontList::Get(const OUString& rName,
aInfo = *pFontMetric;
// set Fontname to keep FontAlias
- aInfo.SetFamilyName( rName );
+ aInfo.SetName( rName );
return aInfo;
}
@@ -734,12 +734,12 @@ const sal_IntPtr* FontList::GetSizeAry( const FontMetric&
rInfo ) const
}
// use standard sizes if no name
- if ( rInfo.GetFamilyName().isEmpty() )
+ if ( rInfo.GetName().isEmpty() )
return aStdSizeAry;
// first search fontname in order to use device from the matching font
OutputDevice* pDevice = mpDev;
- ImplFontListNameInfo* pData = ImplFindByName( rInfo.GetFamilyName() );
+ ImplFontListNameInfo* pData = ImplFindByName( rInfo.GetName() );
if ( pData )
pDevice = pData->mpFirst->GetDevice();
diff --git a/svtools/source/control/stdmenu.cxx
b/svtools/source/control/stdmenu.cxx
index 6e0e55e..55eb7ba 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.cxx
@@ -57,7 +57,7 @@ void FontNameMenu::Fill( const FontList* pList )
sal_uInt16 nFontCount = ::std::min( pList->GetFontNameCount(),
static_cast< sal_uInt16 >(100) );
for (sal_uInt16 i = 0; i < nFontCount; ++i)
{
- const OUString& rName = pList->GetFontName( i ).GetFamilyName();
+ const OUString& rName = pList->GetFontName( i ).GetName();
// sort with the I18nHelper
sal_uInt16 j = GetItemCount();
diff --git a/svtools/source/misc/sampletext.cxx
b/svtools/source/misc/sampletext.cxx
index ebe0e78..4ba252b 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -19,7 +19,7 @@
// that caused it to be added
static UScriptCode lcl_getHardCodedScriptNameForFont (const OutputDevice
&rDevice)
{
- const OUString &rName = rDevice.GetFont().GetFamilyName();
+ const OUString &rName = rDevice.GetFont().GetName();
if (rName == "GB18030 Bitmap")
{
@@ -105,49 +105,49 @@ static UScriptCode lcl_getHardCodedScriptNameForFont
(const OutputDevice &rDevic
bool isOpenSymbolFont(const vcl::Font &rFont)
{
- return rFont.GetFamilyName().equalsIgnoreAsciiCase("starsymbol") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("opensymbol");
+ return rFont.GetName().equalsIgnoreAsciiCase("starsymbol") ||
+ rFont.GetName().equalsIgnoreAsciiCase("opensymbol");
}
bool isSymbolFont(const vcl::Font &rFont)
{
return (rFont.GetCharSet() == RTL_TEXTENCODING_SYMBOL) ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("Apple Color Emoji") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("cmsy10") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("cmex10") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("esint10") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("feta26") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("jsMath-cmsy10") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("jsMath-cmex10") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("msam10") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("msbm10") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("wasy10") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("Denemo") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("GlyphBasic1") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("GlyphBasic2") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("GlyphBasic3") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("GlyphBasic4") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("Letters Laughing") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("MusiQwik") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("MusiSync") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("stmary10") ||
- rFont.GetFamilyName().equalsIgnoreAsciiCase("Symbol") ||
- rFont.GetFamilyName().startsWith("STIXIntegrals") ||
- rFont.GetFamilyName().startsWith("STIXNonUnicode") ||
- rFont.GetFamilyName().startsWith("STIXSize") ||
- rFont.GetFamilyName().startsWith("STIXVariants") ||
+ rFont.GetName().equalsIgnoreAsciiCase("Apple Color Emoji") ||
+ rFont.GetName().equalsIgnoreAsciiCase("cmsy10") ||
+ rFont.GetName().equalsIgnoreAsciiCase("cmex10") ||
+ rFont.GetName().equalsIgnoreAsciiCase("esint10") ||
+ rFont.GetName().equalsIgnoreAsciiCase("feta26") ||
+ rFont.GetName().equalsIgnoreAsciiCase("jsMath-cmsy10") ||
+ rFont.GetName().equalsIgnoreAsciiCase("jsMath-cmex10") ||
+ rFont.GetName().equalsIgnoreAsciiCase("msam10") ||
+ rFont.GetName().equalsIgnoreAsciiCase("msbm10") ||
+ rFont.GetName().equalsIgnoreAsciiCase("wasy10") ||
+ rFont.GetName().equalsIgnoreAsciiCase("Denemo") ||
+ rFont.GetName().equalsIgnoreAsciiCase("GlyphBasic1") ||
+ rFont.GetName().equalsIgnoreAsciiCase("GlyphBasic2") ||
+ rFont.GetName().equalsIgnoreAsciiCase("GlyphBasic3") ||
+ rFont.GetName().equalsIgnoreAsciiCase("GlyphBasic4") ||
+ rFont.GetName().equalsIgnoreAsciiCase("Letters Laughing") ||
+ rFont.GetName().equalsIgnoreAsciiCase("MusiQwik") ||
+ rFont.GetName().equalsIgnoreAsciiCase("MusiSync") ||
+ rFont.GetName().equalsIgnoreAsciiCase("stmary10") ||
+ rFont.GetName().equalsIgnoreAsciiCase("Symbol") ||
+ rFont.GetName().startsWith("STIXIntegrals") ||
+ rFont.GetName().startsWith("STIXNonUnicode") ||
+ rFont.GetName().startsWith("STIXSize") ||
+ rFont.GetName().startsWith("STIXVariants") ||
isOpenSymbolFont(rFont);
}
bool canRenderNameOfSelectedFont(OutputDevice &rDevice)
{
const vcl::Font &rFont = rDevice.GetFont();
- return !isSymbolFont(rFont) && ( -1 == rDevice.HasGlyphs(rFont,
rFont.GetFamilyName()) );
+ return !isSymbolFont(rFont) && ( -1 == rDevice.HasGlyphs(rFont,
rFont.GetName()) );
}
OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice
&rDevice)
{
- if (rDevice.GetFont().GetFamilyName() == "Symbol")
+ if (rDevice.GetFont().GetName() == "Symbol")
{
static const sal_Unicode aImplAppleSymbolText[] = {
0x03BC, 0x2202, 0x2211, 0x220F, 0x03C0, 0x222B, 0x03A9, 0x221A, 0};
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 55d95ee..5deea95 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -160,7 +160,7 @@ void CalculateHorizontalScalingFactor( const SdrObject*
pCustomShape,
const SvxFontItem& rFontItem = static_cast<const
SvxFontItem&>(pCustomShape->GetMergedItem( EE_CHAR_FONTINFO ));
aFont.SetHeight( pCustomShape->GetLogicRect().GetHeight() /
rFWData.nMaxParagraphsPerTextArea );
aFont.SetAlign( ALIGN_TOP );
- aFont.SetFamilyName( rFontItem.GetFamilyName() );
+ aFont.SetName( rFontItem.GetFamilyName() );
aFont.SetFamily( rFontItem.GetFamily() );
aFont.SetStyleName( rFontItem.GetStyleName() );
aFont.SetOrientation( 0 );
@@ -248,7 +248,7 @@ void GetTextAreaOutline( const FWData& rFWData, const
SdrObject* pCustomShape, F
aFont.SetHeight( rFWData.nSingleLineHeight );
aFont.SetAlign( ALIGN_TOP );
- aFont.SetFamilyName( rFontItem.GetFamilyName() );
+ aFont.SetName( rFontItem.GetFamilyName() );
aFont.SetFamily( rFontItem.GetFamily() );
aFont.SetStyleName( rFontItem.GetStyleName() );
aFont.SetOrientation( 0 );
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 682035c..1aa7a6d 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -673,7 +673,7 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext&
rRenderContext, const Rectangl
if ((pImpl->m_bCJKEnabled) || (pImpl->m_bCTLEnabled))
pImpl->maText = makeRepresentativeTextForFont(LATIN,
rFont);
else
- pImpl->maText = rFont.GetFamilyName();
+ pImpl->maText = rFont.GetName();
if (pImpl->m_bCJKEnabled)
{
@@ -878,7 +878,7 @@ static void SetPrevFont(const SfxItemSet& rSet, sal_uInt16
nSlot, SvxFont& rFont
{
const SvxFontItem& rFontItem = static_cast<const
SvxFontItem&>(rSet.Get(nWhich));
rFont.SetFamily(rFontItem.GetFamily());
- rFont.SetFamilyName(rFontItem.GetFamilyName());
+ rFont.SetName(rFontItem.GetFamilyName());
rFont.SetPitch(rFontItem.GetPitch());
rFont.SetCharSet(rFontItem.GetCharSet());
rFont.SetStyleName(rFontItem.GetStyleName());
@@ -1415,7 +1415,7 @@ void SvxFontPrevWindow::SetFont( const SfxItemSet& rSet,
sal_uInt16 nSlot, SvxFo
{
const SvxFontItem& rFontItem = static_cast<const SvxFontItem&>(
rSet.Get(nWhich) );
rFont.SetFamily( rFontItem.GetFamily() );
- rFont.SetFamilyName( rFontItem.GetFamilyName() );
+ rFont.SetName( rFontItem.GetFamilyName() );
rFont.SetPitch( rFontItem.GetPitch() );
rFont.SetCharSet( rFontItem.GetCharSet() );
rFont.SetStyleName( rFontItem.GetStyleName() );
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 676ed96..3cef94f 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -82,7 +82,7 @@ using ::com::sun::star::awt::XVclWindowPeer;
css::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont )
{
css::awt::FontDescriptor aFD;
- aFD.Name = rFont.GetFamilyName();
+ aFD.Name = rFont.GetName();
aFD.StyleName = rFont.GetStyleName();
aFD.Height = (sal_Int16)rFont.GetSize().Height();
aFD.Width = (sal_Int16)rFont.GetSize().Width();
@@ -105,7 +105,7 @@ css::awt::FontDescriptor ImplCreateFontDescriptor( const
vcl::Font& rFont )
vcl::Font ImplCreateFont( const css::awt::FontDescriptor& rDescr )
{
vcl::Font aFont;
- aFont.SetFamilyName( rDescr.Name );
+ aFont.SetName( rDescr.Name );
aFont.SetStyleName( rDescr.StyleName );
aFont.SetSize( ::Size( rDescr.Width, rDescr.Height ) );
aFont.SetFamily( (FontFamily)rDescr.Family );
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 2679bf4..591d8ad 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1533,8 +1533,10 @@ sal_uInt16
OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m
if( eNumType == SVX_NUM_CHAR_SPECIAL)
{
sal_Unicode cChar = aFmt.GetBulletChar();
+ //const vcl::Font* pFont = aFmt.GetBulletFont();
sal_Unicode ccChar = _pSet->sBulletChar[0];
- if ( !((cChar == ccChar) &&
+ // rtl::OUString sFont = _pSet->sBulletFont;
+ if ( !((cChar == ccChar) && //pFont &&
sFont.compareTo(pFont->GetName()) &&
_pSet->eLabelFollowedBy == aFmt.GetLabelFollowedBy() &&
_pSet->nTabValue == aFmt.GetListtabPos() &&
_pSet->eNumAlign == aFmt.GetNumAdjust() &&
@@ -1598,6 +1600,8 @@ void OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum,
sal_uInt16 nIndex, sal_uI
for (sal_uInt16 iLevel=0;iLevel < nCount;iLevel++)
{
SvxNumberFormat aFmt(aNum.GetLevel(iLevel));
+ //sal_Unicode cPrefix = rtl::OUString(aFmt.GetPrefix())[0];
+ //sal_Unicode cSuffix = rtl::OUString(aFmt.GetSuffix())[0];
sal_Int16 eNumType = aFmt.GetNumberingType();
NumSettings_Impl* _pSet = (*pItemArr->pNumSettingsArr)[iLevel].get();
@@ -1612,9 +1616,9 @@ void OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum,
sal_uInt16 nIndex, sal_uI
{
sal_Unicode cChar = aFmt.GetBulletChar();
OUString sChar(cChar);
- _pSet->sBulletChar = sChar;
+ _pSet->sBulletChar = sChar;//OUString(cChar);
if ( aFmt.GetBulletFont() )
- _pSet->sBulletFont =
rtl::OUString(aFmt.GetBulletFont()->GetFamilyName());
+ _pSet->sBulletFont =
rtl::OUString(aFmt.GetBulletFont()->GetName());
_pSet->nNumberType = eNumType;
pItemArr->bIsCustomized = true;
}else if ((eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) {
@@ -1632,7 +1636,7 @@ void OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum,
sal_uInt16 nIndex, sal_uI
_pSet->sSuffix = aFmt.GetSuffix();
_pSet->nNumberType = eNumType;
if ( aFmt.GetBulletFont() )
- _pSet->sBulletFont =
rtl::OUString(aFmt.GetBulletFont()->GetFamilyName());
+ _pSet->sBulletFont =
rtl::OUString(aFmt.GetBulletFont()->GetName());
pItemArr->bIsCustomized = true;
}
}
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
