fix windows build, ambiguous symbol

Change-Id: Ib3a2419198a6e2b1ee5330f99bc526f2d63edd7c

fix windows build, ambiguous symbol
Change-Id: Ib3a2419198a6e2b1ee5330f99bc526f2d63edd7c
1408f39e · Noel Grandin · c91672c1 · 1408f39e
Kaydet (Commit) 1408f39e authored May 09, 2016 tarafından Noel Grandin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

formcontrolfont.cxx forms/source/component/formcontrolfont.cxx +2 -2

No files found.
--- 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;