[Libreoffice-commits] core.git: oox/source

[Noel Grandin]

 oox/source/drawingml/chart/axisconverter.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e32da3af7695617ca1fc4c8a5c1689952269ade5
Author: Noel Grandin <n...@peralex.com>
Date:   Wed May 20 10:44:14 2015 +0200

    fix Win build
    
    ambiguous symbol
    
    Change-Id: Ie3eea266b6a1bf6ca65edaf6a2f22e543a128646

diff --git a/oox/source/drawingml/chart/axisconverter.cxx 
b/oox/source/drawingml/chart/axisconverter.cxx
index 29a9ffd..352e45e 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -101,7 +101,7 @@ sal_Int32 lclGetTickMark( sal_Int32 nToken )
         case XML_out:   return OUTER;
         case XML_cross: return INNER | OUTER;
     }
-    return NONE;
+    return css::chart2::TickmarkStyle::NONE;
 }
 
 /**
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits