diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-11-29 08:34:29 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-11-29 13:38:48 +0000 |
| commit | 74314b11a4b5a2887bd1ff19bdcfb3572b09240c (patch) | |
| tree | 1683bdd2da904ca935d1bc1077f127a2715399ff /svtools | |
| parent | 63ca9554f24194521cfbc7fa90bfef37ea7759c1 (diff) | |
Drop a bunch of font metrics flags
These flags mean nothing these days, there are either always true or
always false, since we no longer support bitmap or Type 1 fonts.
Change-Id: Ie14ca480225a6346d868a44e58e7666c3a06931d
Reviewed-on: https://gerrit.libreoffice.org/31346
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/ctrltool.cxx | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 974af100fa7c..fdbd04baa294 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -237,8 +237,7 @@ ImplFontListNameInfo* FontList::ImplFindByName(const OUString& rStr) const return ImplFind( aSearchName, nullptr ); } -void FontList::ImplInsertFonts( OutputDevice* pDevice, bool bAll, - bool bInsertData ) +void FontList::ImplInsertFonts(OutputDevice* pDevice, bool bInsertData) { rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding(); @@ -253,11 +252,6 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, bool bAll, for (int i = 0; i < n; ++i) { FontMetric aFontMetric = pDevice->GetDevFont( i ); - - // ignore raster-fonts if they are not to be displayed - if ( !bAll && (aFontMetric.GetType() == TYPE_RASTER) ) - continue; - OUString aSearchName(aFontMetric.GetFamilyName()); ImplFontListNameInfo* pData; sal_uLong nIndex; @@ -331,7 +325,7 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, bool bAll, } } -FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2, bool bAll ) +FontList::FontList(OutputDevice* pDevice, OutputDevice* pDevice2) { // initialise variables mpDev = pDevice; @@ -348,7 +342,7 @@ FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2, bool bAll ) maBlack = SVT_RESSTR(STR_SVT_STYLE_BLACK); maBlackItalic = SVT_RESSTR(STR_SVT_STYLE_BLACK_ITALIC); - ImplInsertFonts( pDevice, bAll, true ); + ImplInsertFonts(pDevice, true); // if required compare to the screen fonts // in order to map the duplicates to Equal @@ -361,7 +355,7 @@ FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2, bool bAll ) if ( pDevice2 && (pDevice2->GetOutDevType() != pDevice->GetOutDevType()) ) - ImplInsertFonts( pDevice2, bAll, !bCompareWindow ); + ImplInsertFonts(pDevice2, !bCompareWindow); } FontList::~FontList() @@ -385,8 +379,7 @@ FontList::~FontList() FontList* FontList::Clone() const { - FontList* pReturn = new FontList( - mpDev, mpDev2, sal::static_int_cast<int>(GetFontNameCount()) == mpDev->GetDevFontCount()); + FontList* pReturn = new FontList(mpDev, mpDev2); return pReturn; } @@ -531,14 +524,6 @@ OUString FontList::GetFontMapText( const FontMetric& rInfo ) const const_cast<FontList*>(this)->maMapPrinterOnly = SVT_RESSTR(STR_SVT_FONTMAP_PRINTERONLY); return maMapPrinterOnly; } - // Only Screen-Font? - else if ( nType == FontListFontNameType::SCREEN - && rInfo.GetType() == TYPE_RASTER ) - { - if (maMapScreenOnly.isEmpty()) - const_cast<FontList*>(this)->maMapScreenOnly = SVT_RESSTR(STR_SVT_FONTMAP_SCREENONLY); - return maMapScreenOnly; - } else { if (maMapBoth.isEmpty()) |