diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-04-18 13:16:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-18 13:17:43 +0100 |
| commit | 99ec48b163b560f057b78a317906908b876ff15f (patch) | |
| tree | 510b03084c9c349b559e731d64995f858946d440 | |
| parent | 8b7aff3d430649eed279a81984cb6f5c8a1a4f66 (diff) | |
fix build problem with ambiguous InitFont
Change-Id: Ib2fa1dd8136e489765e80f174fcf21d7110ec3c2
| -rw-r--r-- | include/svx/gridctrl.hxx | 2 | ||||
| -rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 4 | ||||
| -rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index e222f0475c82..8fb2dbb6183d 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 d730dd69be9a..166540b36a15 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 a2b03394c545..7b17de505d58 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 ) { |