forms/source/component/formcontrolfont.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1408f39eef633b60f12f25c8381d2dc055b2cc30
Author: Noel Grandin <n...@peralex.com>
Date: Mon May 9 13:37:09 2016 +0200
fix windows build, ambiguous symbol
Change-Id: Ib3a2419198a6e2b1ee5330f99bc526f2d63edd7c
diff --git a/forms/source/component/formcontrolfont.cxx
b/forms/source/component/formcontrolfont.cxx
index 9cc33a6..2eb5637 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
