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>

8 files changed, 84 insertions, 84 deletions

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() )