diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-02-24 01:53:13 +1100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-28 03:19:47 -0600 |
commit | 381f8a5673b70e31fda2739da25f3863895ae665 (patch) | |
tree | d9366671e0e2794164ef6cbffbf3e53242139efb /vcl/unx | |
parent | I guess const was intended here. (diff) | |
download | core-381f8a5673b70e31fda2739da25f3863895ae665.tar.gz core-381f8a5673b70e31fda2739da25f3863895ae665.zip |
sal_Bool -> bool in mostly vcl module
Conflicts:
include/vcl/settings.hxx
svtools/source/table/tablecontrol_impl.cxx
sw/source/core/frmedt/fecopy.cxx
vcl/inc/canvasbitmap.hxx
vcl/inc/headless/svpframe.hxx
vcl/inc/unx/salframe.h
vcl/inc/win/salframe.h
vcl/inc/win/salprn.h
vcl/inc/win/salvd.h
vcl/osx/DragSource.cxx
vcl/osx/DragSource.hxx
vcl/osx/DropTarget.cxx
vcl/osx/DropTarget.hxx
vcl/osx/OSXTransferable.cxx
vcl/osx/OSXTransferable.hxx
vcl/osx/clipboard.cxx
vcl/osx/clipboard.hxx
vcl/osx/salprn.cxx
vcl/qa/cppunit/canvasbitmaptest.cxx
vcl/source/components/fontident.cxx
vcl/source/control/edit.cxx
vcl/source/control/spinfld.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/gdi/virdev.cxx
vcl/source/helper/canvasbitmap.cxx
vcl/source/window/dockwin.cxx
vcl/unx/generic/dtrans/X11_selection.hxx
vcl/unx/kde/UnxFilePicker.cxx
vcl/unx/kde/UnxFilePicker.hxx
vcl/unx/kde4/KDE4FilePicker.cxx
vcl/unx/kde4/KDE4FilePicker.hxx
vcl/unx/kde4/KDESalFrame.hxx
Change-Id: I9866d985da86dea2a56feff23f91c1467a1636b0
Reviewed-on: https://gerrit.libreoffice.org/8219
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 22 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_transferable.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salvd.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 60 | ||||
-rw-r--r-- | vcl/unx/generic/window/salobj.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atktextattributes.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/gtk/app/gtkinst.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 56 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 20 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtkobject.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtksalframe.cxx | 62 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtksalmenu.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/kde/UnxCommandThread.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/kde/salnativewidgets-kde.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/kde4/KDE4FilePicker.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/kde4/KDESalFrame.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/kde4/KDESalFrame.hxx | 2 |
20 files changed, 143 insertions, 143 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index fda0b3d9517a..ea6f9b873fee 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -362,7 +362,7 @@ static int DisplayYield( int fd, SalX11Display *pDisplay ) GetSalData()->m_pInstance->GetYieldMutex()->acquire(); pDisplay->Yield(); GetSalData()->m_pInstance->GetYieldMutex()->release(); - return sal_True; + return true; } SalX11Display::SalX11Display( Display *display ) diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 0ac8dd748297..4072e835cad6 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -1791,12 +1791,12 @@ bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest if( aNotify.xselection.property != None ) { dsde.DropAction = DNDConstants::ACTION_COPY; - dsde.DropSuccess = sal_True; + dsde.DropSuccess = true; } else { dsde.DropAction = DNDConstants::ACTION_NONE; - dsde.DropSuccess = sal_False; + dsde.DropSuccess = false; } css::uno::Reference< XDragSourceListener > xListener( m_xDragSourceListener ); m_xDragSourceListener.clear(); @@ -2729,7 +2729,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) dsde.DragSourceContext = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this ); dsde.DragSource = static_cast< XDragSource* >(this); dsde.DropAction = DNDConstants::ACTION_NONE; - dsde.DropSuccess = sal_False; + dsde.DropSuccess = false; css::uno::Reference< XDragSourceListener > xListener( m_xDragSourceListener ); m_xDragSourceListener.clear(); aGuard.clear(); @@ -2870,7 +2870,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) dsde.DragSourceContext = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this ); dsde.DragSource = static_cast< XDragSource* >(this); dsde.DropAction = DNDConstants::ACTION_NONE; - dsde.DropSuccess = sal_False; + dsde.DropSuccess = false; css::uno::Reference< XDragSourceListener > xListener( m_xDragSourceListener ); m_xDragSourceListener.clear(); aGuard.clear(); @@ -2921,7 +2921,7 @@ void SelectionManager::reject( XLIB_Window aDropWindow, XLIB_Time ) dsde.DragSourceContext = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this ); dsde.DragSource = static_cast< XDragSource* >(this); dsde.DropAction = DNDConstants::ACTION_NONE; - dsde.DropSuccess = sal_False; + dsde.DropSuccess = false; m_xDragSourceListener->dragDropEnd( dsde ); m_xDragSourceListener.clear(); } @@ -2934,7 +2934,7 @@ void SelectionManager::reject( XLIB_Window aDropWindow, XLIB_Time ) sal_Bool SelectionManager::isDragImageSupported() throw(std::exception) { - return sal_False; + return false; } @@ -3201,7 +3201,7 @@ void SelectionManager::startDrag( aDragFailedEvent.DragSource = static_cast< XDragSource* >(this); aDragFailedEvent.DragSourceContext = new DragSourceContext( None, CurrentTime, *this ); aDragFailedEvent.DropAction = DNDConstants::ACTION_NONE; - aDragFailedEvent.DropSuccess = sal_False; + aDragFailedEvent.DropSuccess = false; if( m_aDragRunning.check() ) { @@ -3483,7 +3483,7 @@ void SelectionManager::dragDoDispatch() dsde.DragSourceContext = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this ); dsde.DragSource = static_cast< XDragSource* >(this); dsde.DropAction = DNDConstants::ACTION_NONE; - dsde.DropSuccess = sal_False; + dsde.DropSuccess = false; // cleanup after drag if( m_bWaitingForPrimaryConversion ) @@ -3889,7 +3889,7 @@ sal_Bool SelectionManager::handleEvent( const Any& event ) throw(std::exception) #endif shutdown(); } - return sal_True; + return true; } void SAL_CALL SelectionManager::disposing( const ::com::sun::star::lang::EventObject& rEvt ) @@ -4038,7 +4038,7 @@ void SelectionManager::deregisterDropTarget( XLIB_Window aWindow ) dsde.DragSourceContext = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this ); dsde.DragSource = static_cast< XDragSource* >(this); dsde.DropAction = DNDConstants::ACTION_NONE; - dsde.DropSuccess = sal_False; + dsde.DropSuccess = false; css::uno::Reference< XDragSourceListener > xListener( m_xDragSourceListener ); m_xDragSourceListener.clear(); aGuard.clear(); @@ -4123,7 +4123,7 @@ void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) thro sal_Bool SelectionManagerHolder::isDragImageSupported() throw(std::exception) { - return m_xRealDragSource.is() ? m_xRealDragSource->isDragImageSupported() : sal_False; + return m_xRealDragSource.is() ? m_xRealDragSource->isDragImageSupported() : false; } diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx index 5321f084ae13..e913e8d83821 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.cxx +++ b/vcl/unx/generic/dtrans/X11_transferable.cxx @@ -114,9 +114,9 @@ sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFla for( int i = 0; i < aFlavors.getLength(); i++ ) if( aFlavor.MimeType.equalsIgnoreAsciiCase( aFlavors.getConstArray()[i].MimeType ) && aFlavor.DataType == aFlavors.getConstArray()[i].DataType ) - return sal_True; + return true; - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index a8da77564967..018f83328c48 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -114,7 +114,7 @@ X11SalGraphics::X11SalGraphics() #if ENABLE_GRAPHITE // check if graphite fonts have been disabled static const char* pDisableGraphiteStr = getenv( "SAL_DISABLE_GRAPHITE" ); - bDisableGraphite_ = pDisableGraphiteStr ? (pDisableGraphiteStr[0]!='0') : sal_False; + bDisableGraphite_ = pDisableGraphiteStr ? (pDisableGraphiteStr[0]!='0') : false; #endif pBrushGC_ = NULL; diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index fde56609167d..250ad488ba8c 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -162,7 +162,7 @@ bool X11SalVirtualDevice::Init( SalDisplay *pDisplay, pGraphics_->Init( this, pColormap, bDeleteColormap ); - return hDrawable_ != None ? sal_True : sal_False; + return hDrawable_ != None ? true : false; } X11SalVirtualDevice::X11SalVirtualDevice() : diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 4bfd29a169d5..0d8ad3368739 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -731,7 +731,7 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uLong nSalFrameStyle, mnExtStyle = 0; bAlwaysOnTop_ = false; - // set bViewable_ to sal_True: hack GetClientSize to report something + // set bViewable_ to true: hack GetClientSize to report something // different to 0/0 before first map bViewable_ = true; bMapped_ = false; @@ -803,7 +803,7 @@ X11SalFrame::~X11SalFrame() ShowFullScreen( false, 0 ); if( bMapped_ ) - Show( sal_False ); + Show( false ); if( mpInputContext ) { @@ -914,7 +914,7 @@ void X11SalFrame::updateGraphics( bool bClear ) pFreeGraphics_->SetDrawable( aDrawable, m_nXScreen ); } -void X11SalFrame::Enable( sal_Bool /*bEnable*/ ) +void X11SalFrame::Enable( bool /*bEnable*/ ) { // NYI: enable/disable frame } @@ -1080,7 +1080,7 @@ void X11SalFrame::SetMinClientSize( long nWidth, long nHeight ) // Show + Pos (x,y,z) + Size (width,height) -void X11SalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) +void X11SalFrame::Show( bool bVisible, bool bNoActivate ) { if( ( bVisible && bMapped_ ) || ( !bVisible && !bMapped_ ) ) @@ -1110,12 +1110,12 @@ void X11SalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) if( pFrame->nStyle_ & SAL_FRAME_STYLE_INTRO ) { if( pFrame->bMapped_ ) - const_cast<X11SalFrame*>(pFrame)->Show( sal_False ); + const_cast<X11SalFrame*>(pFrame)->Show( false ); } } } - // update NET_WM_STATE which may have been deleted due to earlier Show(sal_False) + // update NET_WM_STATE which may have been deleted due to earlier Show(false) if( nShowState_ == SHOWSTATE_HIDDEN ) GetDisplay()->getWMAdaptor()->frameIsMapping( this ); @@ -1124,7 +1124,7 @@ void X11SalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) * with the basic dialogue editor, * which shows a frame and instantly hides it again. After that the * editor window is shown and the WM takes this as an opportunity - * to show our hidden transient frame also. So Show( sal_False ) must + * to show our hidden transient frame also. So Show( false ) must * withdraw the frame AND delete the WM_TRANSIENT_FOR property. * In case the frame is shown again, the transient hint must be restored here. */ @@ -1257,7 +1257,7 @@ void X11SalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) * plugged windows don't necessarily get the * focus on show because the parent may already be mapped * and have the focus. So try to set the focus - * to the child on Show(sal_True) + * to the child on Show(true) */ if( (nStyle_ & SAL_FRAME_STYLE_PLUG) && ! m_bXEmbed ) XSetInputFocus( GetXDisplay(), @@ -1545,7 +1545,7 @@ void X11SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_u bDefaultPosition_ = False; } -void X11SalFrame::SetAlwaysOnTop( sal_Bool bOnTop ) +void X11SalFrame::SetAlwaysOnTop( bool bOnTop ) { if( ! IsOverrideRedirect() ) { @@ -2009,22 +2009,22 @@ void X11SalFrame::SetScreenNumber( unsigned int nNewScreen ) Rectangle aNewScreenRect( GetDisplay()->GetXineramaScreens()[nNewScreen] ); bool bVisible = bMapped_; if( bVisible ) - Show( sal_False ); + Show( false ); maGeometry.nX = aNewScreenRect.Left() + (maGeometry.nX - aOldScreenRect.Left()); maGeometry.nY = aNewScreenRect.Top() + (maGeometry.nY - aOldScreenRect.Top()); createNewWindow( None, m_nXScreen ); if( bVisible ) - Show( sal_True ); + Show( true ); maGeometry.nDisplayScreenNumber = nNewScreen; } else if( nNewScreen < GetDisplay()->GetXScreenCount() ) { bool bVisible = bMapped_; if( bVisible ) - Show( sal_False ); + Show( false ); createNewWindow( None, SalX11Screen( nNewScreen ) ); if( bVisible ) - Show( sal_True ); + Show( true ); maGeometry.nDisplayScreenNumber = nNewScreen; } } @@ -2074,7 +2074,7 @@ void X11SalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nScreen ) nStyle_ |= SAL_FRAME_STYLE_PARTIAL_FULLSCREEN; bool bVisible = bMapped_; if( bVisible ) - Show( sal_False ); + Show( false ); maGeometry.nX = aRect.Left(); maGeometry.nY = aRect.Top(); maGeometry.nWidth = aRect.GetWidth(); @@ -2087,7 +2087,7 @@ void X11SalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nScreen ) else GetDisplay()->getWMAdaptor()->showFullScreen( this, true ); if( bVisible ) - Show(sal_True); + Show(true); } else @@ -2098,14 +2098,14 @@ void X11SalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nScreen ) Rectangle aRect = maRestorePosSize; maRestorePosSize = Rectangle(); if( bVisible ) - Show( sal_False ); + Show( false ); createNewWindow( None, m_nXScreen ); if( !aRect.IsEmpty() ) SetPosSize( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y | SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT ); if( bVisible ) - Show( sal_True ); + Show( true ); } } else @@ -2118,12 +2118,12 @@ void X11SalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nScreen ) if( mbFullScreen ) pDisplay_->getWMAdaptor()->showFullScreen( this, false ); if( bVisible ) - Show( sal_False ); + Show( false ); createNewWindow( None, SalX11Screen( nScreen ) ); if( mbFullScreen ) pDisplay_->getWMAdaptor()->showFullScreen( this, true ); if( bVisible ) - Show( sal_True ); + Show( true ); } if( mbFullScreen == (bool)bFullScreen ) return; @@ -2207,7 +2207,7 @@ MessageToXAutoLock( Display *p_display, int n_message ) return True; } -void X11SalFrame::StartPresentation( sal_Bool bStart ) +void X11SalFrame::StartPresentation( bool bStart ) { I18NStatus::get().show( !bStart, I18NStatus::presentation ); if ( bStart ) @@ -2486,7 +2486,7 @@ void X11SalFrame::UpdateSettings( AllSettings& rSettings ) rSettings.SetStyleSettings( aStyleSettings ); } -void X11SalFrame::CaptureMouse( sal_Bool bCapture ) +void X11SalFrame::CaptureMouse( bool bCapture ) { nCaptured_ = pDisplay_->CaptureMouse( bCapture ? this : NULL ); } @@ -2515,7 +2515,7 @@ void X11SalFrame::createNewWindow( XLIB_Window aNewParent, SalX11Screen nXScreen { bool bWasVisible = bMapped_; if( bWasVisible ) - Show( sal_False ); + Show( false ); if( nXScreen.getXScreen() >= GetDisplay()->GetXScreenCount() ) nXScreen = m_nXScreen; @@ -2582,7 +2582,7 @@ void X11SalFrame::createNewWindow( XLIB_Window aNewParent, SalX11Screen nXScreen } if( bWasVisible ) - Show( sal_True ); + Show( true ); std::list< X11SalFrame* > aChildren = maChildren; for( std::list< X11SalFrame* >::iterator it = aChildren.begin(); it != aChildren.end(); ++it ) @@ -2792,7 +2792,7 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent ) } if( ! bInside ) { - // need not take care of the XUngrabPointer in Show( sal_False ) + // need not take care of the XUngrabPointer in Show( false ) // because XUngrabPointer does not produce errors if pointer // is not grabbed XUngrabPointer( GetXDisplay(), CurrentTime ); @@ -3663,8 +3663,8 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) hWM_Parent = GetShellWindow(); break; } - /* this sometimes happens if a Show(sal_True) is - * immediately followed by Show(sal_False) (which is braindead anyway) + /* this sometimes happens if a Show(true) is + * immediately followed by Show(false) (which is braindead anyway) */ if( hDummy == hWM_Parent ) hDummy = hRoot; @@ -3942,7 +3942,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) if( -1 == nCaptured_ ) { - CaptureMouse( sal_True ); + CaptureMouse( true ); #ifdef DBG_UTIL if( -1 != nCaptured_ ) pDisplay_->DbgPrintDisplayEvent("Captured", pEvent); @@ -4015,7 +4015,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) } bMapped_ = true; bViewable_ = true; - nRet = sal_True; + nRet = true; if ( mpInputContext != NULL ) mpInputContext->Map( this ); CallCallback( SALEVENT_RESIZE, NULL ); @@ -4075,7 +4075,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) { bMapped_ = false; bViewable_ = false; - nRet = sal_True; + nRet = true; if ( mpInputContext != NULL ) mpInputContext->Unmap( this ); CallCallback( SALEVENT_RESIZE, NULL ); @@ -4090,7 +4090,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) case VisibilityNotify: nVisibility_ = pEvent->xvisibility.state; - nRet = sal_True; + nRet = true; if( bAlwaysOnTop_ && bMapped_ && ! GetDisplay()->getWMAdaptor()->isAlwaysOnTopOK() diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index a06a7df96a40..af85a8c5f685 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -42,7 +42,7 @@ // SalInstance member to create and destroy a SalObject -SalObject* X11SalInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow ) +SalObject* X11SalInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow ) { return X11SalObject::CreateObject( pParent, pWindowData, bShow ); } @@ -382,7 +382,7 @@ X11SalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) void -X11SalObject::Show( sal_Bool bVisible ) +X11SalObject::Show( bool bVisible ) { if ( ! maSystemChildData.aWindow ) return; diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 502d30ef125c..243ea1870bb1 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -591,7 +591,7 @@ Bool2String( const uno::Any& rAny ) { int n = 1; - if( rAny.get<sal_Bool>() ) + if( rAny.get<bool>() ) n = 0; return g_strdup( bool_values[n] ); @@ -755,7 +755,7 @@ get_font_effect(const uno::Sequence< beans::PropertyValue >& rAttributeList, { if( nContourIndex != -1 ) { - if( rAttributeList[nContourIndex].Value.get<sal_Bool>() ) + if( rAttributeList[nContourIndex].Value.get<bool>() ) return g_strdup(outline); } @@ -799,7 +799,7 @@ get_text_decoration(const uno::Sequence< beans::PropertyValue >& rAttributeList, if( nBlinkIndex != -1 ) { - if( rAttributeList[nBlinkIndex].Value.get<sal_Bool>() ) + if( rAttributeList[nBlinkIndex].Value.get<bool>() ) value_list[count++] = const_cast <gchar *> (decorations[DECORATION_BLINK]); } if( nUnderlineIndex != -1 ) @@ -833,7 +833,7 @@ Bool2Shadow( const uno::Any& rAny ) { int n = 0; - if( rAny.get<sal_Bool>() ) + if( rAny.get<bool>() ) n = 1; return g_strdup( shadow_values[n] ); diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 1f140f3141a3..24ff3c836c86 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -208,7 +208,7 @@ SalFrame* GtkInstance::CreateChildFrame( SystemParentData* pParentData, sal_uLon return new GtkSalFrame( pParentData ); } -SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow ) +SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow ) { EnsureInit(); #if !GTK_CHECK_VERSION(3,0,0) @@ -368,7 +368,7 @@ SalBitmap* GtkInstance::CreateSalBitmap() #ifdef ENABLE_GMENU_INTEGRATION -SalMenu* GtkInstance::CreateMenu( sal_Bool bMenuBar, Menu* pVCLMenu ) +SalMenu* GtkInstance::CreateMenu( bool bMenuBar, Menu* pVCLMenu ) { EnsureInit(); GtkSalMenu* pSalMenu = new GtkSalMenu( bMenuBar ); @@ -396,7 +396,7 @@ void GtkInstance::DestroyMenuItem( SalMenuItem* pItem ) #else // not ENABLE_GMENU_INTEGRATION -SalMenu* GtkInstance::CreateMenu( sal_Bool, Menu* ) { return NULL; } +SalMenu* GtkInstance::CreateMenu( bool, Menu* ) { return NULL; } void GtkInstance::DestroyMenu( SalMenu* ) {} SalMenuItem* GtkInstance::CreateMenuItem( const SalItemParams* ) { return NULL; } void GtkInstance::DestroyMenuItem( SalMenuItem* ) {} diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index ce7d1ed42cc9..2365565ce614 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -71,7 +71,7 @@ static void expandexpanders(GtkContainer *pWidget) if (GTK_IS_CONTAINER(GTK_WIDGET(p->data))) expandexpanders(GTK_CONTAINER(GTK_WIDGET(p->data))); if (GTK_IS_EXPANDER(GTK_WIDGET(p->data))) - gtk_expander_set_expanded(GTK_EXPANDER(GTK_WIDGET(p->data)), sal_True); + gtk_expander_set_expanded(GTK_EXPANDER(GTK_WIDGET(p->data)), true); } g_list_free(pChildren); } @@ -142,18 +142,18 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT ); #if ENABLE_GNOME_VFS || ENABLE_GIO - gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False ); + gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), false ); #endif - gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), sal_False ); + gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), false ); - m_pVBox = gtk_vbox_new( sal_False, 0 ); + m_pVBox = gtk_vbox_new( false, 0 ); // We don't want clickable items to have a huge hit-area - GtkWidget *pHBox = gtk_hbox_new( sal_False, 0 ); - GtkWidget *pThinVBox = gtk_vbox_new( sal_False, 0 ); + GtkWidget *pHBox = gtk_hbox_new( false, 0 ); + GtkWidget *pThinVBox = gtk_vbox_new( false, 0 ); - gtk_box_pack_end (GTK_BOX( m_pVBox ), pHBox, sal_False, sal_False, 0); - gtk_box_pack_start (GTK_BOX( pHBox ), pThinVBox, sal_False, sal_False, 0); + gtk_box_pack_end (GTK_BOX( m_pVBox ), pHBox, false, false, 0); + gtk_box_pack_start (GTK_BOX( pHBox ), pThinVBox, false, false, 0); gtk_widget_show( pHBox ); gtk_widget_show( pThinVBox ); @@ -183,12 +183,12 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext break; } - gtk_box_pack_end( GTK_BOX( pThinVBox ), m_pToggles[i], sal_False, sal_False, 0 ); + gtk_box_pack_end( GTK_BOX( pThinVBox ), m_pToggles[i], false, false, 0 ); } for( i = 0; i < LIST_LAST; i++ ) { - m_pHBoxs[i] = gtk_hbox_new( sal_False, 0 ); + m_pHBoxs[i] = gtk_hbox_new( false, 0 ); m_pAligns[i] = gtk_alignment_new(0, 0, 0, 1); @@ -220,18 +220,18 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext } gtk_container_add( GTK_CONTAINER( m_pAligns[i]), m_pLists[i] ); - gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pAligns[i], sal_False, sal_False, 0 ); + gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pAligns[i], false, false, 0 ); - gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pListLabels[i], sal_False, sal_False, 0 ); + gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pListLabels[i], false, false, 0 ); - gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pHBoxs[i], sal_False, sal_False, 0 ); + gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pHBoxs[i], false, false, 0 ); } aLabel = getResString( FILE_PICKER_FILE_TYPE ); m_pFilterExpander = gtk_expander_new_with_mnemonic( OUStringToOString( aLabel, RTL_TEXTENCODING_UTF8 ).getStr()); - gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pFilterExpander, sal_False, sal_True, 0 ); + gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pFilterExpander, false, true, 0 ); GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), @@ -249,11 +249,11 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext case 0: break; case 1: - gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), sal_True); + gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), true); break; case 2: expandexpanders(GTK_CONTAINER(m_pDialog)); - gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), sal_True); + gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), true); break; } @@ -270,8 +270,8 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext { column = gtk_tree_view_column_new (); cell = gtk_cell_renderer_text_new (); - gtk_tree_view_column_set_expand (column, sal_True); - gtk_tree_view_column_pack_start (column, cell, sal_False); + gtk_tree_view_column_set_expand (column, true); + gtk_tree_view_column_pack_start (column, cell, false); gtk_tree_view_column_set_attributes (column, cell, "text", i, (char *)NULL); gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column); } @@ -1399,12 +1399,12 @@ throw( uno::RuntimeException, std::exception ) if( bEnable ) { OSL_TRACE( "enable" ); - gtk_widget_set_sensitive( pWidget, sal_True ); + gtk_widget_set_sensitive( pWidget, true ); } else { OSL_TRACE( "disable" ); - gtk_widget_set_sensitive( pWidget, sal_False ); + gtk_widget_set_sensitive( pWidget, false ); } } else @@ -1443,7 +1443,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& } else if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL ) g_object_set( pWidget, "label", aTxt.getStr(), - "use_underline", sal_True, (char *)NULL ); + "use_underline", true, (char *)NULL ); else OSL_TRACE("Can't set label on list"); } @@ -1586,7 +1586,7 @@ void SalGtkFilePicker::update_preview_cb( GtkFileChooser *file_chooser, SalGtkFi GtkWidget *preview; char *filename; GdkPixbuf *pixbuf; - gboolean have_preview = sal_False; + gboolean have_preview = false; preview = pobjFP->m_pPreview; filename = gtk_file_chooser_get_preview_filename( file_chooser ); @@ -1865,22 +1865,22 @@ extern "C" static gboolean case_insensitive_filter (const GtkFileFilterInfo *filter_info, gpointer data) { - gboolean bRetval = sal_False; + gboolean bRetval = false; const char *pFilter = (const char *) data; - g_return_val_if_fail( data != NULL, sal_False ); - g_return_val_if_fail( filter_info != NULL, sal_False ); + g_return_val_if_fail( data != NULL, false ); + g_return_val_if_fail( filter_info != NULL, false ); if( !filter_info->uri ) - return sal_False; + return false; const char *pExtn = strrchr( filter_info->uri, '.' ); if( !pExtn ) - return sal_False; + return false; pExtn++; if( !g_ascii_strcasecmp( pFilter, pExtn ) ) - bRetval = sal_True; + bRetval = true; SAL_INFO( "vcl.gtk", "'" << filter_info->uri << "' match extn '" << pExtn << "' vs '" << pFilter << "' yeilds " << bRetval ); diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index 46fdcdbe4475..b30334408c5c 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -60,9 +60,9 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT ); #if ENABLE_GNOME_VFS || ENABLE_GIO - gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False ); + gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), false ); #endif - gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), sal_False ); + gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), false ); } diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 22b8794cba2e..76e5d44b5359 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -549,7 +549,7 @@ void GtkSalGraphics::copyBits( const SalTwoRect& rPosAry, /* * IsNativeControlSupported() * - * Returns sal_True if the platform supports native + * Returns true if the platform supports native * drawing of the control defined by nPart */ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) @@ -658,7 +658,7 @@ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP /* * HitTestNativeControl() * - * bIsInside is set to sal_True if aPos is contained within the + * bIsInside is set to true if aPos is contained within the * given part of the control, whose bounding region is * given by rControlRegion (in VCL frame coordinates). * @@ -967,7 +967,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, /* * GetNativeControlRegion() * - * If the return value is sal_True, rNativeBoundingRegion + * If the return value is true, rNativeBoundingRegion * contains the true bounding region covered by the control * including any adornment, while rNativeContentRegion contains the area * within the control that can be safely drawn into without drawing over @@ -1662,7 +1662,7 @@ bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, // intermediate states between active/inactive. Let's hope that // GtkToggleButtone stays binary compatible. if (!isChecked) - GTK_TOGGLE_BUTTON(gWidgetData[m_nXScreen].gRadioWidgetSibling)->active = sal_True; + GTK_TOGGLE_BUTTON(gWidgetData[m_nXScreen].gRadioWidgetSibling)->active = true; GTK_TOGGLE_BUTTON(gWidgetData[m_nXScreen].gRadioWidget)->active = isChecked; for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it ) @@ -2004,7 +2004,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, // ----------------- ARROW 1 NWCalcArrowRect( button11BoundRect, arrowRect ); gtk_paint_arrow( style, gdkDrawable, stateType, shadowType, - gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, sal_True, + gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, true, x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(), arrowRect.GetWidth(), arrowRect.GetHeight() ); } @@ -2020,7 +2020,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, // ----------------- ARROW 1 NWCalcArrowRect( button12BoundRect, arrowRect ); gtk_paint_arrow( style, gdkDrawable, stateType, shadowType, - gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, sal_True, + gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, true, x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(), arrowRect.GetWidth(), arrowRect.GetHeight() ); } @@ -2037,7 +2037,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, // ----------------- ARROW 2 NWCalcArrowRect( button21BoundRect, arrowRect ); gtk_paint_arrow( style, gdkDrawable, stateType, shadowType, - gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, sal_True, + gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, true, x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(), arrowRect.GetWidth(), arrowRect.GetHeight() ); } @@ -2053,7 +2053,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, // ----------------- ARROW 2 NWCalcArrowRect( button22BoundRect, arrowRect ); gtk_paint_arrow( style, gdkDrawable, stateType, shadowType, - gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, sal_True, + gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, true, x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(), arrowRect.GetWidth(), arrowRect.GetHeight() ); } @@ -2482,7 +2482,7 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen, arrowRect.setY( buttonRect.Top() + (buttonRect.GetHeight() - arrowRect.GetHeight()) / 2 - 1); gtk_paint_arrow( gWidgetData[nScreen].gSpinButtonWidget->style, pixmap, stateType, GTK_SHADOW_OUT, NULL, gWidgetData[nScreen].gSpinButtonWidget, - "spinbutton", (nPart == PART_BUTTON_UP) ? GTK_ARROW_UP : GTK_ARROW_DOWN, sal_True, + "spinbutton", (nPart == PART_BUTTON_UP) ? GTK_ARROW_UP : GTK_ARROW_DOWN, true, (arrowRect.Left() - aAreaRect.Left()), (arrowRect.Top() - aAreaRect.Top()), arrowRect.GetWidth(), arrowRect.GetHeight() ); } @@ -2560,7 +2560,7 @@ bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable, buttonRect.GetWidth(), buttonRect.GetHeight() ); gtk_paint_arrow( gWidgetData[m_nXScreen].gArrowWidget->style, gdkDrawable, stateType, shadowType, - &clipRect, gWidgetData[m_nXScreen].gArrowWidget, "arrow", GTK_ARROW_DOWN, sal_True, + &clipRect, gWidgetData[m_nXScreen].gArrowWidget, "arrow", GTK_ARROW_DOWN, true, x+(arrowRect.Left() - pixmapRect.Left()), y+(arrowRect.Top() - pixmapRect.Top()), arrowRect.GetWidth(), arrowRect.GetHeight() ); } diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx index c89848b69ebd..f585c73c904d 100644 --- a/vcl/unx/gtk/window/gtkobject.cxx +++ b/vcl/unx/gtk/window/gtkobject.cxx @@ -156,7 +156,7 @@ void GtkSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) } } -void GtkSalObject::Show( sal_Bool bVisible ) +void GtkSalObject::Show( bool bVisible ) { if( m_pSocket ) { @@ -202,7 +202,7 @@ void GtkSalObject::signalDestroy( GtkWidget* pObj, gpointer object ) } } -void GtkSalObject::SetForwardKey( sal_Bool bEnable ) +void GtkSalObject::SetForwardKey( bool bEnable ) { if( bEnable ) gtk_widget_add_events( GTK_WIDGET( m_pSocket ), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE ); diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 285809042ab7..547f543eeb46 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1314,7 +1314,7 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle ) else if( (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) ) { eType = GDK_WINDOW_TYPE_HINT_TOOLBAR; - lcl_set_accept_focus( GTK_WINDOW(m_pWindow), sal_False, true ); + lcl_set_accept_focus( GTK_WINDOW(m_pWindow), false, true ); } else if( (nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE) ) { @@ -1362,9 +1362,9 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle ) if( bDecoHandling ) { - gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? sal_True : FALSE ); + gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? true : FALSE ); if( ( (nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ) ) - lcl_set_accept_focus( GTK_WINDOW(m_pWindow), sal_False, false ); + lcl_set_accept_focus( GTK_WINDOW(m_pWindow), false, false ); } } @@ -1605,7 +1605,7 @@ bitmapToPixbuf( SalBitmap *pSalBitmap, SalBitmap *pSalAlpha ) pSalAlpha->ReleaseBuffer( pAlpha, true ); return gdk_pixbuf_new_from_data( pPixbufData, - GDK_COLORSPACE_RGB, sal_True, 8, + GDK_COLORSPACE_RGB, true, 8, aSize.Width(), aSize.Height(), aSize.Width() * 4, (GdkPixbufDestroyNotify) g_free, @@ -1768,7 +1768,7 @@ static void initClientId() #endif } -void GtkSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) +void GtkSalFrame::Show( bool bVisible, bool bNoActivate ) { if( m_pWindow ) { @@ -1880,7 +1880,7 @@ void GtkSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) } } -void GtkSalFrame::Enable( sal_Bool /*bEnable*/ ) +void GtkSalFrame::Enable( bool /*bEnable*/ ) { // Not implemented by X11SalFrame either } @@ -2303,7 +2303,7 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, int eType, Rectangle *pSiz bool bResize = false; bool bVisible = IS_WIDGET_MAPPED( m_pWindow ); if( bVisible ) - Show( sal_False ); + Show( false ); if( eType == SET_FULLSCREEN ) { @@ -2371,7 +2371,7 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, int eType, Rectangle *pSiz CallCallback( SALEVENT_MOVERESIZE, NULL ); if( bVisible ) - Show( sal_True ); + Show( true ); } void GtkSalFrame::SetScreenNumber( unsigned int nNewScreen ) @@ -2577,7 +2577,7 @@ dbus_uninhibit_gsm (guint cookie) } #endif -void GtkSalFrame::StartPresentation( sal_Bool bStart ) +void GtkSalFrame::StartPresentation( bool bStart ) { setAutoLock( !bStart ); @@ -2622,7 +2622,7 @@ void GtkSalFrame::StartPresentation( sal_Bool bStart ) } } -void GtkSalFrame::SetAlwaysOnTop( sal_Bool bOnTop ) +void GtkSalFrame::SetAlwaysOnTop( bool bOnTop ) { if( m_pWindow ) gtk_window_set_keep_above( GTK_WINDOW( m_pWindow ), bOnTop ); @@ -2751,7 +2751,7 @@ void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents ) #endif } -void GtkSalFrame::CaptureMouse( sal_Bool bCapture ) +void GtkSalFrame::CaptureMouse( bool bCapture ) { getDisplay()->CaptureMouse( bCapture ? this : NULL ); } @@ -2933,7 +2933,7 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, SalX11S { bool bWasVisible = m_pWindow ? IS_WIDGET_MAPPED(m_pWindow) : false; if( bWasVisible ) - Show( sal_False ); + Show( false ); if( (int)nXScreen.getXScreen() >= getDisplay()->GetXScreenCount() ) nXScreen = m_nXScreen; @@ -3019,7 +3019,7 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, SalX11S SetTitle( m_aTitle ); if( bWasVisible ) - Show( sal_True ); + Show( true ); std::list< GtkSalFrame* > aChildren = m_aChildren; m_aChildren.clear(); @@ -3154,7 +3154,7 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent ) GdkEventFocus aEvent; aEvent.type = GDK_FOCUS_CHANGE; aEvent.window = widget_get_window( m_pWindow ); - aEvent.send_event = sal_True; + aEvent.send_event = true; aEvent.in = gint16(pEvent->xclient.data.l[1] == 1); signalFocus( m_pWindow, &aEvent, this ); } @@ -3178,14 +3178,14 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer nEventType = SALEVENT_MOUSEBUTTONUP; break; default: - return sal_False; + return false; } switch( pEvent->button ) { case 1: aEvent.mnButton = MOUSE_LEFT; break; case 2: aEvent.mnButton = MOUSE_MIDDLE; break; case 3: aEvent.mnButton = MOUSE_RIGHT; break; - default: return sal_False; + default: return false; } aEvent.mnTime = pEvent->time; aEvent.mnX = (long)pEvent->x_root - pThis->maGeometry.nX; @@ -3251,7 +3251,7 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer } } - return sal_False; + return false; } gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame ) @@ -3285,7 +3285,7 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame pThis->CallCallback( SALEVENT_WHEELMOUSE, &aEvent ); - return sal_False; + return false; } gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer frame ) @@ -3327,7 +3327,7 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer } } - return sal_True; + return true; } gboolean GtkSalFrame::signalCrossing( GtkWidget*, GdkEventCrossing* pEvent, gpointer frame ) @@ -3342,7 +3342,7 @@ gboolean GtkSalFrame::signalCrossing( GtkWidget*, GdkEventCrossing* pEvent, gpoi pThis->CallCallback( (pEvent->type == GDK_ENTER_NOTIFY) ? SALEVENT_MOUSEMOVE : SALEVENT_MOUSELEAVE, &aEvent ); - return sal_True; + return true; } #if GTK_CHECK_VERSION(3,0,0) @@ -3534,7 +3534,7 @@ gboolean GtkSalFrame::signalExpose( GtkWidget*, GdkEventExpose* pEvent, gpointer pThis->CallCallback( SALEVENT_PAINT, &aEvent ); - return sal_False; + return false; } gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer frame ) @@ -3569,7 +3569,7 @@ gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer f if( m_nFloats == 0 ) pThis->CallCallback( pEvent->in ? SALEVENT_GETFOCUS : SALEVENT_LOSEFOCUS, NULL ); - return sal_False; + return false; } #if !GTK_CHECK_VERSION(3,8,0) @@ -3641,7 +3641,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame ) pThis->CallCallback( SALEVENT_RESIZE, NULL ); - return sal_False; + return false; } gboolean GtkSalFrame::signalUnmap( GtkWidget*, GdkEvent*, gpointer frame ) @@ -3650,7 +3650,7 @@ gboolean GtkSalFrame::signalUnmap( GtkWidget*, GdkEvent*, gpointer frame ) pThis->CallCallback( SALEVENT_RESIZE, NULL ); - return sal_False; + return false; } gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gpointer frame ) @@ -3668,7 +3668,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gp */ if( (pThis->m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) && pThis->getDisplay()->GetCaptureFrame() == pThis ) - return sal_False; + return false; /* #i31785# claims we cannot trust the x,y members of the event; * they are e.g. not set correctly on maximize/demaximize; @@ -3734,7 +3734,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gp else if( bSized ) pThis->CallCallback( SALEVENT_RESIZE, NULL ); - return sal_False; + return false; } gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame ) @@ -3746,7 +3746,7 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame if( pThis->m_pIMHandler ) { if( pThis->m_pIMHandler->handleKeyEvent( pEvent ) ) - return sal_True; + return true; } // handle modifiers @@ -3850,7 +3850,7 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame if( !aDel.isDeleted() && pThis->m_pIMHandler ) pThis->m_pIMHandler->updateIMSpotLocation(); - return sal_True; + return true; } gboolean GtkSalFrame::signalDelete( GtkWidget*, GdkEvent*, gpointer frame ) @@ -3859,7 +3859,7 @@ gboolean GtkSalFrame::signalDelete( GtkWidget*, GdkEvent*, gpointer frame ) pThis->CallCallback( SALEVENT_CLOSE, NULL ); - return sal_True; + return true; } void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer frame ) @@ -3927,7 +3927,7 @@ gboolean GtkSalFrame::signalState( GtkWidget*, GdkEvent* pEvent, gpointer frame } #endif - return sal_False; + return false; } gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* pEvent, gpointer frame ) @@ -3935,7 +3935,7 @@ gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* pEvent, GtkSalFrame* pThis = (GtkSalFrame*)frame; pThis->m_nVisibility = pEvent->state; - return sal_False; + return false; } void GtkSalFrame::signalDestroy( GtkWidget* pObj, gpointer frame ) diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index ae83e26a2879..48dd2255f58a 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -731,7 +731,7 @@ void GtkSalMenu::Display( bool bVisible ) bMenuVisibility = bVisible; - bool bVCLMenuVisible = ( bVisible ) ? sal_False : sal_True; + bool bVCLMenuVisible = ( bVisible ) ? false : true; MenuBar* pMenuBar = static_cast< MenuBar* >( mpVCLMenu ); pMenuBar->SetDisplayable( bVCLMenuVisible ); @@ -748,15 +748,15 @@ bool GtkSalMenu::IsItemVisible( unsigned nPos ) return bVisible; } -void GtkSalMenu::CheckItem( unsigned, sal_Bool ) +void GtkSalMenu::CheckItem( unsigned, bool ) { } -void GtkSalMenu::EnableItem( unsigned, sal_Bool ) +void GtkSalMenu::EnableItem( unsigned, bool ) { } -void GtkSalMenu::ShowItem( unsigned nPos, sal_Bool bShow ) +void GtkSalMenu::ShowItem( unsigned nPos, bool bShow ) { SolarMutexGuard aGuard; if ( nPos < maItems.size() ) diff --git a/vcl/unx/kde/UnxCommandThread.hxx b/vcl/unx/kde/UnxCommandThread.hxx index 5a3670564abf..c70959a78a96 100644 --- a/vcl/unx/kde/UnxCommandThread.hxx +++ b/vcl/unx/kde/UnxCommandThread.hxx @@ -117,7 +117,7 @@ public: protected: virtual void SAL_CALL run(); - virtual void SAL_CALL handleCommand( const OUString &rCommand/*, sal_Bool &rQuit*/ ); + virtual void SAL_CALL handleCommand( const OUString &rCommand/*, bool &rQuit*/ ); ::std::list< OUString > SAL_CALL tokenize( const OUString &rCommand ); }; diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 8472838fc429..7f11b2ef0c2d 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -1232,7 +1232,7 @@ class KDESalGraphics : public X11SalGraphics @param nPart Specification of the widget's part if it consists of more than one. - @return sal_True if the platform supports native drawing of the widget nType + @return true if the platform supports native drawing of the widget nType defined by nPart. */ bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) @@ -1266,7 +1266,7 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP /** Test whether the position is in the native widget. - If the return value is sal_True, bIsInside contains information whether + If the return value is true, bIsInside contains information whether aPos was or was not inside the native widget specified by the nType/nPart combination. */ @@ -1506,7 +1506,7 @@ bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, /** Check if the bounding regions match. - If the return value is sal_True, rNativeBoundingRegion + If the return value is true, rNativeBoundingRegion contains the true bounding region covered by the control including any adornment, while rNativeContentRegion contains the area within the control that can be safely drawn into without drawing over @@ -1724,7 +1724,7 @@ KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uLong nStyle ) : { } -void KDESalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) +void KDESalFrame::Show( bool bVisible, bool bNoActivate ) { if ( !GetParent() && ! (GetStyle() & SAL_FRAME_STYLE_INTRO) ) { diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index a66420191b2d..467e8d871093 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -144,8 +144,8 @@ KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& ) this, SLOT( executeSlot() ), Qt::BlockingQueuedConnection ); // XFilePicker functions - connect( this, SIGNAL( setMultiSelectionModeSignal( sal_Bool ) ), - this, SLOT( setMultiSelectionModeSlot( sal_Bool ) ), Qt::BlockingQueuedConnection ); + connect( this, SIGNAL( setMultiSelectionModeSignal( bool ) ), + this, SLOT( setMultiSelectionModeSlot( bool ) ), Qt::BlockingQueuedConnection ); connect( this, SIGNAL( setDefaultNameSignal( const OUString & ) ), this, SLOT( setDefaultNameSlot( const OUString & ) ), Qt::BlockingQueuedConnection ); connect( this, SIGNAL( setDisplayDirectorySignal( const OUString & ) ), @@ -172,8 +172,8 @@ KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& ) this, SLOT( setValueSlot( sal_Int16, sal_Int16, const ::com::sun::star::uno::Any & ) ), Qt::BlockingQueuedConnection ); connect( this, SIGNAL( getValueSignal( sal_Int16, sal_Int16 ) ), this, SLOT( getValueSlot( sal_Int16, sal_Int16 ) ), Qt::BlockingQueuedConnection ); - connect( this, SIGNAL( enableControlSignal( sal_Int16, sal_Bool ) ), - this, SLOT( enableControlSlot( sal_Int16, sal_Bool ) ), Qt::BlockingQueuedConnection ); + connect( this, SIGNAL( enableControlSignal( sal_Int16, bool ) ), + this, SLOT( enableControlSlot( sal_Int16, bool ) ), Qt::BlockingQueuedConnection ); connect( this, SIGNAL( setLabelSignal( sal_Int16, const OUString & ) ), this, SLOT( setLabelSlot( sal_Int16, const OUString & ) ), Qt::BlockingQueuedConnection ); connect( this, SIGNAL( getLabelSignal( sal_Int16 ) ), diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index 52a031523b4f..a27fbb0989ea 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -56,7 +56,7 @@ KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uLong nState ) : { } -void KDESalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) +void KDESalFrame::Show( bool bVisible, bool bNoActivate ) { if ( !GetParent() && ! (GetStyle() & SAL_FRAME_STYLE_INTRO) ) { diff --git a/vcl/unx/kde4/KDESalFrame.hxx b/vcl/unx/kde4/KDESalFrame.hxx index 739aacd2084d..1748415af9c3 100644 --- a/vcl/unx/kde4/KDESalFrame.hxx +++ b/vcl/unx/kde4/KDESalFrame.hxx @@ -46,7 +46,7 @@ class KDESalFrame : public X11SalFrame virtual void ReleaseGraphics( SalGraphics *pGraphics ); virtual void updateGraphics( bool bClear ); virtual void UpdateSettings( AllSettings& rSettings ); - virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate ); + virtual void Show( bool bVisible, bool bNoActivate ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |