diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-09 13:37:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-05-09 13:47:36 +0200 |
| commit | 1408f39eef633b60f12f25c8381d2dc055b2cc30 (patch) | |
| tree | 86f3902a3142322ecd9f9fd33d21a7507a2492b2 /forms | |
| parent | c91672c1719dd7a981e2d2e87cfebefe4c72a572 (diff) | |
fix windows build, ambiguous symbol
Change-Id: Ib3a2419198a6e2b1ee5330f99bc526f2d63edd7c
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/formcontrolfont.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx index 9cc33a6d0f40..2eb56370d41b 100644 --- a/forms/source/component/formcontrolfont.cxx +++ b/forms/source/component/formcontrolfont.cxx @@ -121,7 +121,7 @@ namespace frm FontControlModel::FontControlModel( bool _bToolkitCompatibleDefaults ) :m_nFontRelief( css::awt::FontRelief::NONE ) - ,m_nFontEmphasis( FontEmphasisMark::NONE ) + ,m_nFontEmphasis( css::awt::FontEmphasisMark::NONE ) ,m_bToolkitCompatibleDefaults( _bToolkitCompatibleDefaults ) { } @@ -500,7 +500,7 @@ namespace frm break; case PROPERTY_ID_FONTEMPHASISMARK: - aReturn <<= FontEmphasisMark::NONE; + aReturn <<= css::awt::FontEmphasisMark::NONE; bHandled = true; break; |