diff options
Diffstat (limited to 'vcl/unx/generic')
-rw-r--r-- | vcl/unx/generic/app/i18n_ic.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_im.cxx | 16 | ||||
-rw-r--r-- | vcl/unx/generic/app/sm.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi2.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index 345f4f75f82b..a649c1523aa8 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -508,7 +508,7 @@ SalI18N_InputContext::IsSupportedIMStyle( XIMStyle nStyle ) const return False; } -Bool +bool SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles ) { mnPreeditStyle = 0; diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index d8377b9e5c32..9d91943e468b 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -55,11 +55,11 @@ extern "C" char * XSetIMValues(XIM im, ...); // // ------------------------------------------------------------------------------------ -Bool +bool IMServerKinput2 () { const static char* p_xmodifiers = getenv ("XMODIFIERS"); - const static Bool b_kinput2 = (p_xmodifiers != NULL) + const static bool b_kinput2 = (p_xmodifiers != NULL) && (strcmp(p_xmodifiers, "@im=kinput2") == 0); return b_kinput2; @@ -76,7 +76,7 @@ class XKeyEventOp : XKeyEvent XKeyEventOp& operator= (const XKeyEvent &rEvent); void erase (); - Bool match (const XKeyEvent &rEvent) const; + bool match (const XKeyEvent &rEvent) const; }; void @@ -122,7 +122,7 @@ XKeyEventOp::erase () init(); } -Bool +bool XKeyEventOp::match (const XKeyEvent &rEvent) const { return ( (type == XLIB_KeyPress && rEvent.type == KeyRelease) @@ -216,7 +216,7 @@ IsXWindowCompatibleLocale( const char* p_locale ) // see i8988, i9188, i8930, i16318 // on Solaris the environment needs to be set equivalent to the locale (#i37047#) -Bool +bool SalI18N_InputMethod::SetLocale( const char* pLocale ) { // check whether we want an Input Method engine, if we don't we @@ -357,7 +357,7 @@ PrintInputStyle( XIMStyles *pStyle ) // prior to xopendisplay, the xopenim call has to be delayed // -Bool +bool SalI18N_InputMethod::CreateMethod ( Display *pDisplay ) { if ( mbUseable ) @@ -405,13 +405,13 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay ) // give IM the opportunity to look at the event, and possibly hide it // -Bool +bool SalI18N_InputMethod::FilterEvent( XEvent *pEvent, XLIB_Window window ) { if (!mbUseable) return False; - Bool bFilterEvent = XFilterEvent (pEvent, window); + bool bFilterEvent = XFilterEvent (pEvent, window); if (pEvent->type != XLIB_KeyPress && pEvent->type != KeyRelease) return bFilterEvent; diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index 5ff427348b56..f0d1387ab704 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -239,7 +239,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SessionManagerClient, SaveYourselfHdl, void*, pStat { // Decode argument smuggled in as void*: sal_uIntPtr nStateVal = reinterpret_cast< sal_uIntPtr >(pStateVal); - Bool shutdown = nStateVal != 0; + bool shutdown = nStateVal != 0; SAL_INFO("vcl.sm", "posting save documents event shutdown = " << (shutdown ? "true" : "false" )); diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 2c3c160d20bb..cc443a5948ac 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -1111,7 +1111,7 @@ bool X11SalGraphics::drawFilledTrapezoids( const ::basegfx::B2DTrapezoid* pB2DTr rEntry.m_aPixmap = limitXCreatePixmap( pXDisplay, hDrawable_, 1, 1, 32 ); XRenderPictureAttributes aAttr; - aAttr.repeat = true; + aAttr.repeat = int(true); XRenderPictFormat* pXRPF = rRenderPeer.FindStandardFormat( PictStandardARGB32 ); rEntry.m_aPicture = rRenderPeer.CreatePicture( rEntry.m_aPixmap, pXRPF, CPRepeat, &aAttr ); diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index 5c53635c6e45..5d11f00e73a0 100644 --- a/vcl/unx/generic/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -710,7 +710,7 @@ bool X11SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR, const_cast<SalBitmap&>(rAlphaBmp).ReleaseBuffer( pAlphaBuffer, sal_True ); XRenderPictureAttributes aAttr; - aAttr.repeat = true; + aAttr.repeat = int(true); Picture aAlphaPic = rPeer.CreatePicture( aAlphaPM, pAlphaFormat, CPRepeat, &aAttr ); if( !aAlphaPic ) return false; diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index ee1abf8722aa..5705a217e35a 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3841,7 +3841,7 @@ long X11SalFrame::HandleStateEvent( XPropertyEvent *pEvent ) ) return 0; - DBG_ASSERT( actual_type = pEvent->atom + DBG_ASSERT( actual_type == pEvent->atom && 32 == actual_format && 2 == nitems && 0 == bytes_after, "HandleStateEvent" ); |