diff options
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 3 | ||||
| -rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/a11y/atktextattributes.cxx | 1 | ||||
| -rw-r--r-- | vcl/unx/gtk/window/gloactiongroup.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/kde/kdedata.cxx | 8 |
5 files changed, 3 insertions, 13 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 87b48468eccd..0662899dba6e 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -863,7 +863,6 @@ rtl::OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const break; #if !defined (SunXK_Undo) - #define SunXK_Stop 0x0000FF69 // XK_Cancel #define SunXK_Props 0x1005FF70 #define SunXK_Front 0x1005FF71 #define SunXK_Copy 0x1005FF72 @@ -1116,7 +1115,7 @@ sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const break; // - - - - - Sun X-Server keyboard ??? - - - - - - - - - - - - case XK_L1: // XK_F11: - nKey = KEY_F11; // on a sun keyboard this actually is usally SunXK_Stop, + nKey = KEY_F11; // on a sun keyboard this actually is usally SunXK_Stop = 0x0000FF69 (XK_Cancel), // but VCL doesn't have a key defintion for that break; case XK_L2: // XK_F12: diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 1e621f18c2ae..de65253f3f2a 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -264,7 +264,9 @@ using ::rtl::OUString; using ::rtl::OStringBuffer; using ::rtl::OUStringHash; +#if OSL_DEBUG_LEVEL > 2 #define BSTRING(x) rtl::OUStringToOString( x, osl_getThreadTextEncoding() ) +#endif namespace { diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index afc609a3bc7f..23738f9009b9 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -161,7 +161,6 @@ get_value( const uno::Sequence< beans::PropertyValue >& rAttributeList, } #define get_bool_value( list, index ) get_value( list, index, Bool2String ) -#define get_short_value( list, index ) get_value( list, index, Short2String ) #define get_height_value( list, index ) get_value( list, index, Float2String ) #define get_justification_value( list, index ) get_value( list, index, Adjust2Justification ) #define get_cmm_value( list, index ) get_value( list, index, CMM2UnitString ) diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx index b7fd592cef3e..f2effd7fccc8 100644 --- a/vcl/unx/gtk/window/gloactiongroup.cxx +++ b/vcl/unx/gtk/window/gloactiongroup.cxx @@ -23,8 +23,6 @@ #define G_TYPE_LO_ACTION (g_lo_action_get_type ()) #define G_LO_ACTION(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ G_TYPE_LO_ACTION, GLOAction)) -#define G_IS_LO_ACTION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ - G_TYPE_LO_ACTION)) struct _GLOAction { diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index 5151350b72e2..4eb00ffe25be 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -46,14 +46,6 @@ #include <config_vclplug.h> -#if ENABLE_TDE -#define THIS_DESKENV_NAME_CAP "TDE" -#define THIS_DESKENV_NAME_LOW "tde" -#else // ENABLE_TDE -#define THIS_DESKENV_NAME_CAP "KDE" -#define THIS_DESKENV_NAME_LOW "kde" -#endif // ENABLE_TDE - /* #i59042# override KApplications method for session management * since it will interfere badly with our own. */ |