[Libreoffice-commits] core.git: accessibility/source basctl/source canvas/source chart2/source cppcanvas/source cui/source dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source filter/source forms/source include/vcl sc/source sd/source starmath/source svtools/source svx/source sw/source test/source toolkit/source vcl/qa vcl/source vcl/win
Chris Sherlock
chris.sherlock79 at gmail.com
Sat Jan 16 08:11:58 PST 2016
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/main/ChartController_TextEdit.cxx | 2
chart2/source/tools/CharacterProperties.cxx | 6
cppcanvas/source/mtfrenderer/implrenderer.cxx | 2
cui/source/dialogs/cuicharmap.cxx | 12
cui/source/options/fontsubs.cxx | 2
cui/source/tabpages/chardlg.cxx | 4
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/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 | 6
editeng/source/items/numitem.cxx | 2
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/flash/swfwriter1.cxx | 2
filter/source/svg/svgfontexport.cxx | 4
filter/source/svg/svgwriter.cxx | 10
forms/source/richtext/richtextengine.cxx | 2
include/vcl/font.hxx | 2
include/vcl/metric.hxx | 2
sc/source/core/data/docpool.cxx | 2
sc/source/core/data/patattr.cxx | 2
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/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/dialog.cxx | 12
starmath/source/document.cxx | 2
starmath/source/format.cxx | 2
starmath/source/rect.cxx | 2
starmath/source/unomodel.cxx | 6
starmath/source/utility.cxx | 4
svtools/source/control/ctrlbox.cxx | 6
svtools/source/control/ctrltool.cxx | 10
svtools/source/control/stdmenu.cxx | 2
svtools/source/misc/sampletext.cxx | 58
svx/source/dialog/fntctrl.cxx | 2
svx/source/fmcomp/fmgridif.cxx | 2
svx/source/sidebar/nbdtmg.cxx | 16
svx/source/svdraw/svdfmtf.cxx | 6
svx/source/svdraw/svdmodel.cxx | 6
svx/source/tbxctrls/tbcontrl.cxx | 6
sw/source/core/doc/DocumentStylePoolManager.cxx | 8
sw/source/core/edit/autofmt.cxx | 2
sw/source/core/inc/swfont.hxx | 2
sw/source/core/text/txtfld.cxx | 2
sw/source/core/txtnode/fntcache.cxx | 4
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/ui/config/optpage.cxx | 6
sw/source/ui/dialog/ascfldlg.cxx | 4
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 | 8
sw/source/uibase/shells/drwtxtsh.cxx | 8
sw/source/uibase/shells/textsh.cxx | 8
test/source/mtfxmldump.cxx | 2
toolkit/source/helper/vclunohelper.cxx | 2
vcl/qa/cppunit/font.cxx | 4
vcl/source/components/fontident.cxx | 2
vcl/source/filter/wmf/emfwr.cxx | 2
vcl/source/filter/wmf/winwmf.cxx | 2
vcl/source/filter/wmf/wmfwr.cxx | 6
vcl/source/font/font.cxx | 6
vcl/source/font/fontcache.cxx | 2
vcl/source/gdi/cvtsvm.cxx | 2
vcl/source/gdi/metaact.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 4
vcl/source/outdev/font.cxx | 6
vcl/source/window/window.cxx | 2
vcl/source/window/window2.cxx | 2
vcl/win/window/salframe.cxx | 2
105 files changed, 774 insertions(+), 659 deletions(-)
New commits:
commit 2b297116cb6bb1061c43e5714e2609c8ee9f57d2
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sat Jan 16 21:01:00 2016 +1100
vcl: rename Font::GetName to Font::GetFamilyName
Change-Id: I83927e0992dfe0a2a79d139818a9f45d3761aae5
Reviewed-on: https://gerrit.libreoffice.org/21509
Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79 at gmail.com>
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index fbf2cd7..947396a 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.GetName() );
+ aAttribs[i].Value = css::uno::makeAny( aFont.GetFamilyName() );
aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE;
i++;
diff --git a/accessibility/source/helper/characterattributeshelper.cxx b/accessibility/source/helper/characterattributeshelper.cxx
index 3f82d70..1fb79e7 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.GetName() ) ) );
+ 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() ) ) );
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 2729774..bc6177c 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.GetName();
+ sFontName = aTmpFont.GetFamilyName();
}
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 735ebdf..1e076b3 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.GetName() << " - "
+ << aFont.GetFamilyName() << " - "
<< maText.Text.copy(maText.StartPosition, maText.Length));
cairo_show_glyphs(pSCairo.get(), &cairo_glyphs[0], cairo_glyphs.size());
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 9301e47..f190dfd 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.GetName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), SID_ATTR_CHAR_FONT ) );
+ aSet.Put( SvxFontItem( aCurFont.GetFamily(), 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 cdc4de6..cecaeb7 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.GetName() ) );
+ ::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_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.GetName() ) );
+ ::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_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.GetName() ) );
+ ::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_CHAR_SET, sal_Int16(aFontCTL.GetCharSet()) );
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 4a3dae4..69a5d66 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.GetName();
+ aFontRequest.FontDescription.FamilyName = rFont.GetFamilyName();
aFontRequest.FontDescription.StyleName = rFont.GetStyleName();
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index b17931c..85f3040 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -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.GetName(),
+ pSet->Put( SvxFontItem( rFont.GetFamily(), rFont.GetFamilyName(),
rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(), pPool->GetWhich(SID_ATTR_CHAR_FONT) ) );
- pSet->Put( SfxStringItem( pPool->GetWhich(SID_FONT_NAME), rFont.GetName() ) );
+ pSet->Put( SfxStringItem( pPool->GetWhich(SID_FONT_NAME), rFont.GetFamilyName() ) );
pSet->Put( SfxInt32Item( pPool->GetWhich(SID_ATTR_CHAR), GetChar() ) );
}
}
@@ -325,12 +325,12 @@ void SvxCharacterMap::init()
m_pShowText->Hide();
}
- OUString aDefStr( aFont.GetName() );
+ OUString aDefStr( aFont.GetFamilyName() );
OUString aLastName;
int nCount = GetDevFontCount();
for ( int i = 0; i < nCount; i++ )
{
- OUString aFontName( GetDevFont( i ).GetName() );
+ OUString aFontName( GetDevFont( i ).GetFamilyName() );
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.GetName() ) == LISTBOX_ENTRY_NOTFOUND )
+ if ( m_pFontLB->GetEntryPos( aTmp.GetFamilyName() ) == LISTBOX_ENTRY_NOTFOUND )
return;
- m_pFontLB->SelectEntry( aTmp.GetName() );
+ m_pFontLB->SelectEntry( aTmp.GetFamilyName() );
aFont = aTmp;
FontSelectHdl(*m_pFontLB);
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 362cdd1..3625d82 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.GetName());
+ m_pFontNameLB->InsertEntry(rFontMetric.GetFamilyName());
}
m_pFontNameLB->SelectEntry(sFontName);
}
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 2d6550e..c3a5794 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -530,7 +530,7 @@ namespace
_rFont.SetLanguage(_pLanguageLB->GetSelectLanguage());
_rFont.SetFamily( aFontMetrics.GetFamily() );
- _rFont.SetName( aFontMetrics.GetName() );
+ _rFont.SetName( aFontMetrics.GetFamilyName() );
_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.GetName(), aInfo.GetStyleName(),
+ SvxFontItem aFontItem( aInfo.GetFamily(), aInfo.GetFamilyName(), 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 74c0f70..325f930 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.GetName()))
+ rActBulletFont.GetFamilyName()))
{
//search for the font
if(!pList)
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 19574fa..db4db51 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.GetName();
+ sFontName = aTmpFont.GetFamilyName();
}
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 ffbb115..1c4b3c5 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().GetName();
+ OUString aName = Application::GetSettings().GetStyleSettings().GetAppFont().GetFamilyName();
aFonts = OUStringToOString(aName, eDestEnc);
}
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 4afe19c..f58d8a0 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.GetName().toUtf8().getStr(), aChildren);
+ aValues.add_child(rFontMetric.GetFamilyName().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.GetName();
+ OUString aFontName = rFontMetric.GetFamilyName();
if (!aSearchedFontName.equals(aFontName.toUtf8().getStr()))
continue;
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index ee7df1f..092e71c 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.GetName(),
+ rFont.GetFamilyName(),
rFont.GetStyleName(),
static_cast<sal_uInt16>(rFont.GetWeight()),
RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet(),
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index d6b3e66..ad52b0f 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.GetName(), OUString(), rFont.GetPitch(), rFont.GetCharSet(), EE_CHAR_FONTINFO ) );
+ rSet.Put( SvxFontItem( rFont.GetFamily(), 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 584634c..52a1d89 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.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO );
+ SvxFontItem aFontItem( aFont.GetFamily(), aFont.GetFamilyName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO );
aItems.Put( aFontItem );
- SvxFontItem aFontItemCJK( aFont.GetFamily(), aFont.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
+ SvxFontItem aFontItemCJK( aFont.GetFamily(), aFont.GetFamilyName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
aItems.Put( aFontItemCJK );
- SvxFontItem aFontItemCTL( aFont.GetFamily(), aFont.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
+ SvxFontItem aFontItemCTL( aFont.GetFamily(), 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 a918adf..bcf5da8 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.GetName(),
+ SvxFontItem aFontItem( aDefFont.GetFamily(), 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 beaf196..6e0d343 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->GetName());
+ aFontItem.SetFamilyName( pFont->GetFamilyName());
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 7807714..deb8acb 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->GetName());
+ aFontItem.SetFamilyName( pFont->GetFamilyName());
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 2791bf4..96264b6 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.GetName();
- rStream.WriteUniOrByteString(rFont.GetName(), rStream.GetStreamCharSet());
+ // UNICODE: rStream << rFont.GetFamilyName();
+ rStream.WriteUniOrByteString(rFont.GetFamilyName(), rStream.GetStreamCharSet());
rStream.WriteBool( rFont.IsOutline() );
rStream.WriteBool( rFont.IsShadow() );
@@ -231,7 +231,7 @@ void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom )
{
vcl::Font _aFont = GetFont();
vcl::Font aNewFont = rCopyFrom.GetFont();
- _aFont.SetName( aNewFont.GetName() );
+ _aFont.SetName( aNewFont.GetFamilyName() );
_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 4d59e45..9e3d150 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -677,7 +677,7 @@ void SvxNumRule::Store( SvStream &rStream )
{
if(!pConverter)
pConverter =
- CreateFontToSubsFontConverter(aFmts[i]->GetBulletFont()->GetName(),
+ CreateFontToSubsFontConverter(aFmts[i]->GetBulletFont()->GetFamilyName(),
FontToSubsFontFlags::EXPORT|FontToSubsFontFlags::ONLYOLDSOSYMBOLFONTS);
}
aFmts[i]->Store(rStream, pConverter);
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 2837368..411ecb7 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).GetName();
+ aFontNameSeq[i] = pFontList->GetFontName(i).GetFamilyName();
}
}
@@ -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.GetName() );
+ pItem->SetFamilyName( aFont.GetFamilyName() );
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 f63a44f..f6ca4f8 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -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.GetName());
+ pValues[nProp] <<= OUString(rSwFlags.aBulletFont.GetFamilyName());
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.GetName());
+ pValues[nProp] <<= OUString(rSwFlags.aByInputBulletFont.GetFamilyName());
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 68582a7..91d1741 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.GetName(), rSVFont.GetStyleName(),
+ rSVFont.GetFamilyName(), 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.GetName(),
+ rSVFont.GetFamily(), 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 368513d..897d2be 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -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.GetName();
+ rDesc.Name = rFont.GetFamilyName();
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 bef8087..5b82177 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.GetName(), aDefaultVCLFont.GetStyleName(), aDefaultVCLFont.GetPitch(), aDefaultVCLFont.GetCharSet(), CFID_FONT);
+ *pCounter++ = new SvxFontItem(aDefaultVCLFont.GetFamily(), 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.GetName(), aDefaultVCLFont.GetStyleName(), aDefaultVCLFont.GetPitch(), aDefaultVCLFont.GetCharSet(), CFID_CJK_FONT);
+ *pCounter++ = new SvxFontItem(aDefaultVCLFont.GetFamily(), 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/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 82480e2..260b29b 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.GetName() == rFont2.GetName() &&
+ return rFont1.GetFamilyName() == rFont2.GetFamilyName() &&
rFont1.GetWeight() == rFont2.GetWeight() &&
rFont1.GetItalic() == rFont2.GetItalic() &&
rFont1.IsOutline() == rFont2.IsOutline() &&
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index 2d62da7..823f0e9 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.GetName() );
+ OUString aFontName( rFont.GetFamilyName() );
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.GetName() ) );
+ mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-family", GetMappedFontName( rFont.GetFamilyName() ) );
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 );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 8613369..5b60271 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.GetName() ) );
+ mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontFamily, mrFontExport.GetMappedFontName( maCurFont.GetFamilyName() ) );
}
else
{
sal_Int32 nNextTokenPos( 0 );
- const OUString& rsFontName = maCurFont.GetName();
+ const OUString& rsFontName = maCurFont.GetFamilyName();
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.GetName();
+ const OUString& rsCurFontName = maCurrentFont.GetFamilyName();
long int nCurFontSize = maCurrentFont.GetHeight();
FontItalic eCurFontItalic = maCurrentFont.GetItalic();
FontWeight eCurFontWeight = maCurrentFont.GetWeight();
- const OUString& rsParFontName = maParentFont.GetName();
+ const OUString& rsParFontName = maParentFont.GetFamilyName();
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.GetName();
+ const OUString& rsFontName = maCurrentFont.GetFamilyName();
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 ede2b4d..8043d00 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -63,7 +63,7 @@ namespace frm
// defaults
vcl::Font aFont = Application::GetSettings().GetStyleSettings().GetAppFont();
aFont.SetName( "Times New Roman" );
- pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) );
+ pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), 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 c8a2c2d..e223ba3 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -67,7 +67,7 @@ public:
FontAlign GetAlign() const;
void SetName( const OUString& rFamilyName );
- const OUString& GetName() const;
+ const OUString& GetFamilyName() const;
void SetStyleName( const OUString& rStyleName );
const OUString& GetStyleName() const;
void SetSize( const Size& );
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index e37b91f..d3dfa9c 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -81,7 +81,7 @@ inline std::basic_ostream<charT, traits> & operator <<(
std::basic_ostream<charT, traits> & stream, const FontMetric& rMetric )
{
stream << "{"
- << "name=" << "\"" << rMetric.GetName() << "\""
+ << "name=" << "\"" << rMetric.GetFamilyName() << "\""
<< ",size=(" << rMetric.GetSize().Width() << "," << rMetric.GetSize().Height() << ")"
<< ",ascent=" << rMetric.GetAscent()
<< ",descent=" << rMetric.GetDescent()
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index e1eb495..05e7fa8 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.GetName(), aStdFont.GetStyleName(),
+ aStdFont.GetFamilyName(), 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 61ab5ca..21dc43f 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -368,7 +368,7 @@ void ScPatternAttr::GetFont(
// FontItem:
- if (rFont.GetName() != pFontAttr->GetFamilyName())
+ if (rFont.GetFamilyName() != 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 4504454..aec6dcb 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.GetName(), aDefFont.GetStyleName(),
+ SvxFontItem aNewItem( aDefFont.GetFamily(), 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 46db04a..aa10ec5 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.GetName(), aStdFont.GetStyleName(),
+ aStdFont.GetFamily(), 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.GetName(), aStdFont.GetStyleName(),
+ aStdFont.GetFamily(), 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.GetName(), aStdFont.GetStyleName(),
+ aStdFont.GetFamily(), 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/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 8299b9d..18edb90 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.GetName() );
+ aNewData.maName = XclTools::GetXclFontName( aFont.GetFamilyName() );
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 9005282..3b8b6de 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.GetName() ); // substitute with MS fonts
+ maName = XclTools::GetXclFontName( rFont.GetFamilyName() ); // 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 3ea7a9a..dc3fcec 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.GetName(), rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(), ATTR_FONT );
+ SvxFontItem aFontItem( rFont.GetFamily(), 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 ad25cd7..5efc9c7 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.GetName(),
+ aNewItem = SvxFontItem( aFont.GetFamily(), aFont.GetFamilyName(),
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/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index e4c790b..e389787 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.GetName(), aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), GetPool().GetWhich(SID_ATTR_CHAR_FONT) ) );
+ aSet.Put( SvxFontItem( aCurFont.GetFamily(), 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 109376b..01b54bd 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.GetName(),
+ aNewItem = SvxFontItem( aFont.GetFamily(), 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 e88e5da..267fa8b 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.GetName(),
+ rFont.GetFamilyName(),
rFont.GetStyleName(),
rFont.GetPitch(),
rFont.GetCharSet(),
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index fc50caf..7424e80 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.GetName(), aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
+ SvxFontItem aSvxFontItem( aLatinFont.GetFamily(), aLatinFont.GetFamilyName(), aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
aLatinFont.GetCharSet(), EE_CHAR_FONTINFO );
- SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(), aCJKFont.GetName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
+ SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(), aCJKFont.GetFamilyName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
aCJKFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
- SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(), aCTLFont.GetName(), aCTLFont.GetStyleName(), aCTLFont.GetPitch(),
+ SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(), 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.GetName(), aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
+ SvxFontItem aSvxFontItem( aLatinFont.GetFamily(), aLatinFont.GetFamilyName(), aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
aLatinFont.GetCharSet(), EE_CHAR_FONTINFO );
- SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(), aCJKFont.GetName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
+ SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(), aCJKFont.GetFamilyName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
aCJKFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
- SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(), aCTLFont.GetName(), aCTLFont.GetStyleName(), aCTLFont.GetPitch(),
+ SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(), 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 bc1f18b..0df8f1c 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.GetName(), aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
+ SvxFontItem aSvxFontItem( aLatinFont.GetFamily(), aLatinFont.GetFamilyName(), aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
aLatinFont.GetCharSet(), EE_CHAR_FONTINFO );
- SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(), aCJKFont.GetName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
+ SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(), aCJKFont.GetFamilyName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
aCJKFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
- SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(), aCTLFont.GetName(), aCTLFont.GetStyleName(), aCTLFont.GetPitch(),
+ SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(), 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 2d09b7a..b119242 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.GetName(),"",PITCH_DONTKNOW,RTL_TEXTENCODING_DONTKNOW,EE_CHAR_FONTINFO));
+ mpAnnotationPool->SetPoolDefaultItem(SvxFontItem(aAppFont.GetFamily(),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 445e4e8..d98fe2f 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.GetName(),
+ SvxFontItem aFontItem (aFont.GetFamily(), 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 fa55949..380d760 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->GetName());
+ aFontItem.SetFamilyName( pTargetFont->GetFamilyName());
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 502f52c..6f08a5d 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.GetName(),
+ aFont.GetFamilyName(),
aFont.GetStyleName(),
aFont.GetPitch(),
aFont.GetCharSet(),
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index d6c91b7..1e1f9f9 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.GetName();
+ aName = rFont.GetFamilyName();
nCharSet = (sal_Int16) rFont.GetCharSet();
nFamily = (sal_Int16) rFont.GetFamily();
nPitch = (sal_Int16) rFont.GetPitch();
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 852bc1b5..bf0a992 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().GetName());
+ OUString sText(rRenderContext.GetFont().GetFamilyName());
Size aTextSize(rRenderContext.GetTextWidth(sText), rRenderContext.GetTextHeight());
rRenderContext.DrawText(Point((rRenderContext.GetOutputSize().Width() - aTextSize.Width()) / 2,
@@ -336,7 +336,7 @@ void SmFontDialog::SetFont(const vcl::Font &rFont)
{
maFont = rFont;
- m_pFontBox->SetText(maFont.GetName());
+ m_pFontBox->SetText(maFont.GetFamilyName());
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).GetName() );
+ m_pFontBox->InsertEntry( aFontList.GetFontName(i).GetFamilyName() );
}
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).GetName() );
+ pFonts->InsertEntry( pFontList->GetFontName(i).GetFamilyName() );
}
}
@@ -2018,7 +2018,7 @@ void SmSymDefineDialog::UpdateButtons()
&& aTmpSymbolSetName.equalsIgnoreAsciiCase(pOldSymbolSetName->GetText())
&& aTmpSymbolName.equals(pOrigSymbol->GetName())
&& pFonts->GetSelectEntry().equalsIgnoreAsciiCase(
- pOrigSymbol->GetFace().GetName())
+ pOrigSymbol->GetFace().GetFamilyName())
&& 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.GetName(), false);
+ SelectFont(rFont.GetFamilyName(), 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 41c6d6c..53f33fd 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.GetName(),
+ SvxFontItem( aFont.GetFamily(), aFont.GetFamilyName(),
aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(),
rFntDta.nFontInfoId ) );
}
diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx
index 9422282..c1917da 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 ).GetName();
+ GetDefaultFontFlags::OnlyOne ).GetFamilyName();
}
}
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index 7e43025..ebacd2c 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.GetName().equalsIgnoreAsciiCase( FONTNAME_MATH );
+ bool bIsMath = aFM.GetFamilyName().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 2c19f8a..37592db 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).GetName()) != sFontName)
+ if(OUString(aFormat.GetFont((*ppEntries)->mnMemberId).GetFamilyName()) != sFontName)
{
const SmFace rOld = aFormat.GetFont((*ppEntries)->mnMemberId);
@@ -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.GetName());
+ *pValue <<= OUString(rFace.GetFamilyName());
}
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.GetName();
+ 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->nPitch = sal::static_int_cast< sal_Int16 >(rFont.GetPitch());
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index f66c385..cfb4917 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.GetName() == rSecondFont.GetName() &&
+ return rFirstFont.GetFamilyName() == rSecondFont.GetFamilyName() &&
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.GetName());
+ OUStringBuffer aString(rFont.GetFamilyName());
if (IsItalic( rFont ))
{
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 5c41120..8bd7b59 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.GetName() );
+ sal_uLong nIndex = InsertEntry( rFontMetric.GetFamilyName() );
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.GetName();
+ OUString sFontName = rFontMetric.GetFamilyName();
//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.GetName()[0] <= 'z';
+ const bool bNameBeginsWithLatinText = rFontMetric.GetFamilyName()[0] <= 'z';
if (bNameBeginsWithLatinText || !bUsingCorrectFont)
sSampleText = makeShortRepresentativeTextForSelectedFont(*pRenderContext);
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index fcaac73..1174cd8 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.GetName());
+ OUString aSearchName(aFontMetric.GetFamilyName());
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.GetName().isEmpty() )
+ if ( rInfo.GetFamilyName().isEmpty() )
{
return OUString();
}
// Search Fontname
- ImplFontListNameInfo* pData = ImplFindByName( rInfo.GetName() );
+ ImplFontListNameInfo* pData = ImplFindByName( rInfo.GetFamilyName() );
if ( !pData )
{
if (maMapNotAvailable.isEmpty())
@@ -734,12 +734,12 @@ const sal_IntPtr* FontList::GetSizeAry( const FontMetric& rInfo ) const
}
// use standard sizes if no name
- if ( rInfo.GetName().isEmpty() )
+ if ( rInfo.GetFamilyName().isEmpty() )
return aStdSizeAry;
// first search fontname in order to use device from the matching font
OutputDevice* pDevice = mpDev;
- ImplFontListNameInfo* pData = ImplFindByName( rInfo.GetName() );
+ ImplFontListNameInfo* pData = ImplFindByName( rInfo.GetFamilyName() );
if ( pData )
pDevice = pData->mpFirst->GetDevice();
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index 55eb7ba..6e0e55e 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 ).GetName();
+ const OUString& rName = pList->GetFontName( i ).GetFamilyName();
// sort with the I18nHelper
sal_uInt16 j = GetItemCount();
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index 4ba252b..ebe0e78 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().GetName();
+ const OUString &rName = rDevice.GetFont().GetFamilyName();
if (rName == "GB18030 Bitmap")
{
@@ -105,49 +105,49 @@ static UScriptCode lcl_getHardCodedScriptNameForFont (const OutputDevice &rDevic
bool isOpenSymbolFont(const vcl::Font &rFont)
{
- return rFont.GetName().equalsIgnoreAsciiCase("starsymbol") ||
- rFont.GetName().equalsIgnoreAsciiCase("opensymbol");
+ return rFont.GetFamilyName().equalsIgnoreAsciiCase("starsymbol") ||
+ rFont.GetFamilyName().equalsIgnoreAsciiCase("opensymbol");
}
bool isSymbolFont(const vcl::Font &rFont)
{
return (rFont.GetCharSet() == RTL_TEXTENCODING_SYMBOL) ||
- 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") ||
+ 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") ||
isOpenSymbolFont(rFont);
}
bool canRenderNameOfSelectedFont(OutputDevice &rDevice)
{
const vcl::Font &rFont = rDevice.GetFont();
- return !isSymbolFont(rFont) && ( -1 == rDevice.HasGlyphs(rFont, rFont.GetName()) );
+ return !isSymbolFont(rFont) && ( -1 == rDevice.HasGlyphs(rFont, rFont.GetFamilyName()) );
}
OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice)
{
- if (rDevice.GetFont().GetName() == "Symbol")
+ if (rDevice.GetFont().GetFamilyName() == "Symbol")
{
static const sal_Unicode aImplAppleSymbolText[] = {
0x03BC, 0x2202, 0x2211, 0x220F, 0x03C0, 0x222B, 0x03A9, 0x221A, 0};
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 1aa7a6d..0b7e40d 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.GetName();
+ pImpl->maText = rFont.GetFamilyName();
if (pImpl->m_bCJKEnabled)
{
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 3cef94f..71f8235 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.GetName();
+ aFD.Name = rFont.GetFamilyName();
aFD.StyleName = rFont.GetStyleName();
aFD.Height = (sal_Int16)rFont.GetSize().Height();
aFD.Width = (sal_Int16)rFont.GetSize().Width();
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 591d8ad..2679bf4 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1533,10 +1533,8 @@ 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];
- // rtl::OUString sFont = _pSet->sBulletFont;
- if ( !((cChar == ccChar) && //pFont && sFont.compareTo(pFont->GetName()) &&
+ if ( !((cChar == ccChar) &&
_pSet->eLabelFollowedBy == aFmt.GetLabelFollowedBy() &&
_pSet->nTabValue == aFmt.GetListtabPos() &&
_pSet->eNumAlign == aFmt.GetNumAdjust() &&
@@ -1600,8 +1598,6 @@ 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();
@@ -1616,9 +1612,9 @@ void OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
{
sal_Unicode cChar = aFmt.GetBulletChar();
OUString sChar(cChar);
- _pSet->sBulletChar = sChar;//OUString(cChar);
+ _pSet->sBulletChar = sChar;
if ( aFmt.GetBulletFont() )
- _pSet->sBulletFont = rtl::OUString(aFmt.GetBulletFont()->GetName());
+ _pSet->sBulletFont = rtl::OUString(aFmt.GetBulletFont()->GetFamilyName());
_pSet->nNumberType = eNumType;
pItemArr->bIsCustomized = true;
}else if ((eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) {
@@ -1636,7 +1632,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()->GetName());
+ _pSet->sBulletFont = rtl::OUString(aFmt.GetBulletFont()->GetFamilyName());
pItemArr->bIsCustomized = true;
}
}
@@ -1667,7 +1663,6 @@ void OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
OutlineSettings_Impl* pItemArr = pOutlineSettingsArrs[nIndex];
if (isDefault) pItemArr=pDefaultOutlineSettingsArrs[nIndex];
- //Font& rActBulletFont = lcl_GetDefaultBulletFont();
NumSettingsArr_Impl *pNumSettingsArr=pItemArr->pNumSettingsArr;
NumSettings_Impl* pLevelSettings = nullptr;
@@ -1681,7 +1676,6 @@ void OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
break;
SvxNumberFormat aFmt(aNum.GetLevel(i));
- //aFmt.SetBulletFont(&pLevelSettings->aFont);
vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
if (pLevelSettings->nNumberType !=aFmt.GetNumberingType()) isResetSize=true;
aFmt.SetNumberingType( pLevelSettings->nNumberType );
@@ -1689,7 +1683,7 @@ void OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
if(aFmt.GetNumberingType() == SVX_NUM_CHAR_SPECIAL)
{
if( pLevelSettings->sBulletFont.getLength() &&
- pLevelSettings->sBulletFont.compareTo(rActBulletFont.GetName()))
+ pLevelSettings->sBulletFont.compareTo(rActBulletFont.GetFamilyName()))
{
//search for the font
if(!pList)
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 04d97c7..5710493 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.GetName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO ) );
- mpTextAttr->Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO_CJK ) );
- mpTextAttr->Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetName(), aFnt.GetStyleName(), aFnt.GetPitch(), aFnt.GetCharSet(), EE_CHAR_FONTINFO_CTL ) );
+ 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(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 855fd69..a761f74 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -727,7 +727,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.SetFamilyName(aFont.GetName());
+ aSvxFontItem.SetFamilyName(aFont.GetFamilyName());
aSvxFontItem.SetStyleName(OUString());
aSvxFontItem.SetPitch( aFont.GetPitch());
aSvxFontItem.SetCharSet( aFont.GetCharSet() );
@@ -736,7 +736,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.SetFamilyName(aFontCJK.GetName());
+ aSvxFontItemCJK.SetFamilyName(aFontCJK.GetFamilyName());
aSvxFontItemCJK.SetStyleName(OUString());
aSvxFontItemCJK.SetPitch( aFontCJK.GetPitch());
aSvxFontItemCJK.SetCharSet( aFontCJK.GetCharSet());
@@ -745,7 +745,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.SetFamilyName(aFontCTL.GetName());
+ aSvxFontItemCTL.SetFamilyName(aFontCTL.GetFamilyName());
aSvxFontItemCTL.SetStyleName(OUString());
aSvxFontItemCTL.SetPitch( aFontCTL.GetPitch() );
aSvxFontItemCTL.SetCharSet( aFontCTL.GetCharSet());
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 67e2ab6..fe83c23 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1006,7 +1006,7 @@ void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem )
aCurFont.SetPitch ( pFontItem->GetPitch() );
aCurFont.SetCharSet ( pFontItem->GetCharSet() );
}
- OUString aCurName = aCurFont.GetName();
+ OUString aCurName = aCurFont.GetFamilyName();
if ( GetText() != aCurName )
SetText( aCurName );
}
@@ -1145,7 +1145,7 @@ void SvxFontNameBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
aCurFont.GetItalic() ) );
SvxFontItem aFontItem( aFontMetric.GetFamily(),
- aFontMetric.GetName(),
+ aFontMetric.GetFamilyName(),
aFontMetric.GetStyleName(),
aFontMetric.GetPitch(),
aFontMetric.GetCharSet(),
@@ -1172,7 +1172,7 @@ void SvxFontNameBox_Impl::Select()
aCurFont = aFontMetric;
pFontItem.reset( new SvxFontItem( aFontMetric.GetFamily(),
- aFontMetric.GetName(),
+ aFontMetric.GetFamilyName(),
aFontMetric.GetStyleName(),
aFontMetric.GetPitch(),
aFontMetric.GetCharSet(),
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index f9137bc..57cc458 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.GetName(),
+ rSet.Put( SvxFontItem( aFnt.GetFamily(), 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.GetName(),
+ rSet.Put( SvxFontItem( aFnt.GetFamily(), 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.GetName(),
+ aSet.Put( SvxFontItem( aFnt.GetFamily(), aFnt.GetFamilyName(),
OUString(), aFnt.GetPitch(),
aFnt.GetCharSet(), aFontWhich[i] ));
}
@@ -1202,7 +1202,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
{
const vcl::Font& rBulletFont = numfunc::GetDefBulletFont();
SetAllScriptItem( aSet, SvxFontItem( rBulletFont.GetFamily(),
- rBulletFont.GetName(), rBulletFont.GetStyleName(),
+ rBulletFont.GetFamilyName(), rBulletFont.GetStyleName(),
rBulletFont.GetPitch(), rBulletFont.GetCharSet(), RES_CHRATR_FONT ));
}
break;
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 2c1c57d..bd5e6a5 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1620,7 +1620,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
m_aDelPam.GetMark()->nContent = 1;
SetAllScriptItem( aSet,
SvxFontItem( m_aFlags.aBulletFont.GetFamily(),
- m_aFlags.aBulletFont.GetName(),
+ m_aFlags.aBulletFont.GetFamilyName(),
m_aFlags.aBulletFont.GetStyleName(),
m_aFlags.aBulletFont.GetPitch(),
m_aFlags.aBulletFont.GetCharSet(),
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 60c2eed..3f52b09 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -287,7 +287,7 @@ public:
sal_uInt16 GetOrientation( const bool bVertLayout = false ) const;
inline const OUString& GetName( const sal_uInt8 nWhich ) const
- { return m_aSub[nWhich].GetName(); }
+ { return m_aSub[nWhich].GetFamilyName(); }
inline LanguageType GetLanguage( const sal_uInt8 nWhich ) const
{ return m_aSub[nWhich].GetLanguage(); }
inline rtl_TextEncoding GetCharSet( const sal_uInt8 nWhich ) const
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index c470a06..dc01d79 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -537,7 +537,7 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( SwTextFormatInfo &rInf ) con
{
const sal_uInt8 nAct = pNumFnt->GetActual();
pNumFnt->SetFamily( pFormatFnt->GetFamily(), nAct );
- pNumFnt->SetName( pFormatFnt->GetName(), nAct );
+ pNumFnt->SetName( pFormatFnt->GetFamilyName(), nAct );
pNumFnt->SetStyleName( pFormatFnt->GetStyleName(), nAct );
pNumFnt->SetCharSet( pFormatFnt->GetCharSet(), nAct );
pNumFnt->SetPitch( pFormatFnt->GetPitch(), nAct );
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index abd97f7..3bc1da5 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -361,7 +361,7 @@ sal_uInt16 SwFntObj::GetFontLeading( const SwViewShell *pSh, const OutputDevice&
bSymbol = RTL_TEXTENCODING_SYMBOL == aMet.GetCharSet();
GuessLeading( *pSh, aMet );
nExtLeading = static_cast<sal_uInt16>(aMet.GetExternalLeading());
- /* HACK: There is something wrong with Writer's bullet rendering, causing lines
+ /* HACK: FIXME There is something wrong with Writer's bullet rendering, causing lines
with bullets to be higher than they should be. I think this is because
Writer uses font's external leading incorrect, as the vertical distance
added to every line instead of only a distance between multiple lines,
@@ -376,7 +376,7 @@ sal_uInt16 SwFntObj::GetFontLeading( const SwViewShell *pSh, const OutputDevice&
Interestingly enough, bSymbol is false for 'StarSymbol; Arial Unicode MS', so
also check explicitly.
*/
- if( bSymbol || IsStarSymbol( pPrtFont->GetName()))
+ if( bSymbol || IsStarSymbol( pPrtFont->GetFamilyName()))
nExtLeading = 0;
}
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index ecb3bfb..7ae1320 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1084,7 +1084,7 @@ void SwTextNode::SetLanguageAndFont( const SwPaM &rPaM,
if (pFont)
{
SvxFontItem aFontItem = static_cast<const SvxFontItem&>( aSet.Get( nFontWhichId ) );
- aFontItem.SetFamilyName( pFont->GetName());
+ aFontItem.SetFamilyName( pFont->GetFamilyName());
aFontItem.SetFamily( pFont->GetFamily());
aFontItem.SetStyleName( pFont->GetStyleName());
aFontItem.SetPitch( pFont->GetPitch());
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 41904ce..0bd2445 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -816,7 +816,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
if(
!pBulletFontNames[i].isEmpty() &&
!SwXNumberingRules::isInvalidStyle(pBulletFontNames[i]) &&
- (!aFormat.GetBulletFont() || aFormat.GetBulletFont()->GetName() != pBulletFontNames[i])
+ (!aFormat.GetBulletFont() || aFormat.GetBulletFont()->GetFamilyName() != pBulletFontNames[i])
)
{
const SvxFontListItem* pFontListItem =
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index f18f9ef..118d4d5 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -89,7 +89,6 @@
#include <cassert>
#include <memory>
#include <set>
-#include <limits>
namespace
{
@@ -244,8 +243,6 @@ namespace sw
};
}
-
-class SwStyleBase_Impl;
class SwXStyle : public cppu::WeakImplHelper
<
css::style::XStyle,
@@ -272,8 +269,6 @@ protected:
css::uno::Reference<css::container::XNameAccess> m_xStyleFamily;
css::uno::Reference<css::beans::XPropertySet> m_xStyleData;
- template<sal_uInt16>
- void SetPropertyValue(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any&, SwStyleBase_Impl&);
void SAL_CALL SetPropertyValues_Impl( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues )
throw (css::beans::UnknownPropertyException,
css::beans::PropertyVetoException,
@@ -364,8 +359,6 @@ public:
void Invalidate();
void ApplyDescriptorProperties();
void SetStyleName(const OUString& rSet){ m_sStyleName = rSet;}
- void SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase) throw(beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception);
- void PutItemToSet(const SvxSetItem* pSetItem, const SfxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry& rEntry, const uno::Any& rVal, SwStyleBase_Impl& rBaseImpl);
};
class SwXFrameStyle
@@ -1099,7 +1092,7 @@ static uno::Reference<beans::XPropertySet> lcl_InitStandardStyle(const SfxStyleF
if(eFamily != SFX_STYLE_FAMILY_PARA && eFamily != SFX_STYLE_FAMILY_PAGE)
return {};
auto aResult(rxStyleFamily->getByName("Standard"));
- if(!aResult.has<return_t>())
+ if(!aResult.isExtractableTo(cppu::UnoType<return_t>::get()))
return {};
return aResult.get<return_t>();
}
@@ -1115,7 +1108,7 @@ static uno::Reference<container::XNameAccess> lcl_InitStyleFamily(SwDoc* pDoc, c
uno::Reference<style::XStyleFamiliesSupplier> xFamilySupplier(xModel, uno::UNO_QUERY);
auto xFamilies = xFamilySupplier->getStyleFamilies();
auto aResult(xFamilies->getByName(rEntry.m_sName));
- if(!aResult.has<return_t>())
+ if(!aResult.isExtractableTo(cppu::UnoType<return_t>::get()))
return {};
return aResult.get<return_t>();
}
@@ -1406,453 +1399,580 @@ const SwPageDesc* SwStyleBase_Impl::GetOldPageDesc()
return m_pOldPageDesc;
}
-static void lcl_SetDefaultWay(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
-{
- // default ItemSet handling
- SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet();
- SfxItemSet aSet(*rStyleSet.GetPool(), rEntry.nWID, rEntry.nWID);
- aSet.SetParent(&rStyleSet);
- rPropSet.setPropertyValue(rEntry, rValue, aSet);
- rStyleSet.Put(aSet);
-}
-sal_uInt8 lcl_TranslateMetric(const SfxItemPropertySimpleEntry& rEntry, SwDoc* pDoc, uno::Any& o_aValue)
-{
- // check for needed metric translation
- if(!(rEntry.nMemberId & SFX_METRIC_ITEM))
- return rEntry.nMemberId;
- // exception: If these ItemTypes are used, do not convert when these are negative
- // since this means they are intended as percent values
- if((XATTR_FILLBMP_SIZEX == rEntry.nWID || XATTR_FILLBMP_SIZEY == rEntry.nWID)
- && o_aValue.has<sal_Int32>()
- && o_aValue.get<sal_Int32>() < 0)
- return rEntry.nMemberId;
- if(!pDoc)
- return rEntry.nMemberId & (~SFX_METRIC_ITEM);
+static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
+ const SfxItemPropertySet& rPropSet,
+ const uno::Any& rValue,
+ SwStyleBase_Impl& rBase,
+ SfxStyleSheetBasePool* pBasePool,
+ SwDoc* pDoc,
+ SfxStyleFamily eFamily)
+ throw(beans::PropertyVetoException, lang::IllegalArgumentException,
+ lang::WrappedTargetException, uno::RuntimeException,
+ std::exception)
- const SfxItemPool& rPool = pDoc->GetAttrPool();
- const SfxMapUnit eMapUnit(rPool.GetMetric(rEntry.nWID));
- if(eMapUnit != SFX_MAPUNIT_100TH_MM)
- SvxUnoConvertFromMM(eMapUnit, o_aValue);
- return rEntry.nMemberId & (~SFX_METRIC_ITEM);
-}
-template<>
-void SwXStyle::SetPropertyValue<FN_UNO_HIDDEN>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
-{
- bool bHidden = false;
- if(rValue >>= bHidden)
- {
- //make it a 'real' style - necessary for pooled styles
- o_rStyleBase.getNewBase()->GetItemSet();
- o_rStyleBase.getNewBase()->SetHidden(bHidden);
- }
- lcl_SetDefaultWay(rEntry, rPropSet, rValue, o_rStyleBase);
-}
-template<>
-void SwXStyle::SetPropertyValue<FN_UNO_STYLE_INTEROP_GRAB_BAG>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
-{
- o_rStyleBase.getNewBase()->GetItemSet();
- o_rStyleBase.getNewBase()->SetGrabBagItem(rValue);
- lcl_SetDefaultWay(rEntry, rPropSet, rValue, o_rStyleBase);
-}
-template<>
-void SwXStyle::SetPropertyValue<XATTR_FILLGRADIENT>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
{
+ //UUUU adapted switch logic to a more readable state; removed goto's and made
+ // execution of standard setting of proerty in ItemSet dependent of this variable
+ bool bDone(false);
+
+ //UUUU
+ const sal_uInt8 nMemberId(rEntry.nMemberId & (~SFX_METRIC_ITEM));
uno::Any aValue(rValue);
- const auto nMemberId(lcl_TranslateMetric(rEntry, m_pDoc, aValue));
- if(MID_NAME == nMemberId)
+
+ //UUUU check for needed metric translation
+ if(rEntry.nMemberId & SFX_METRIC_ITEM)
{
- // add set commands for FillName items
- SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet();
- if(!aValue.has<OUString>())
- throw lang::IllegalArgumentException();
- SvxShape::SetFillAttribute(rEntry.nWID, aValue.get<OUString>(), rStyleSet);
+ bool bDoIt(true);
+
+ if(XATTR_FILLBMP_SIZEX == rEntry.nWID || XATTR_FILLBMP_SIZEY == rEntry.nWID)
+ {
+ // exception: If these ItemTypes are used, do not convert when these are negative
+ // since this means they are intended as percent values
+ sal_Int32 nValue = 0;
+
+ if(aValue >>= nValue)
+ {
+ bDoIt = nValue > 0;
+ }
+ }
+
+ if(bDoIt && pDoc)
+ {
+ const SfxItemPool& rPool = pDoc->GetAttrPool();
+ const SfxMapUnit eMapUnit(rPool.GetMetric(rEntry.nWID));
+
+ if(eMapUnit != SFX_MAPUNIT_100TH_MM)
+ {
+ SvxUnoConvertFromMM(eMapUnit, aValue);
+ }
+ }
}
- else if(MID_GRAFURL == nMemberId)
+
+ switch(rEntry.nWID)
{
- if(XATTR_FILLBITMAP == rEntry.nWID)
+ case FN_UNO_HIDDEN:
{
- // Bitmap also has the MID_GRAFURL mode where a Bitmap URL is used
- const Graphic aNullGraphic;
- SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet();
- XFillBitmapItem aXFillBitmapItem(rStyleSet.GetPool(), aNullGraphic);
- aXFillBitmapItem.PutValue(aValue, nMemberId);
- rStyleSet.Put(aXFillBitmapItem);
+ bool bHidden = false;
+ if ( rValue >>= bHidden )
+ {
+ //make it a 'real' style - necessary for pooled styles
+ rBase.getNewBase()->GetItemSet();
+ rBase.getNewBase()->SetHidden( bHidden );
+ }
}
- }
- else
- lcl_SetDefaultWay(rEntry, rPropSet, aValue, o_rStyleBase);
-}
-template<>
-void SwXStyle::SetPropertyValue<RES_BACKGROUND>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
-{
- SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet();
- const SvxBrushItem aOriginalBrushItem(getSvxBrushItemFromSourceSet(rStyleSet, RES_BACKGROUND, true, m_pDoc->IsInXMLImport()));
- SvxBrushItem aChangedBrushItem(aOriginalBrushItem);
+ break;
- uno::Any aValue(rValue);
- const auto nMemberId(lcl_TranslateMetric(rEntry, m_pDoc, aValue));
- aChangedBrushItem.PutValue(aValue, nMemberId);
+ case FN_UNO_STYLE_INTEROP_GRAB_BAG:
+ {
+ rBase.getNewBase()->GetItemSet();
+ rBase.getNewBase()->SetGrabBagItem(rValue);
+ }
+ break;
- // 0xff is already the default - but if BackTransparent is set
- // to true, it must be applied in the item set on ODF import
- // to potentially override parent style, which is unknown yet
- if(aChangedBrushItem == aOriginalBrushItem && (MID_GRAPHIC_TRANSPARENT != nMemberId || !aValue.has<bool>() || !aValue.get<bool>()))
- return;
+ case XATTR_FILLGRADIENT:
+ case XATTR_FILLHATCH:
+ case XATTR_FILLBITMAP:
+ case XATTR_FILLFLOATTRANSPARENCE:
+ // not yet needed; activate when LineStyle support may be added
+ // case XATTR_LINESTART:
+ // case XATTR_LINEEND:
+ // case XATTR_LINEDASH:
+ {
+ if(MID_NAME == nMemberId)
+ {
+ //UUUU add set commands for FillName items
+ OUString aTempName;
+ SfxItemSet& rStyleSet = rBase.GetItemSet();
- setSvxBrushItemAsFillAttributesToTargetSet(aChangedBrushItem, rStyleSet);
-}
-template<>
-void SwXStyle::SetPropertyValue<OWN_ATTR_FILLBMP_MODE>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
-{
- drawing::BitmapMode eMode;
- if(!(rValue >>= eMode))
- {
- if(!rValue.has<sal_Int32>())
- throw lang::IllegalArgumentException();
- eMode = ((drawing::BitmapMode)rValue.get<sal_Int32>());
- }
- SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet();
- rStyleSet.Put(XFillBmpStretchItem(drawing::BitmapMode_STRETCH == eMode));
- rStyleSet.Put(XFillBmpTileItem(drawing::BitmapMode_REPEAT == eMode));
-}
-template<>
-void SwXStyle::SetPropertyValue<RES_PAPER_BIN>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
-{
- if(!rValue.has<OUString>())
- throw lang::IllegalArgumentException();
- SfxPrinter* pPrinter = m_pDoc->getIDocumentDeviceAccess().getPrinter(true);
- OUString sValue(rValue.get<OUString>());
- using printeridx_t = decltype(pPrinter->GetPaperBinCount());
- printeridx_t nBin = std::numeric_limits<printeridx_t>::max();
- if(sValue == "[From printer settings]")
- nBin = std::numeric_limits<printeridx_t>::max()-1;
- else if(pPrinter)
- {
- for(sal_uInt16 i=0, nEnd = pPrinter->GetPaperBinCount(); i < nEnd; ++i)
+ if(!(aValue >>= aTempName))
+ {
+ throw lang::IllegalArgumentException();
+ }
+
+ SvxShape::SetFillAttribute(rEntry.nWID, aTempName, rStyleSet);
+ bDone = true;
+ }
+ else if(MID_GRAFURL == nMemberId)
+ {
+ if(XATTR_FILLBITMAP == rEntry.nWID)
+ {
+ //UUUU Bitmap also has the MID_GRAFURL mode where a Bitmap URL is used
+ const Graphic aNullGraphic;
+ SfxItemSet& rStyleSet = rBase.GetItemSet();
+ XFillBitmapItem aXFillBitmapItem(rStyleSet.GetPool(), aNullGraphic);
+
+ aXFillBitmapItem.PutValue(aValue, nMemberId);
+ rStyleSet.Put(aXFillBitmapItem);
+ bDone = true;
+ }
+ }
+
+ break;
+ }
+ case RES_BACKGROUND:
{
- if (sValue == pPrinter->GetPaperBinName(i))
+ //UUUU
+ SfxItemSet& rStyleSet = rBase.GetItemSet();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list