summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/app/i18n_cb.cxx4
-rw-r--r--vcl/unx/generic/app/i18n_ic.cxx26
-rw-r--r--vcl/unx/generic/app/i18n_im.cxx4
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkfactory.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atktext.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkwindow.cxx6
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.cxx10
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx2
-rw-r--r--vcl/unx/gtk/glomenu.cxx16
-rw-r--r--vcl/unx/gtk/gtksalframe.cxx4
-rw-r--r--vcl/unx/gtk/gtksalmenu.cxx2
-rw-r--r--vcl/unx/gtk/gtksys.cxx2
-rw-r--r--vcl/unx/gtk/salnativewidgets-gtk.cxx24
-rw-r--r--vcl/unx/gtk3/gtk3gtkframe.cxx2
-rw-r--r--vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx12
16 files changed, 61 insertions, 61 deletions
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index b18f7ef72aa8..ee9ec8f0a49f 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -397,8 +397,8 @@ GetPreeditSpotLocation(XIC ic, XPointer client_data)
point.y = mPosEvent.mnY + mPosEvent.mnHeight;
XVaNestedList preedit_attr;
- preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, NULL);
- XSetICValues(ic, XNPreeditAttributes, preedit_attr, NULL);
+ preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, nullptr);
+ XSetICValues(ic, XNPreeditAttributes, preedit_attr, nullptr);
XFree(preedit_attr);
return;
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index c160612550b4..df63ead54078 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -89,7 +89,7 @@ XVaAddToNestedList( XVaNestedList a_srclist, char* name, XPointer value )
a_dstlist = XVaCreateNestedList(
0,
name, value,
- NULL );
+ nullptr );
}
else
{
@@ -97,7 +97,7 @@ XVaAddToNestedList( XVaNestedList a_srclist, char* name, XPointer value )
0,
XNVaNestedList, a_srclist,
name, value,
- NULL );
+ nullptr );
}
return a_dstlist != nullptr ? a_dstlist : a_srclist ;
@@ -212,7 +212,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
XNStatusStartCallback, &aStatusStartCallback,
XNStatusDoneCallback, &aStatusDoneCallback,
XNStatusDrawCallback, &aStatusDrawCallback,
- NULL );
+ nullptr );
break;
}
@@ -249,7 +249,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
XNPreeditDoneCallback, &maPreeditDoneCallback,
XNPreeditDrawCallback, &maPreeditDrawCallback,
XNPreeditCaretCallback, &maPreeditCaretCallback,
- NULL );
+ nullptr );
break;
@@ -271,7 +271,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
mpPreeditAttributes = XVaCreateNestedList (
0,
XNSpotLocation, &aSpot,
- NULL );
+ nullptr );
// XCreateIC() fails on Redflag Linux 2.0 if there is no
// fontset though the data itself is not evaluated nor is
@@ -304,7 +304,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
XNFocusWindow, aFocusWindow,
XNClientWindow, aClientWindow,
XNInputStyle, mnPreeditStyle | mnStatusStyle,
- NULL );
+ nullptr );
if ( mnPreeditStyle != XIMPreeditNone )
{
@@ -324,7 +324,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
}
maContext = XCreateIC( pInputMethod->GetMethod(),
XNVaNestedList, mpAttributes,
- NULL );
+ nullptr );
}
if ( maContext == nullptr )
@@ -359,7 +359,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
maDestroyCallback.client_data = reinterpret_cast<XPointer>(this);
XSetICValues( maContext,
XNDestroyCallback, &maDestroyCallback,
- NULL );
+ nullptr );
}
}
@@ -397,7 +397,7 @@ SalI18N_InputContext::Map( SalFrame *pFrame )
maContext = XCreateIC( pInputMethod->GetMethod(),
XNVaNestedList, mpAttributes,
- NULL );
+ nullptr );
}
if( maClientData.pFrame != pFrame )
SetICFocus( pFrame );
@@ -432,7 +432,7 @@ SalI18N_InputContext::ExtendEventMask( ::Window aFocusWindow )
&aWindowAttributes );
XGetICValues ( maContext,
XNFilterEvents, &nIMEventMask,
- NULL);
+ nullptr);
nIMEventMask |= aWindowAttributes.your_event_mask;
XSelectInput ( pDisplay, aFocusWindow, nIMEventMask );
}
@@ -564,8 +564,8 @@ SalI18N_InputContext::UpdateSpotLocation()
aSpot.x = aPosEvent.mnX + aPosEvent.mnWidth;
aSpot.y = aPosEvent.mnY + aPosEvent.mnHeight;
- XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, NULL);
- XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
+ XVaNestedList preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &aSpot, nullptr);
+ XSetICValues(maContext, XNPreeditAttributes, preedit_attr, nullptr);
XFree(preedit_attr);
I18NStatus::get().show( true, I18NStatus::contextmap );
@@ -592,7 +592,7 @@ SalI18N_InputContext::SetICFocus( SalFrame* pFocusFrame )
XSetICValues( maContext,
XNFocusWindow, aFocusWindow,
XNClientWindow, aClientWindow,
- NULL );
+ nullptr );
if( maClientData.aInputEv.mpTextAttr )
{
diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index c4a9b7f3ede8..962e5aeed764 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -348,7 +348,7 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay )
if ( maMethod != nullptr )
{
- if ( XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, NULL)
+ if ( XGetIMValues(maMethod, XNQueryInputStyle, &mpStyles, nullptr)
!= nullptr)
mbUseable = False;
#if OSL_DEBUG_LEVEL > 1
@@ -370,7 +370,7 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay )
maDestroyCallback.callback = static_cast<XIMProc>(IM_IMDestroyCallback);
maDestroyCallback.client_data = reinterpret_cast<XPointer>(this);
if (mbUseable && maMethod != nullptr)
- XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, NULL);
+ XSetIMValues(maMethod, XNDestroyCallback, &maDestroyCallback, nullptr);
return mbUseable;
}
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index 4142825e669c..ef1c3f9c71ec 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -470,7 +470,7 @@ IMPL_LINK_TYPED( IIIMPStatusWindow, SelectHdl, MenuButton*, pBtn, void )
XSetICValues( static_cast<X11SalFrame*>(I18NStatus::get().getParent())->getInputContext()->GetContext(),
XNUnicodeCharacterSubset,
rChoices[nIndex].pData,
- NULL);
+ nullptr);
// FIXME: get rid of X11SalFrame
X11SalFrame* pParent = static_cast<X11SalFrame*>(I18NStatus::get().getParent());
if( pParent && pParent->isMapped() )
diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx
index a8428fb4ec86..bca68a6f9584 100644
--- a/vcl/unx/gtk/a11y/atkfactory.cxx
+++ b/vcl/unx/gtk/a11y/atkfactory.cxx
@@ -80,7 +80,7 @@ atk_noop_object_wrapper_new()
AtkObject *accessible;
accessible = static_cast<AtkObject *>(g_object_new (atk_noop_object_wrapper_get_type(), nullptr));
- g_return_val_if_fail (accessible != nullptr, NULL);
+ g_return_val_if_fail (accessible != nullptr, nullptr);
accessible->role = ATK_ROLE_INVALID;
accessible->layer = ATK_LAYER_INVALID;
@@ -122,7 +122,7 @@ wrapper_factory_create_accessible( GObject *obj )
#endif
GtkSalFrame* pFrame = GtkSalFrame::getFromWindow(GTK_WINDOW(pTopLevel));
- g_return_val_if_fail( pFrame != nullptr, NULL );
+ g_return_val_if_fail( pFrame != nullptr, nullptr );
vcl::Window* pFrameWindow = pFrame->GetWindow();
if( pFrameWindow )
diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx
index c38c43231d6f..5c662a711131 100644
--- a/vcl/unx/gtk/a11y/atktext.cxx
+++ b/vcl/unx/gtk/a11y/atktext.cxx
@@ -218,7 +218,7 @@ text_wrapper_get_text (AtkText *text,
{
gchar * ret = nullptr;
- g_return_val_if_fail( (end_offset == -1) || (end_offset >= start_offset), NULL );
+ g_return_val_if_fail( (end_offset == -1) || (end_offset >= start_offset), nullptr );
/* at-spi expects the delete event to be send before the deletion happened
* so we save the deleted string object in the UNO event notification and
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index cca3aee51f8e..cafa3a1b585f 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -220,16 +220,16 @@ ooo_window_wrapper_real_initialize(AtkObject *obj, gpointer data)
g_signal_connect_after( GTK_WIDGET( data ), "focus-out-event",
G_CALLBACK (ooo_window_wrapper_real_focus_gtk),
- NULL);
+ nullptr);
if( obj->role == ATK_ROLE_TOOL_TIP )
{
g_signal_connect_after( GTK_WIDGET( data ), "map-event",
G_CALLBACK (ooo_tooltip_map),
- NULL);
+ nullptr);
g_signal_connect_after( GTK_WIDGET( data ), "unmap-event",
G_CALLBACK (ooo_tooltip_unmap),
- NULL);
+ nullptr);
}
}
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 2c3e78b8dd66..0e12b0eb964f 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -782,7 +782,7 @@ ensureTypeFor( uno::XInterface *pAccessible )
AtkObject *
atk_object_wrapper_ref( const uno::Reference< accessibility::XAccessible > &rxAccessible, bool create )
{
- g_return_val_if_fail( rxAccessible.get() != nullptr, NULL );
+ g_return_val_if_fail( rxAccessible.get() != nullptr, nullptr );
AtkObject *obj = ooo_wrapper_registry_get(rxAccessible);
if( obj )
@@ -801,14 +801,14 @@ AtkObject *
atk_object_wrapper_new( const css::uno::Reference< css::accessibility::XAccessible >& rxAccessible,
AtkObject* parent )
{
- g_return_val_if_fail( rxAccessible.get() != nullptr, NULL );
+ g_return_val_if_fail( rxAccessible.get() != nullptr, nullptr );
AtkObjectWrapper *pWrap = nullptr;
try {
uno::Reference< accessibility::XAccessibleContext > xContext(rxAccessible->getAccessibleContext());
- g_return_val_if_fail( xContext.get() != nullptr, NULL );
+ g_return_val_if_fail( xContext.get() != nullptr, nullptr );
GType nType = ensureTypeFor( xContext.get() );
gpointer obj = g_object_new( nType, nullptr);
@@ -871,7 +871,7 @@ void atk_object_wrapper_add_child(AtkObjectWrapper* wrapper, AtkObject *child, g
AtkObject *atk_obj = ATK_OBJECT( wrapper );
atk_object_set_parent( child, atk_obj );
- g_signal_emit_by_name( atk_obj, "children_changed::add", index, child, NULL );
+ g_signal_emit_by_name( atk_obj, "children_changed::add", index, child, nullptr );
}
/*****************************************************************************/
@@ -885,7 +885,7 @@ void atk_object_wrapper_remove_child(AtkObjectWrapper* wrapper, AtkObject *child
wrapper->child_about_to_be_removed = child;
wrapper->index_of_child_about_to_be_removed = index;
- g_signal_emit_by_name( ATK_OBJECT( wrapper ), "children_changed::remove", index, child, NULL );
+ g_signal_emit_by_name( ATK_OBJECT( wrapper ), "children_changed::remove", index, child, nullptr );
wrapper->index_of_child_about_to_be_removed = -1;
wrapper->child_about_to_be_removed = nullptr;
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 9798639e58f9..965768d36b08 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -184,7 +184,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
gtk_cell_layout_pack_start(
GTK_CELL_LAYOUT(m_pLists[i]), pCell, TRUE);
gtk_cell_layout_set_attributes(
- GTK_CELL_LAYOUT (m_pLists[i]), pCell, "text", 0, NULL);
+ GTK_CELL_LAYOUT (m_pLists[i]), pCell, "text", 0, nullptr);
m_pListLabels[i] = gtk_label_new( "" );
diff --git a/vcl/unx/gtk/glomenu.cxx b/vcl/unx/gtk/glomenu.cxx
index 6aa19e6b74a9..835e832f57b7 100644
--- a/vcl/unx/gtk/glomenu.cxx
+++ b/vcl/unx/gtk/glomenu.cxx
@@ -199,7 +199,7 @@ g_lo_menu_get_attribute_value_from_item_in_section (GLOMenu *menu,
{
GMenuModel *model = G_MENU_MODEL (g_lo_menu_get_section (menu, section));
- g_return_val_if_fail (model != nullptr, NULL);
+ g_return_val_if_fail (model != nullptr, nullptr);
GVariant *value = g_menu_model_get_item_attribute_value (model,
position,
@@ -253,7 +253,7 @@ g_lo_menu_get_label_from_item_in_section (GLOMenu *menu,
gint section,
gint position)
{
- g_return_val_if_fail (G_IS_LO_MENU (menu), NULL);
+ g_return_val_if_fail (G_IS_LO_MENU (menu), nullptr);
GVariant *label_value = g_lo_menu_get_attribute_value_from_item_in_section (menu,
section,
@@ -348,7 +348,7 @@ g_lo_menu_get_accelerator_from_item_in_section (GLOMenu *menu,
gint section,
gint position)
{
- g_return_val_if_fail (G_IS_LO_MENU (menu), NULL);
+ g_return_val_if_fail (G_IS_LO_MENU (menu), nullptr);
GVariant *accel_value = g_lo_menu_get_attribute_value_from_item_in_section (menu,
section,
@@ -399,7 +399,7 @@ g_lo_menu_get_command_from_item_in_section (GLOMenu *menu,
gint section,
gint position)
{
- g_return_val_if_fail (G_IS_LO_MENU (menu), NULL);
+ g_return_val_if_fail (G_IS_LO_MENU (menu), nullptr);
GVariant *command_value = g_lo_menu_get_attribute_value_from_item_in_section (menu,
section,
@@ -478,7 +478,7 @@ GLOMenu *
g_lo_menu_get_section (GLOMenu *menu,
gint section)
{
- g_return_val_if_fail (G_IS_LO_MENU (menu), NULL);
+ g_return_val_if_fail (G_IS_LO_MENU (menu), nullptr);
return G_LO_MENU (G_MENU_MODEL_CLASS (g_lo_menu_parent_class)
->get_item_link (G_MENU_MODEL (menu), section, G_MENU_LINK_SECTION));
@@ -514,12 +514,12 @@ g_lo_menu_get_submenu_from_item_in_section (GLOMenu *menu,
gint section,
gint position)
{
- g_return_val_if_fail (G_IS_LO_MENU (menu), NULL);
- g_return_val_if_fail (0 <= section && section < (gint) menu->items->len, NULL);
+ g_return_val_if_fail (G_IS_LO_MENU (menu), nullptr);
+ g_return_val_if_fail (0 <= section && section < (gint) menu->items->len, nullptr);
GLOMenu *model = g_lo_menu_get_section (menu, section);
- g_return_val_if_fail (model != nullptr, NULL);
+ g_return_val_if_fail (model != nullptr, nullptr);
GLOMenu *submenu = nullptr;
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index b104456a765a..085eb0e22f56 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -532,7 +532,7 @@ static void activate_uno(GSimpleAction *action, GVariant*, gpointer)
return;
gchar *strval = nullptr;
- g_object_get(action, "name", &strval, NULL);
+ g_object_get(action, "name", &strval, nullptr);
if (!strval)
return;
@@ -1225,7 +1225,7 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle )
else
{
m_pWindow = gtk_widget_new( GTK_TYPE_WINDOW, "type", eWinType,
- "visible", FALSE, NULL );
+ "visible", FALSE, nullptr );
}
g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
g_object_set_data( G_OBJECT( m_pWindow ), "libo-version", const_cast<char *>(LIBO_VERSION_DOTTED));
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index a0cc9779da8a..35250a0e4264 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -610,7 +610,7 @@ void GtkSalMenu::NativeSetItemCommand( unsigned nSection,
{
g_lo_menu_set_command_to_item_in_section( pMenu, nSection, nItemPos, aCommand );
- gchar* aItemCommand = g_strconcat("win.", aCommand, NULL );
+ gchar* aItemCommand = g_strconcat("win.", aCommand, nullptr );
if ( bIsSubmenu )
g_lo_menu_set_submenu_action_to_item_in_section( pMenu, nSection, nItemPos, aItemCommand );
diff --git a/vcl/unx/gtk/gtksys.cxx b/vcl/unx/gtk/gtksys.cxx
index 8d79c98cbe70..80153fe555b5 100644
--- a/vcl/unx/gtk/gtksys.cxx
+++ b/vcl/unx/gtk/gtksys.cxx
@@ -261,7 +261,7 @@ int GtkSalSystem::ShowNativeDialog (const OUString& rTitle, const OUString& rMes
"title", aTitle.getStr(),
"message-type", (int)GTK_MESSAGE_WARNING,
"text", aMessage.getStr(),
- NULL));
+ nullptr));
int nButton = 0;
std::list< OUString >::const_iterator it;
for (it = rButtonNames.begin(); it != rButtonNames.end(); ++it)
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index 1a104532df2d..32b4fe59c576 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -568,10 +568,10 @@ void GtkData::initNWF()
GtkSettings *gtks = gtk_settings_get_default ();
gint val;
- g_object_get (gtks, "gtk-auto-mnemonics", &val, NULL);
+ g_object_get (gtks, "gtk-auto-mnemonics", &val, nullptr);
if (val) pSVData->maNWFData.mbAutoAccel = true;
else pSVData->maNWFData.mbAutoAccel = false;
- g_object_get (gtks, "gtk-enable-mnemonics", &val, NULL);
+ g_object_get (gtks, "gtk-enable-mnemonics", &val, nullptr);
if (val) pSVData->maNWFData.mbEnableAccel = true;
else pSVData->maNWFData.mbEnableAccel = false;
}
@@ -1246,7 +1246,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType,
gtk_widget_style_get( widget,
"horizontal-padding", &horizontal_padding,
- NULL );
+ nullptr );
// Use arrow-scaling property if available (2.15+), avoid warning otherwise
if ( gtk_widget_class_find_style_property( GTK_WIDGET_GET_CLASS( widget ),
@@ -1254,7 +1254,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType,
{
gtk_widget_style_get( widget,
"arrow-scaling", &arrow_scaling,
- NULL );
+ nullptr );
}
child = GTK_BIN( widget )->child;
@@ -1663,7 +1663,7 @@ bool GtkSalGraphics::NWPaintGTKButtonReal(
{
gtk_widget_style_get (GTK_WIDGET (gWidgetData[m_nXScreen].gToolbarWidget),
"internal-padding", &internal_padding,
- NULL);
+ nullptr);
x += internal_padding/2;
w -= internal_padding;
stateType = GTK_STATE_PRELIGHT;
@@ -3161,7 +3161,7 @@ bool GtkSalGraphics::NWPaintGTKToolbar(
"wide-separators", &wide_separators,
"separator-width", &separator_width,
"separator-height", &separator_height,
- NULL);
+ nullptr);
if (wide_separators)
{
@@ -3643,7 +3643,7 @@ bool GtkSalGraphics::NWPaintGTKSlider(
"slider-width", &slider_width,
"slider-length", &slider_length,
"trough-border", &trough_border,
- NULL);
+ nullptr);
GtkStateType eState = (nState & ControlState::ENABLED) ? GTK_STATE_NORMAL : GTK_STATE_INSENSITIVE;
if( nPart == PART_TRACK_HORZ_AREA )
@@ -3974,7 +3974,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
"content-area-spacing", &aDialogStyle.content_area_spacing,
"button-spacing", &aDialogStyle.button_spacing,
"action-area-border", &aDialogStyle.action_area_border,
- NULL);
+ nullptr);
aStyleSet.SetDialogStyle(aDialogStyle);
FrameStyle aFrameStyle(aStyleSet.GetFrameStyle());
@@ -4008,14 +4008,14 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
// hyperlink colors
GdkColor *link_color = nullptr;
- gtk_widget_style_get (m_pWindow, "link-color", &link_color, NULL);
+ gtk_widget_style_get (m_pWindow, "link-color", &link_color, nullptr);
if (link_color)
{
aStyleSet.SetLinkColor(getColor(*link_color));
gdk_color_free (link_color);
link_color = nullptr;
}
- gtk_widget_style_get (m_pWindow, "visited-link-color", &link_color, NULL);
+ gtk_widget_style_get (m_pWindow, "visited-link-color", &link_color, nullptr);
if (link_color)
{
aStyleSet.SetVisitedLinkColor(getColor(*link_color));
@@ -4649,12 +4649,12 @@ static void NWEnsureGTKTreeView( SalX11Screen nScreen )
// Columns will be used for tree header rendering
GtkCellRenderer* renderer=gtk_cell_renderer_text_new();
- GtkTreeViewColumn* column=gtk_tree_view_column_new_with_attributes("",renderer,"text",0,NULL);
+ GtkTreeViewColumn* column=gtk_tree_view_column_new_with_attributes("",renderer,"text",0,nullptr);
gtk_tree_view_column_set_widget(column,gtk_label_new(""));
gtk_tree_view_append_column(GTK_TREE_VIEW(gWidgetData[nScreen].gTreeView), column);
// Add one more column so that some engines like clearlooks did render separators between columns
- column=gtk_tree_view_column_new_with_attributes("",renderer,"text",0,NULL);
+ column=gtk_tree_view_column_new_with_attributes("",renderer,"text",0,nullptr);
gtk_tree_view_append_column(GTK_TREE_VIEW(gWidgetData[nScreen].gTreeView), column);
NWAddWidgetToCacheWindow( gWidgetData[nScreen].gTreeView, nScreen );
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 5a3efe0d2eaa..31b608f2e7fc 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1127,7 +1127,7 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle )
else
{
m_pWindow = gtk_widget_new( GTK_TYPE_WINDOW, "type", eWinType,
- "visible", FALSE, NULL );
+ "visible", FALSE, nullptr );
}
g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
g_object_set_data( G_OBJECT( m_pWindow ), "libo-version", const_cast<char *>(LIBO_VERSION_DOTTED));
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index e0cc8d5121e8..9d5266fec8d1 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -828,7 +828,7 @@ void GtkSalGraphics::PaintCheckOrRadio(GtkStyleContext *context,
gint indicator_size;
gtk_style_context_get_style(mpCheckButtonStyle,
"indicator-size", &indicator_size,
- NULL);
+ nullptr);
gint x = (rControlRectangle.GetWidth() - indicator_size) / 2;
gint y = (rControlRectangle.GetHeight() - indicator_size) / 2;
@@ -1103,7 +1103,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
gint initial_gap(0);
gtk_style_context_get_style(mpNoteBookStyle,
"initial-gap", &initial_gap,
- NULL);
+ nullptr);
nX += initial_gap/2;
nWidth -= initial_gap;
@@ -1308,7 +1308,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
"wide-separators", &wide_separators,
"separator-width", &separator_width,
"separator-height", &separator_height,
- NULL);
+ nullptr);
aEditRect = Rectangle( aEditRect.TopLeft(),
Size( aEditRect.GetWidth(), wide_separators ? separator_height : 1 ) );
@@ -1320,7 +1320,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
arrow_scaling = 0;
gtk_style_context_get_style (mpCheckMenuItemStyle,
"arrow-scaling", &arrow_scaling,
- NULL);
+ nullptr);
arrow_size = 11 * arrow_scaling;
aEditRect = Rectangle( aEditRect.TopLeft(),
@@ -1594,7 +1594,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
GdkColor *link_color = nullptr;
gtk_style_context_get_style(pStyle,
"link-color", &link_color,
- NULL);
+ nullptr);
if (link_color) {
aStyleSet.SetLinkColor(getColorFromColor(*link_color));
gdk_color_free(link_color);
@@ -1603,7 +1603,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
link_color = nullptr;
gtk_style_context_get_style(pStyle,
"visited-link-color", &link_color,
- NULL);
+ nullptr);
if (link_color) {
aStyleSet.SetVisitedLinkColor(getColorFromColor(*link_color));
gdk_color_free(link_color);
generated by cgit (git 2.34.1) at 2024-07-24 12:18:02 +0000