summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-01-16 21:01:00 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-01-16 16:11:28 +0000
commit2b297116cb6bb1061c43e5714e2609c8ee9f57d2 (patch)
tree9622cff5a49a891f64899e34c48b53e8d462e96e /dbaccess
parent7d93bb8fcb406773d2dc68b25ab7cee6e114d482 (diff)
vcl: rename Font::GetName to Font::GetFamilyName
Change-Id: I83927e0992dfe0a2a79d139818a9f45d3761aae5 Reviewed-on: https://gerrit.libreoffice.org/21509 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/control/sqledit.cxx2
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 19574fa309a3..db4db5197c0a 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 ffbb1158b6a0..1c4b3c596f43 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);
}