1 files changed, 9 insertions, 9 deletions

diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index b9799f5818b7..c9c9e06ae248 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -76,7 +76,7 @@ static void menu_deactivate_cb( GtkWidget *pMenu )
     gtk_menu_popdown( GTK_MENU( pMenu ) );
 }
 
-static GdkPixbuf * ResIdToPixbuf( USHORT nResId )
+static GdkPixbuf * ResIdToPixbuf( sal_uInt16 nResId )
 {
     ResId aResId( SV_ICON_SMALL_START + nResId, *pVCLResMgr );
     BitmapEx aIcon( aResId );
@@ -120,7 +120,7 @@ static GdkPixbuf * ResIdToPixbuf( USHORT nResId )
         pInSalAlpha.ReleaseAccess( pSalAlpha );
 
     return gdk_pixbuf_new_from_data( pPixbufData,
-        GDK_COLORSPACE_RGB, TRUE, 8,
+        GDK_COLORSPACE_RGB, sal_True, 8,
         aSize.Width(), aSize.Height(),
         aSize.Width() * 4,
         (GdkPixbufDestroyNotify) g_free,
@@ -138,7 +138,7 @@ static void oustring_delete (gpointer  data,
 
 static void add_item( GtkMenuShell *pMenuShell, const char *pAsciiURL,
                       OUString *pOverrideLabel,
-                      USHORT nResId, GCallback pFnCallback )
+                      sal_uInt16 nResId, GCallback pFnCallback )
 {
     OUString *pURL = new OUString (OStringToOUString( pAsciiURL,
                                                       RTL_TEXTENCODING_UTF8 ));
@@ -171,7 +171,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 
 static void add_ugly_db_item( GtkMenuShell *pMenuShell, const char *pAsciiURL,
-                              USHORT nResId, GCallback pFnCallback )
+                              sal_uInt16 nResId, GCallback pFnCallback )
 {
     SvtDynamicMenuOptions aOpt;
     Sequence < Sequence < PropertyValue > > aMenu = aOpt.GetMenu( E_NEWMENU );
@@ -311,7 +311,7 @@ layout_menu( GtkMenu *menu,
     else
         (*y) += ebox->allocation.height;
 
-    *push_in = TRUE;
+    *push_in = sal_True;
 }
 }
 
@@ -319,14 +319,14 @@ static gboolean display_menu_cb( GtkWidget *,
                                  GdkEventButton *event, GtkWidget *pMenu )
 {
     if (event->button == 2)
-        return FALSE;
+        return sal_False;
 
 #ifdef TEMPLATE_DIALOG_MORE_POLISHED
     if (event->button == 1 &&
         event->type == GDK_2BUTTON_PRESS)
     {
         open_template_cb( NULL );
-        return TRUE;
+        return sal_True;
     }
     if (event->button == 3)
     {
@@ -338,7 +338,7 @@ static gboolean display_menu_cb( GtkWidget *,
     gtk_menu_popup( GTK_MENU( pMenu ), NULL, NULL,
                     layout_menu, NULL, 0, event->time );
 
-    return TRUE;
+    return sal_True;
 }
 
 extern "C" {
@@ -347,7 +347,7 @@ extern "C" {
     {
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
         gtk_widget_show_all( GTK_WIDGET( pTrayIcon ) );
-        return FALSE;
+        return sal_False;
     }
 }