diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-04 01:16:47 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-03 16:19:03 +0000 |
| commit | 8227b9955e4a06758f3e0a871e49731a0a607608 (patch) | |
| tree | 05c35dccc631812ab269b347d1c270ad53c0bcad /desktop | |
| parent | 542b6253abc43bcc47b986841bfdafc737710c7c (diff) | |
vcl: Excise vcl::FontInfo class
This may sound crazy, but literally vcl::FontInfo serves no purpose
that I can see. The inheritance chain is like this:
┌────────────────────────┐
│ │
│ vcl::Font │
│ │
└────────────────────────┘
^
╱ ╲
│
│
┌────────────────────────┐
│ │
│ vcl::FontInfo │
│ │
└────────────────────────┘
^
╱ ╲
│
│
┌────────────────────────┐
│ │
│ FontMetric │
│ │
└────────────────────────┘
vcl::FontInfo (which, incidentally, needs to be put into the vcl
namespace due to collisions with poppler!) literally does nothing
and is acting as a bridge between FontMetric and vcl::Font. Unlike
a bridge though, this bridge doesn't actually *do* anything.
So I'm removing it, which means one less class to deal with in the
vcl fonts world.
Change-Id: I32725669c9bca7fbb0846b6a062135464046e4f6
Reviewed-on: https://gerrit.libreoffice.org/21058
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 5f5958be9da1..6727681a4fde 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1215,7 +1215,7 @@ static char* getFonts (const char* pCommand) for (sal_uInt16 i = 0; i < nFontCount; ++i) { boost::property_tree::ptree aChildren; - const vcl::FontInfo& rInfo = pList->GetFontName(i); + const FontMetric& rInfo = pList->GetFontName(i); const sal_IntPtr* pAry = pList->GetSizeAry(rInfo); sal_uInt16 nSizeCount = 0; while (pAry[nSizeCount]) @@ -1529,7 +1529,7 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* /*pThis*/, sal_uInt16 nFontCount = pList->GetFontNameCount(); for (sal_uInt16 i = 0; i < nFontCount; ++i) { - const vcl::FontInfo& rInfo = pList->GetFontName(i); + const FontMetric& rInfo = pList->GetFontName(i); OUString aFontName = rInfo.GetName(); if (!aSearchedFontName.equals(aFontName.toUtf8().getStr())) continue; |