[Libreoffice-commits] core.git: include/svx svx/source

[Caolán McNamara]

 include/svx/gridctrl.hxx       |    2 +-
 svx/source/fmcomp/gridcell.cxx |    4 ++--
 svx/source/fmcomp/gridctrl.cxx |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 99ec48b163b560f057b78a317906908b876ff15f
Author: Caolán McNamara <caol...@redhat.com>
Date:   Fri Apr 18 13:16:09 2014 +0100

    fix build problem with ambiguous InitFont
    
    Change-Id: Ib2fa1dd8136e489765e80f174fcf21d7110ec3c2

diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index e222f04..8fb2dbb 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -116,7 +116,7 @@ protected:
 
 enum InitWindowFacet
 {
-    InitFont        = 0x01,
+    InitFontFacet   = 0x01,
     InitForeground  = 0x02,
     InitBackground  = 0x04,
     InitWritingMode = 0x08,
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index d730dd6..166540b 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -736,7 +736,7 @@ void DbCellControl::ImplInitWindow( Window& rParent, const 
InitWindowFacet _eIni
         }
     }
 
-    if ( ( _eInitWhat & InitFont ) != 0 )
+    if ( ( _eInitWhat & InitFontFacet ) != 0 )
     {
         for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i)
         {
@@ -761,7 +761,7 @@ void DbCellControl::ImplInitWindow( Window& rParent, const 
InitWindowFacet _eIni
         }
     }
 
-    if  (   ( ( _eInitWhat & InitFont ) != 0 )
+    if  (   ( ( _eInitWhat & InitFontFacet ) != 0 )
         ||  ( ( _eInitWhat & InitForeground ) != 0 )
         )
     {
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index a2b0339..7b17de5 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -972,7 +972,7 @@ void DbGridControl::StateChanged( StateChangedType nType )
 
         case STATE_CHANGE_ZOOM:
         {
-            ImplInitWindow( InitFont );
+            ImplInitWindow( InitFontFacet );
 
             // and give it a chance to rearrange
             Point aPoint = GetControlArea().TopLeft();
@@ -982,7 +982,7 @@ void DbGridControl::StateChanged( StateChangedType nType )
         }
         break;
         case STATE_CHANGE_CONTROLFONT:
-            ImplInitWindow( InitFont );
+            ImplInitWindow( InitFontFacet );
             Invalidate();
             break;
         case STATE_CHANGE_CONTROLFOREGROUND:
@@ -1035,7 +1035,7 @@ void DbGridControl::ImplInitWindow( const InitWindowFacet 
_eInitWhat )
         }
     }
 
-    if ( ( _eInitWhat & InitFont ) != 0 )
+    if ( ( _eInitWhat & InitFontFacet ) != 0 )
     {
         if ( m_bNavigationBar )
         {

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits